Changeset 667

Timestamp:

01/08/14 13:58:12 (10 years ago)

Author:

jts21

Message:

Allow specifying a frame to start at as a commandline option when starting Expeditee. If a frameset name is specified without a frame number, frame 1 is assumed. If an invalid frame is specified, the profile frame will be loaded as usual.

File:

• trunk/src/org/expeditee/gui/Browser.java (modified) (4 diffs)

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

@@ -79 +79 @@
 
         private static boolean _initComplete = false;
+        
+        private static String _startFrame = null;
 
         /**
@@ -86 +88 @@
          */
         public static void main(String[] args) {
+                
+                if(args.length > 0) {
+                        _startFrame = args[0];
+                        if(! Character.isDigit(_startFrame.charAt(_startFrame.length() - 1)))
+                                _startFrame = _startFrame + "1";
+                }
+
+
 
                 // Prepare all expeditee and swing data on the AWT event thread.
@@ -279 +289 @@
                         // Turn off XRay mode and load the first frame
                         FrameGraphics.setMode(FrameGraphics.MODE_NORMAL, false);
-                        FrameUtils.loadFirstFrame(profile);
+                        
+                        // Go to the start frame if specified, otherwise go to the profile frame
+                        Frame start = null;
+                if((start = FrameIO.LoadFrame(_startFrame)) != null) {
+                        // Make sure HomeFrame gets set
+                        if (UserSettings.HomeFrame.get() == null)
+                                UserSettings.HomeFrame.set(profile.getName());
+                        // Make sure the user can get back to the profile frame easily
+                        DisplayIO.addToBack(profile);
+                        // Go to the start frame
+                        DisplayIO.setCurrentFrame(start, true);
+                } else {
+                        // If an invalid start frame was specified, show a warning
+                        if(_startFrame != null) {
+                                warningMessages.add("Unknown frame: " + _startFrame);
+                        }
+                        // Go to the profile frame
+                        FrameUtils.loadFirstFrame(profile);
+                }
                         DisplayIO.UpdateTitle();
 
@@ -290 +318 @@
                                 MessageBay.warningMessage(message);
 
-                        this.getContentPane().addKeyListener(
-                                        FrameKeyboardActions.getInstance());
+                        this.getContentPane().addKeyListener(FrameKeyboardActions.getInstance());
                         this.addKeyListener(FrameKeyboardActions.getInstance());
 
-                        _mouseEventRouter.addExpediteeMouseListener(FrameMouseActions
-                                        .getInstance());
-                        _mouseEventRouter.addExpediteeMouseMotionListener(FrameMouseActions
-                                        .getInstance());
-                        _mouseEventRouter.addExpediteeMouseWheelListener(FrameMouseActions
-                                        .getInstance());
+                        _mouseEventRouter.addExpediteeMouseListener(FrameMouseActions.getInstance());
+                        _mouseEventRouter.addExpediteeMouseMotionListener(FrameMouseActions.getInstance());
+                        _mouseEventRouter.addExpediteeMouseWheelListener(FrameMouseActions.getInstance());
 
                         // Dont refresh for the profile frame otherwise error messages are shown twice