Changeset 489

Timestamp:

10/23/13 15:57:55 (11 years ago)

Author:

davidb

Message:

Changes made when making Apollo run as an applet

Location:

trunk/src_apollo/org/apollo

Files:

• ApolloSystem.java (modified) (1 diff)
• ApolloSystemApplet.java (added)
• AudioFrameKeyboardActions.java (modified) (2 diffs)
• gui/FrameLayoutDaemon.java (modified) (1 diff)
• io/AudioPathManager.java (modified) (2 diffs)
• io/IconRepository.java (modified) (1 diff)
• items/EmulatedTextItem.java (modified) (1 diff)
• items/FramePlaybackLauncher.java (modified) (1 diff)
• items/RecordOverdubLauncher.java (modified) (1 diff)

trunk/src_apollo/org/apollo/ApolloSystem.java

@@ -259 +259 @@
          * Releases all resources currently used by the SampledAudioManager.
          */
-        private static void shutdown() {
+        public static void shutdown() {
                 
                 ApolloSystemLog.println("Saving banks...");

trunk/src_apollo/org/apollo/AudioFrameKeyboardActions.java

@@ -21 +21 @@
 import org.expeditee.gui.FrameUtils;
 import org.expeditee.gui.FreeItems;
+import org.expeditee.items.UserAppliedPermission;
 import org.expeditee.items.Dot;
 import org.expeditee.items.Item;
@@ -145 +146 @@
                                                         if (ip.getParent() != current) continue;
                                                         
-                                                        if (ip.hasPermission(Permission.full)) {
+                                                        if (ip.hasPermission(UserAppliedPermission.full)) {
                                                                 // Only include lines if one of their enpoints are also  being removed
                                                                 if (ip instanceof Line) {

trunk/src_apollo/org/apollo/gui/FrameLayoutDaemon.java

@@ -69 +69 @@
         private int leftMargin = DEFAULT_LAYOUT_LEFT_MARGIN;
         private int rightMargin = DEFAULT_LAYOUT_RIGHT_MARGIN;
-        
+
+    /*  
         public static final int DEFAULT_LAYOUT_RIGHT_MARGIN = 30;
         public static final int DEFAULT_LAYOUT_LEFT_MARGIN = 30;
         public static final int MAX_TIMELINE_MARGIN_AREA = 400;
+    */
+
+        public static final int DEFAULT_LAYOUT_RIGHT_MARGIN = 300;
+        public static final int DEFAULT_LAYOUT_LEFT_MARGIN = 100;
+        public static final int MAX_TIMELINE_MARGIN_AREA = 500;
+
+
         public static final int LAYOUT_MAX_INITIATION_PIXEL = 100;
         public static final int MIN_TRACK_WIDGET_WIDTH = 20;

trunk/src_apollo/org/apollo/io/AudioPathManager.java

@@ -26 +26 @@
 
         /** Suffixed with the native file separator */
-        public static final String AUDIO_HOME_DIRECTORY = "audio" + File.separatorChar;
-        //      TODO: TMP FOR WORKING IN LINUX LABS: Avoids using my quota
-        //public static final String AUDIO_HOME_DIRECTORY = "/research/bjn8/apollosaudio/";
+        public static String AUDIO_HOME_DIRECTORY = "audio" + File.separatorChar;
         
         /** Stores all virtual names created by this repository. */
@@ -44 +42 @@
          */
         static {
+
+                String expeditee_home = System.getProperty("expeditee.home");
+
+                if (expeditee_home != null) {
+                    AUDIO_HOME_DIRECTORY = expeditee_home + File.separator + AUDIO_HOME_DIRECTORY;                  
+                }
 
                 // Ensure audio directory exists

trunk/src_apollo/org/apollo/io/IconRepository.java

@@ -59 +59 @@
                 if (icon == null) {
                         try {
-                                
-                                URL url = ClassLoader.getSystemResource("org/apollo/icons/" + name);
-                                
+                                URL url;
+                                ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+                                if (classLoader!=null) {
+                                    // Applet friendly
+                                    url = classLoader.getResource("org/apollo/icons/" + name);
+                                }
+                                else {
+                                    url = ClassLoader.getSystemResource("org/apollo/icons/" + name);
+                                }
+
                                 if (url != null) {
                                         icon = new ImageIcon(url);

trunk/src_apollo/org/apollo/items/EmulatedTextItem.java

@@ -247 +247 @@
                                 Point2D.Float newMouse = emulatedSource.moveCursor(
                                                 (e.getKeyCode() == KeyEvent.VK_LEFT) ? Text.LEFT : Text.RIGHT, 
-                                                (float)p.getX(), (float)p.getY(), false);
+                                                (float)p.getX(), (float)p.getY(), false, false);
                                 
                                 if (newMouse != null) {

trunk/src_apollo/org/apollo/items/FramePlaybackLauncher.java

@@ -112 +112 @@
 
         @Override
-        public int getWidth() {
+        public Integer getWidth() {
                 return WIDTH;
         }

trunk/src_apollo/org/apollo/items/RecordOverdubLauncher.java

@@ -87 +87 @@
 
                 @Override
-                public int getWidth() {
+                public Integer getWidth() {
                         return WIDTH;
                 }