Changeset 754 for trunk/faces

Timestamp:

01/24/14 17:08:06 (10 years ago)

Author:

jts21

Message:

Move Apollo stuff to faces/apollo folder, add Apollo build script. TODO: Link in Apollo resources (icons) correctly (probably using the same system as used for the main Expeditee icons)

Location:

trunk/faces

Files:

• . (added)
• apollo (added)
• apollo/build.xml (added)
• apollo/jars (moved) (moved from trunk/jars_apollo )
• apollo/makeFiles (added)
• apollo/makeFiles/apollo_applet_manifest.mf (added)
• apollo/makeFiles/apollo_manifest.mf (added)
• apollo/resources (moved) (moved from trunk/resources_apollo )
• apollo/src (moved) (moved from trunk/src_apollo )
• apollo/src/org/apollo/ApolloSystem.java (modified) (1 diff)
• apollo/src/org/apollo/agents/MelodySearch.java (modified) (2 diffs)
• apollo/src/org/apollo/audio/structure/AudioStructureModel.java (modified) (2 diffs)
• apollo/src/org/apollo/util/AudioPurger.java (modified) (2 diffs)

trunk/faces/apollo/src/org/apollo/ApolloSystem.java

@@ -34 +34 @@
 import org.expeditee.gui.FrameKeyboardActions;
 import org.expeditee.gui.FrameMouseActions;
-import org.expeditee.gui.UserSettings;
+import org.expeditee.settings.UserSettings;
 import org.expeditee.importer.FrameDNDTransferHandler;
 import org.expeditee.items.Item;

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

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

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

@@ -31 +31 @@
 import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
-import org.expeditee.gui.UserSettings;
+import org.expeditee.settings.UserSettings;
 import org.expeditee.io.Conversion;
 import org.expeditee.items.ItemUtils;
@@ -290 +290 @@
 
                         String fullPath = null;
-                        for (int i = 0; i < UserSettings.FrameDirs.size(); i++) { // RISKY CODE - IN EXPEDITEE SPACE FROM RANDOM TRHEAD
-                                String possiblePath = UserSettings.FrameDirs.get(i);
+                        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);
                                 fullPath = FrameIO.getFrameFullPathName(possiblePath, rootFrameName);
                                 if (fullPath != null)

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

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