Changeset 903

Timestamp:

03/16/14 14:53:01 (10 years ago)

Author:

davidb

Message:

Changes needed after restructuring of Settings code/classes

Location:

trunk/faces/apollo/src/org/apollo

Files:

• agents/MelodySearch.java (modified) (2 diffs)
• audio/structure/AudioStructureModel.java (modified) (2 diffs)
• util/AudioPurger.java (modified) (2 diffs)

trunk/faces/apollo/src/org/apollo/agents/MelodySearch.java

@@ -30 +30 @@
 import org.expeditee.gui.FrameIO;
 import org.expeditee.settings.UserSettings;
+import org.expeditee.settings.folders.FolderSettings;
 import org.expeditee.items.Item;
 import org.expeditee.items.ItemUtils;
@@ -457 +458 @@
                 String fullPath = null;
                 if (path == null) {
-                        for (String possiblePath : UserSettings.FrameDirs.get()) {
+                        for (String possiblePath : FolderSettings.FrameDirs.get()) {
                                 fullPath = FrameIO.getFrameFullPathName(possiblePath, frameName);
                                 if (fullPath != null)

trunk/faces/apollo/src/org/apollo/audio/structure/AudioStructureModel.java

@@ -35 +35 @@
 import org.expeditee.items.ItemUtils;
 import org.expeditee.items.widgets.InteractiveWidget;
+import org.expeditee.settings.folders.FolderSettings;
 
 /**
@@ -290 +291 @@
 
                         String fullPath = null;
-                        for (int i = 0; i < UserSettings.FrameDirs.get().size(); i++) { // RISKY CODE - IN EXPEDITEE SPACE FROM RANDOM TRHEAD
-                                String possiblePath = UserSettings.FrameDirs.get().get(i);
+                        for (int i = 0; i < FolderSettings.FrameDirs.get().size(); i++) { // RISKY CODE - IN EXPEDITEE SPACE FROM RANDOM TRHEAD
+                                String possiblePath = FolderSettings.FrameDirs.get().get(i);
                                 fullPath = FrameIO.getFrameFullPathName(possiblePath, rootFrameName);
                                 if (fullPath != null)

trunk/faces/apollo/src/org/apollo/util/AudioPurger.java

@@ -11 +11 @@
 import org.apollo.widgets.SampledTrack;
 import org.expeditee.settings.UserSettings;
+import org.expeditee.settings.folders.FolderSettings;
 import org.expeditee.items.ItemUtils;
 
@@ -33 +34 @@
                 Set<String> referencedAudio = new HashSet<String>();
                 
-                for (String path : UserSettings.FrameDirs.get()) {
+                for (String path : FolderSettings.FrameDirs.get()) {
                         
                         File frameDir = new File(path);