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

Timestamp:

01/29/14 11:22:51 (10 years ago)

Author:

jts21

Message:

Move some settings into subpackages to tidy up the main settings page a bit, and make settings parser look for settings in subpages of the current settings page if it finds a setting it doesn't know what to do with

File:

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

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

@@ -31 +31 @@
 import org.expeditee.items.ItemUtils;
 import org.expeditee.items.PermissionPair;
+import org.expeditee.items.Text;
 import org.expeditee.items.UserAppliedPermission;
-import org.expeditee.items.Text;
 import org.expeditee.network.FrameShare;
 import org.expeditee.settings.UserSettings;
+import org.expeditee.settings.folders.FolderSettings;
+import org.expeditee.settings.templates.TemplateSettings;
 import org.expeditee.stats.Formatter;
 import org.expeditee.stats.Logger;
@@ -218 +220 @@
                 } else {
 
-                        for (String path : UserSettings.FrameDirs.get()) {
+                        for (String path : FolderSettings.FrameDirs.get()) {
                                 loaded = LoadKnowPath(path, framename);
                                 if (loaded != null) {
@@ -246 +248 @@
                 StringBuffer list = new StringBuffer();
 
-                for (String path : UserSettings.FrameDirs.get()) {
+                for (String path : FolderSettings.FrameDirs.get()) {
                         File files = new File(path);
                         if (!files.exists())
@@ -308 +310 @@
                 }
 
-                for (String path : UserSettings.FrameDirs.get()) {
+                for (String path : FolderSettings.FrameDirs.get()) {
                         if (getFrameFullPathName(path, frameName) != null)
                                 return true;
@@ -319 +321 @@
                 String fullPath = null;
                 if (path == null) {
-                        for (String possiblePath : UserSettings.FrameDirs.get()) {
+                        for (String possiblePath : FolderSettings.FrameDirs.get()) {
                                 fullPath = getFrameFullPathName(possiblePath, frameName);
                                 if (fullPath != null)
@@ -1251 +1253 @@
         public static Boolean canAccessFrameset(String framesetName) {
                 framesetName = framesetName.toLowerCase();
-                for (String path : UserSettings.FrameDirs.get()) {
+                for (String path : FolderSettings.FrameDirs.get()) {
                         if ((new File(path + framesetName)).exists())
                                 return true;
@@ -1309 +1311 @@
                 Frame base = null;
                 try {
-                        base = LoadFrame(UserSettings.DefaultFrame.get());
+                        base = LoadFrame(TemplateSettings.DefaultFrame.get());
                 } catch (Exception e) {
                 }
@@ -1388 +1390 @@
 
                 // Search all the available directories for the directory
-                for (String path : UserSettings.FrameDirs.get()) {
+                for (String path : FolderSettings.FrameDirs.get()) {
                         String source = path + framesetName.toLowerCase() + File.separator;
                         File framesetDirectory = new File(source);
@@ -1428 +1430 @@
                 // search through all the directories to find the frameset we are
                 // copying
-                for (String path : UserSettings.FrameDirs.get()) {
+                for (String path : FolderSettings.FrameDirs.get()) {
                         String source = path + framesetToCopy.toLowerCase()
                                         + File.separator;