Changeset 7 for trunk/src/org/expeditee/gui/Browser.java

Timestamp:

05/01/08 12:26:53 (16 years ago)

Author:

ra33

Message:

New expeditee version

File:

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

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

@@ -37 +37 @@
         // private static final JScrollPane scrollPane = new JScrollPane();
 
+        public static Browser _theBrowser;
+        
         /**
          * Constructs a new Browser object, then launches it
@@ -43 +45 @@
          */
         public static void main(String[] args) {
-                Browser b = new Browser();
+                _theBrowser = new Browser();
                 // Why do we want to ignore repaint?
                 // b.setIgnoreRepaint(true);
-                b.requestFocus();
+                _theBrowser.requestFocus();
                 // FrameGraphics.ForceRepaint();
         }
-
+        
         public void setSizes(Dimension size) {
                 setSize(size);
@@ -63 +65 @@
                                 .getHeight() / 2)));
 
-                FrameGraphics.setMaxSize(size);
+                FrameGraphics.setMaxSize(this.getContentPane().getSize());
         }
 
@@ -75 +77 @@
                 Frame profile = FrameIO.LoadProfile(UserSettings.Username);
                 if (profile == null) {
+                        try{
                         profile = FrameIO.CreateNewProfile(UserSettings.Username);
+                        }catch(Exception e){
+                                //TODO fix this later
+                        }
                 }
                 FrameUtils.ParseProfile(profile);
@@ -110 +116 @@
                 setVisible(true);
 
-                g = (Graphics2D) getGraphics();
+                setupGraphics();
+
+                // required to accept TAB key
+                setFocusTraversalKeysEnabled(false);
+
+                assert (UserSettings.FirstFrame != null);
+                Frame firstFrame = FrameIO.LoadFrame(UserSettings.FirstFrame);
+
+                DisplayIO.setCurrentFrame(firstFrame);
+
+                // Create the action handler for the
+                FrameMouseActions mouse = new FrameMouseActions();
+                
+                this.getContentPane().addMouseListener(mouse);
+                this.getContentPane().addMouseMotionListener(mouse);
+                this.addKeyListener(new FrameKeyboardActions());
+                this.getContentPane().addMouseWheelListener(mouse);
+        }
+
+        private void setupGraphics() {
+                g = (Graphics2D) this.getContentPane().getGraphics();
                 assert g != null;
                 g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
                                 RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
                 g.setFont(g.getFont().deriveFont(40f));
-
-                FrameGraphics.setDisplayGraphics((Graphics2D) getGraphics());
-
-                // required to accept TAB key
-                setFocusTraversalKeysEnabled(false);
-
-                assert (UserSettings.FirstFrame != null);
-                Frame firstFrame = FrameIO.LoadFrame(UserSettings.FirstFrame);
-
-                DisplayIO.setCurrentFrame(firstFrame);
-
-                // Create the action handler for the
-                FrameMouseActions mouse = new FrameMouseActions();
-
-                this.addMouseListener(mouse);
-                this.addMouseMotionListener(mouse);
-                this.addKeyListener(new FrameKeyboardActions());
-                this.addMouseWheelListener(mouse);
-
-                // Rob: Why is all this being done????
-                g.dispose();
-                g = null;
+                FrameGraphics.setDisplayGraphics(g);
         }
 
@@ -158 +163 @@
          */
         public void componentResized(ComponentEvent e) {
-                FrameGraphics.setMaxSize(this.getSize());
-                // FrameGraphics.Repaint();
+                setSizes(this.getSize());
+                setupGraphics();
                 repaint();
                 //System.out.println("Resize");
@@ -181 +186 @@
          */
         public void componentHidden(ComponentEvent e) {
-        }
-
-        public int getTitleBarHeight() {
-                Rectangle contentbounds = getContentPane().getBounds();
-                contentbounds = this.getGlassPane().getBounds();
-                // contentbounds = this.getRootPane().getBounds();
-                int titleheight = getSize().height - contentbounds.height;
-
-                return titleheight;
         }