Changeset 67 for trunk/src/org/expeditee/gui/DisplayIO.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/DisplayIO.java (modified) (7 diffs)

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

@@ -15 +15 @@
 import javax.swing.JOptionPane;
 
+import org.expeditee.actions.NavigationActions;
 import org.expeditee.items.Item;
 import org.expeditee.items.ItemParentStateChangedEvent;
@@ -54 +55 @@
         private static Robot _Robot;
 
-        // public static JMenuBar _MenuBar = new JMenuBar();
-
         private static boolean _TwinFrames = false;
 
@@ -61 +60 @@
          * The title to display in the Title bar.
          */
-        public static final String TITLE = "Exp16May2008A";
+        public static final String TITLE = "Exp17May2008A";
 
         private DisplayIO() {
@@ -114 +113 @@
                 }
 
-                /*
-                 * System.out.println("hs: " + hotspotPos + " start: " + start + " font: " +
-                 * size + " cursor: " + (cursorSize - start));
-                 */
-
                 int[] pixels = new int[cursorSize * cursorSize];
 
@@ -229 +223 @@
 
         /**
-         * Forces a complete repaint of the GUI and Frame
-         */
-        public static void repaint() {
-                _Browser.repaint();
-        }
-
-        /**
          * Returns the top item (last added) of the Back-Stack (which is popped off)
          * 
@@ -519 +506 @@
 
         /**
-         * Adds the given JMenu to the JMenuBar of the GUI
-         * 
-         * @param menu
-         *            The menu to add
-         */
-        /*
-         * public static void addMenu(JMenu menu) { if (menu.getItemCount() == 0)
-         * return;
-         * 
-         * _MenuBar.add(menu); // show progress _Browser.loadedMenu(menu.getText()); }
-         */
-
-        /**
-         * Performs the same action as if the user had clicked on the MenuItem at
-         * the given index in the Menu at the given index.
-         * 
-         * @param menu
-         *            The index of the menu (starts from 0)
-         * @param index
-         *            The index of the Item to simulate a click on (starts from 0)
-         */
-        /*
-         * public static void activateMenuItem(int menu, int index) { if
-         * (_MenuBar.getComponentCount() < menu) return;
-         * 
-         * JMenu act = _MenuBar.getMenu(menu);
-         * 
-         * if (act.getComponentCount() < index) return;
-         * 
-         * act.getItem(index).doClick(); }
-         * 
-         * public static int getMenuHeight() { if (_MenuBar.getHeight() < 5) return
-         * 21;
-         * 
-         * return _MenuBar.getHeight() - 5; }
-         */
-
-        /**
          * Returns the current mouse X coordinate. This coordinate is relative to
          * the left edge of the frame the mouse is in. It takes into account the
@@ -589 +538 @@
 
         public static void Back() {
+                NavigationActions.ResetLastAddToBack();
+                
                 int side = getCurrentSide();