Changeset 655 for trunk/src/org/expeditee/gui/FrameIO.java

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

File:

• trunk/src/org/expeditee/gui/FrameIO.java (modified) (12 diffs)

trunk/src/org/expeditee/gui/FrameIO.java

@@ -215 +215 @@
                 } else {
 
-                        for (String path : UserSettings.FrameDirs) {
+                        for (String path : UserSettings.FrameDirs.get()) {
                                 loaded = LoadKnowPath(path, framename);
                                 if (loaded != null) {
@@ -243 +243 @@
                 StringBuffer list = new StringBuffer();
 
-                for (String path : UserSettings.FrameDirs) {
+                for (String path : UserSettings.FrameDirs.get()) {
                         File files = new File(path);
                         if (!files.exists())
@@ -305 +305 @@
                 }
 
-                for (String path : UserSettings.FrameDirs) {
+                for (String path : UserSettings.FrameDirs.get()) {
                         if (getFrameFullPathName(path, frameName) != null)
                                 return true;
@@ -316 +316 @@
                 String fullPath = null;
                 if (path == null) {
-                        for (String possiblePath : UserSettings.FrameDirs) {
+                        for (String possiblePath : UserSettings.FrameDirs.get()) {
                                 fullPath = getFrameFullPathName(possiblePath, frameName);
                                 if (fullPath != null)
@@ -666 +666 @@
                                 + template.getName() + " from TDFC");
 
-                template.setOwner(UserSettings.UserName);
+                template.setOwner(UserSettings.UserName.get());
                 template.reset();
                 template.resetDateCreated();
@@ -1242 +1242 @@
         public static Boolean canAccessFrameset(String framesetName) {
                 framesetName = framesetName.toLowerCase();
-                for (String path : UserSettings.FrameDirs) {
+                for (String path : UserSettings.FrameDirs.get()) {
                         if ((new File(path + framesetName)).exists())
                                 return true;
@@ -1300 +1300 @@
                 Frame base = null;
                 try {
-                        base = LoadFrame(UserSettings.DefaultFrame);
+                        base = LoadFrame(UserSettings.DefaultFrame.get());
                 } catch (Exception e) {
                 }
@@ -1318 +1318 @@
                 base.setPath(path);
                 base.change();
-                base.setOwner(UserSettings.UserName);
+                base.setOwner(UserSettings.UserName.get());
                 SaveFrame(base, false);
 
@@ -1326 +1326 @@
                 base.setTitle(frameset);
                 base.change();
-                base.setOwner(UserSettings.UserName);
+                base.setOwner(UserSettings.UserName.get());
                 SaveFrame(base, true);
 
@@ -1379 +1379 @@
 
                 // Search all the available directories for the directory
-                for (String path : UserSettings.FrameDirs) {
+                for (String path : UserSettings.FrameDirs.get()) {
                         String source = path + framesetName.toLowerCase() + File.separator;
                         File framesetDirectory = new File(source);
@@ -1419 +1419 @@
                 // search through all the directories to find the frameset we are
                 // copying
-                for (String path : UserSettings.FrameDirs) {
+                for (String path : UserSettings.FrameDirs.get()) {
                         String source = path + framesetToCopy.toLowerCase()
                                         + File.separator;
@@ -1576 +1576 @@
         public static void setSavedProperties(Frame toSave) {
                 toSave.setLastModifyDate(Formatter.getDateTime());
-                toSave.setLastModifyUser(UserSettings.UserName);
+                toSave.setLastModifyUser(UserSettings.UserName.get());
                 toSave.setVersion(toSave.getVersion() + 1);
                 Time darkTime = new Time(SessionStats.getFrameDarkTime().getTime()