Changeset 1215 for trunk

Timestamp:

01/30/19 13:00:59 (5 years ago)

Author:

bln4

Message:

Browser.java -> Temporary change to Browser.java to allow for starting in authenticated mode. Once startup of Expeditee has been decided upon this will be merged in perm.

File:

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

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

@@ -20 +20 @@
 
 import java.io.File;
+import java.io.IOException;
 import java.net.Authenticator;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -51 +56 @@
 import org.expeditee.taskmanagement.SaveStateChangedEvent;
 import org.expeditee.taskmanagement.SaveStateChangedEventListener;
+import org.ngikm.NGIKMSystem;
+import org.ngikm.actions.DebugActions;
+import org.ngikm.actions.EntityActions;
 
 /**
@@ -148 +156 @@
         protected static boolean _initComplete = false;
         
-        protected static String _startFrame = null;
+        private static String _startFrame = null;
 
         /**
@@ -159 +167 @@
                 // Parse the starting frame command-line argument
                 if(args.length > 0) {
-                        _startFrame = args[0];
-                        if(!Character.isDigit(_startFrame.charAt(_startFrame.length() - 1))) {
-                                _startFrame = _startFrame + "1";
+                        setStartFrame(args[0]);
+                        if(!Character.isDigit(getStartFrame().charAt(getStartFrame().length() - 1))) {
+                                setStartFrame(getStartFrame() + "1");
                         }
                 } else {
-                    _startFrame = "home1";
+                    setStartFrame("home1");
                 }
 
@@ -188 +196 @@
         }
         
-        public static void init()
-        {
+        public static void init() {
+                if (Boolean.getBoolean("auth")) {
+                        try {
+                                org.expeditee.auth.Authenticator.getInstance();
+                                _initComplete = true;
+                                return;
+                        } catch (KeyStoreException | NoSuchAlgorithmException | CertificateException | IOException | ClassNotFoundException | SQLException e) {
+                                e.printStackTrace();
+                        }
+                } else if (Boolean.getBoolean("ngikmspike")) {
+                        System.out.println("Running NGIKM Demo");
+                        Actions.LoadMethods(EntityActions.class);
+                        Actions.LoadMethods(DebugActions.class);
+                }
                 _theBrowser = new Browser();
 
@@ -202 +222 @@
          * @return
          * 
-         * True if the application is about to exit. False if not. Not that this is
+         * True if the application is about to exit. False if not. Note that this is
          * only set once the window is in its closed state (not closing) or if the
-         * application has explicity being requested to exit.
+         * application has explicitly being requested to exit.
          * 
          * @see Browser#exit()
@@ -217 +237 @@
         }
 
-        protected Browser()
-        {
+        protected Browser() {
                 // center the frame on the screen
                 GraphicsManager g = EcosystemManager.getGraphicsManager();
@@ -227 +246 @@
 
                 DisplayController.Init();
-                
+
                 DisplayController.addDisplayObserver(WidgetCacheManager.getInstance());
                 if (ECOSYSTEM_TYPE == Ecosystem.Swing) {
@@ -234 +253 @@
 
                 setInputManagerWindowRoutines();
-                
+
                 // Reset windows to user specified size
                 Dimension initialWindowSize = new Dimension(UserSettings.InitialWidth.get(), UserSettings.InitialHeight.get());
                 g.setWindowSize(initialWindowSize);
-                
+
                 // Load documentation and start pages
                 FrameUtils.extractResources(false);
-                
-                // Load fonts before loading any frames so the items on the frames will be able to access their fonts
+
+                // Load fonts before loading any frames so the items on the frames will be able
+                // to access their fonts
                 Text.InitFonts();
-                
+
                 Settings.Init();
                 Frame userProfile = loadProfiles();
@@ -250 +270 @@
                 // Listen for save status to display during and after runtime
                 EntitySaveManager.getInstance().addSaveStateChangedEventListener(this);
-                
+
                 try {
                         MessageBay.warningMessages(Actions.Init());
@@ -256 +276 @@
                         // Go to the start frame if specified, otherwise go to the profile frame
                         Frame start = null;
-                        if(_startFrame == null) {
-                                _startFrame = UserSettings.StartFrame.get();
-                                if(_startFrame != null && !Character.isDigit(_startFrame.charAt(_startFrame.length() - 1))) {
-                                        _startFrame = _startFrame + "1";
-                                }
-                        }
-                        
-                if((start = FrameIO.LoadFrame(_startFrame)) != null) {
-                        // Make sure HomeFrame gets set
-                        UserSettings.HomeFrame.set(start.getName());
-                        
-                        // Go to the start frame
-                        DisplayController.setCurrentFrame(start, true);
-                } else {
-                        // If an invalid start frame was specified, show a warning
-                        if(_startFrame != null) {
-                                        MessageBay.warningMessage("Unknown frame: " + _startFrame);
-                                }
-                        
-                        // Go to the profile frame
-                        FrameUtils.loadFirstFrame(userProfile);
-                }
-                
+                        if (getStartFrame() == null) {
+                                setStartFrame(UserSettings.StartFrame.get());
+                                if (getStartFrame() != null && !Character.isDigit(getStartFrame().charAt(getStartFrame().length() - 1))) {
+                                        setStartFrame(getStartFrame() + "1");
+                                }
+                        }
+
+                        if ((start = FrameIO.LoadFrame(getStartFrame())) != null) {
+                                // Make sure HomeFrame gets set
+                                UserSettings.HomeFrame.set(start.getName());
+
+                                // Go to the start frame
+                                DisplayController.setCurrentFrame(start, true);
+                        } else {
+                                // If an invalid start frame was specified, show a warning
+                                if (getStartFrame() != null) {
+                                        MessageBay.warningMessage("Unknown frame: " + getStartFrame());
+                                }
+
+                                // Go to the profile frame
+                                FrameUtils.loadFirstFrame(userProfile);
+                        }
+
                         DisplayController.updateTitle();
 
@@ -284 +304 @@
                         if (!DisplayController.getCurrentFrame().equals(userProfile)) {
                                 StandardGestureActions.Refresh();
-                        // If it's the profile frame just reparse it in order to display images/circles/widgets correctly
+                                // If it's the profile frame just reparse it in order to display
+                                // images/circles/widgets correctly
                         } else {
                                 FrameUtils.Parse(userProfile);
@@ -434 +455 @@
         }
         
-        private static void setInputManagerWindowRoutines()
-        {
+        private static void setInputManagerWindowRoutines()     {
                 InputManager manager = EcosystemManager.getInputManager();
                 
@@ -497 +517 @@
          * @return The user's profile frame.
          */
-        private static Frame loadProfiles()
+        public static Frame loadProfiles()
         {
                 String defaultProfileName = UserSettings.DEFAULT_PROFILE_NAME;
@@ -539 +559 @@
                 return profile;
         }
+
+        public static String getStartFrame() {
+                return _startFrame;
+        }
+
+        public static void setStartFrame(String _startFrame) {
+                Browser._startFrame = _startFrame;
+        }
 }