Changeset 655 for trunk/src/org/expeditee/items

Timestamp:

01/07/14 10:59:52 (10 years ago)

Author:

jts21

Message:

Switch to using specialised objects for settings so they make more a bit more sense (now each setting is a single object instead of multiple, and setter functions and default values are less hackish)
Also added tooltips (help strings) to settings, will need to add a way of displaying these (maybe add the idea of a tooltip which is a text item which only appears when hovering over another item?)
Converted all settings over to new format, everything seems to be working fine

Location:

trunk/src/org/expeditee/items

Files:

• Item.java (modified) (3 diffs)
• ItemUtils.java (modified) (1 diff)
• Text.java (modified) (5 diffs)
• widgets/JfxBrowser.java (modified) (2 diffs)

trunk/src/org/expeditee/items/Item.java

@@ -229 +229 @@
 
                 if (parent != null && !UserSettings.UserName.equals(parent.getOwner())) {
-                        dest.setOwner(UserSettings.UserName);
+                        dest.setOwner(UserSettings.UserName.get());
                 }
         }
@@ -254 +254 @@
                         return 2;
                 }
-                return org.expeditee.settings.UserSettings.Gravity;
+                return UserSettings.Gravity.get();
         }
 
         public static boolean showLineHighlight() {
-                return org.expeditee.settings.UserSettings.LineHighlight;
+                return UserSettings.LineHighlight.get();
         }
 
@@ -1696 +1696 @@
                 if (_parent != null && UserSettings.UserName != null
                                 && !UserSettings.UserName.equals(_parent.getOwner())) {
-                        setOwner(UserSettings.UserName);
+                        setOwner(UserSettings.UserName.get());
                 }
         }

trunk/src/org/expeditee/items/ItemUtils.java

@@ -371 +371 @@
                         File file = null;
 
-                        for (String dir : org.expeditee.settings.UserSettings.ImageDirs) {
+                        for (String dir : org.expeditee.settings.UserSettings.ImageDirs.get()) {
                                 file = new File(dir + path);
                                 if (file.exists() && !file.isDirectory())

trunk/src/org/expeditee/items/Text.java

@@ -1434 +1434 @@
                 List<Point[]> lines = null;
                 
-                if(_autoWrap || ExperimentalFeatures.AutoWrap) {
+                if(_autoWrap || ExperimentalFeatures.AutoWrap.get()) {
                 lines = new LinkedList<Point[]>();
                 if(DisplayIO.getCurrentFrame() == null) {
@@ -1472 +1472 @@
                 while (_lineBreaker.getPosition() < _text.length()) {
                         
-                        if(_autoWrap || ExperimentalFeatures.AutoWrap) {
+                        if(_autoWrap || ExperimentalFeatures.AutoWrap.get()) {
                                 requireNextWord = width < FrameGraphics.getMaxFrameSize().width - getX();
                         }
@@ -1505 +1505 @@
                         _textLayouts.add(layout);
                                                 
-                        if(_autoWrap || ExperimentalFeatures.AutoWrap) {
+                        if(_autoWrap || ExperimentalFeatures.AutoWrap.get()) {
                                 
                         if(lineHeight != Float.NaN) {
@@ -1650 +1650 @@
                         return;
                 
-                if(_autoWrap || ExperimentalFeatures.AutoWrap) {
+                if(_autoWrap || ExperimentalFeatures.AutoWrap.get()) {
                         invalidateAll();
                 
@@ -2119 +2119 @@
                 
                 // if autowrap is on, wrapping is done every time we draw
-                if(ExperimentalFeatures.AutoWrap) {
+                if(ExperimentalFeatures.AutoWrap.get()) {
                         return;
                 }

trunk/src/org/expeditee/items/widgets/JfxBrowser.java

@@ -407 +407 @@
         public JfxBrowser(Text source, String[] args) {
                 // Initial page is either the page stored in the arguments (if there is one stored) or the homepage
-                super(source, new WebBrowserPanel((args != null && args.length > 0) ? args[0] : NetworkSettings.homePage), -1, 500, -1, -1, 300, -1);
+                super(source, new WebBrowserPanel((args != null && args.length > 0) ? args[0] : NetworkSettings.HomePage.get()), -1, 500, -1, -1, 300, -1);
                 _browser = (WebBrowserPanel) _swingComponent;
                 _browser.owner = this;
@@ -434 +434 @@
                                 (firstSpace != -1 && firstSpace < firstSQ)) {      // no '/' or '?'             -> search
                                 // make it a search
-                                actualURL = NetworkSettings.searchEngine + url;
+                                actualURL = NetworkSettings.SearchEngine.get() + url;
                         } else {
                                 // add the missing protocol