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

Timestamp:

05/19/08 12:03:18 (16 years ago)

Author:

ra33

Message:

Fixed a bunch of problems with rectangles and resizing the window, as well as adding some more unit tests etc.

File:

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

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

@@ -31 +31 @@
 public class Browser extends JFrame implements ComponentListener,
                 WindowListener, WindowStateListener {
-        
+
         /**
          * Default version - just to stop eclipse from complaining about it.
@@ -40 +40 @@
 
         public static Browser _theBrowser;
-        
+
         /**
          * Constructs a new Browser object, then launches it
@@ -49 +49 @@
                 _theBrowser = new Browser();
                 // Why do we want to ignore repaint?
-                // b.setIgnoreRepaint(true);
+                //_theBrowser.setIgnoreRepaint(true);
                 _theBrowser.requestFocus();
                 // FrameGraphics.ForceRepaint();
         }
-        
+
         public void setSizes(Dimension size) {
                 setSize(size);
                 setPreferredSize(size);
-                addWindowListener(this);
-                addWindowStateListener(this);
-
+
+                FrameGraphics.setMaxSize(this.getContentPane().getSize());
+        }
+
+        public Browser() {
+                // Use the default values initially so we can load the profile frame
+                setSizes(new Dimension(UserSettings.InitialWidth,
+                                UserSettings.InitialHeight));
                 // center the frame on the screen
                 Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
                 double xpos = screen.getWidth() / 2;
                 double ypos = screen.getHeight() / 2;
-                setLocation((int) (xpos - (size.getWidth() / 2)), (int) (ypos - (size
-                                .getHeight() / 2)));
-
-                FrameGraphics.setMaxSize(this.getContentPane().getSize());
-        }
-
-        public Browser() {
-                // Use the default values initially so we can load the profile frame
-                setSizes(new Dimension(UserSettings.InitialWidth,
-                                UserSettings.InitialHeight));
+                setLocation((int) (xpos - (UserSettings.InitialWidth / 2)),
+                                (int) (ypos - (UserSettings.InitialHeight / 2)));
+
+                addWindowListener(this);
+                addWindowStateListener(this);
 
                 UserSettings.Init();
-                UserSettings.Username = FrameIO.ConvertToValidFramesetName(System.getProperty("user.name"));
+                UserSettings.Username = FrameIO.ConvertToValidFramesetName(System
+                                .getProperty("user.name"));
                 String userName = UserSettings.Username;
                 Frame profile = FrameIO.LoadProfile(userName);
@@ -83 +84 @@
                                 profile = FrameIO.CreateNewProfile(userName);
                         } catch (Exception e) {
-                                //TODO tell the user that there was a problem creating the profile frame and close nicely
+                                // TODO tell the user that there was a problem creating the
+                                // profile frame and close nicely
                                 e.printStackTrace();
-                                assert(false);
+                                assert (false);
                         }
                 }
@@ -95 +97 @@
                                 UserSettings.InitialHeight));
 
-                //set the layout to absolute layout for widgets
+                // set the layout to absolute layout for widgets
                 this.getContentPane().setLayout(new AbsoluteLayout());
-                //enable the glasspane-for capturing all mouse events
-                this.setGlassPane(new MouseEventRouter(getJMenuBar(), getContentPane()));
+                // enable the glasspane-for capturing all mouse events
+                this
+                                .setGlassPane(new MouseEventRouter(getJMenuBar(),
+                                                getContentPane()));
                 this.getGlassPane().setVisible(true);
                 this.getContentPane().setBackground(Color.white);
                 this.getContentPane().setFocusTraversalKeysEnabled(false);
-                
+
                 setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
@@ -147 +151 @@
         private void setupGraphics() {
                 g = (Graphics2D) this.getContentPane().getGraphics();
-                assert g != null;
+                assert (g != null);
                 g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
                                 RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
@@ -154 +158 @@
         }
 
+        // private int count = 0;
         @Override
         public void paint(Graphics g) {
+                // All this does is make sure the screen is repainted when the browser
+                // is moved so that some of the window is off the edge of the display
+                // then moved back into view
                 super.paint(g);
                 FrameGraphics.Repaint();
+                //System.out.println("Paint " + count++);
         }
 
@@ -166 +175 @@
                 setSizes(this.getSize());
                 setupGraphics();
-                repaint();
+                FrameIO.RefreshCasheImages();
+                FrameGraphics.Repaint();
         }
 
@@ -211 +221 @@
         }
 
-        /*
-         * public void windowGainedFocus(WindowEvent e) { FrameGraphics.Repaint(); }
-         * 
-         * public void windowLostFocus(WindowEvent e) { //FrameGraphics.Repaint(); }
-         */
         public void windowStateChanged(WindowEvent e) {
-                //FrameGraphics.Repaint();
-                //System.out.println('C');
+                // FrameGraphics.Repaint();
+                // System.out.println('C');
         }