Changeset 328

Timestamp:

09/25/08 11:59:13 (16 years ago)

Author:

ra33

Message:

 

Location:

trunk/src/org/expeditee

Files:

• agents/ScaleFrameset.java (modified) (1 diff)
• agents/SearchGreenstoneByDate.java (modified) (1 diff)
• agents/SearchGreenstoneByPages.java (modified) (1 diff)
• agents/SearchGreenstoneByTitle.java (modified) (1 diff)
• greenstone/Query.java (modified) (1 diff)
• greenstone/hcibibGUI.java (deleted)
• gui/FrameCreator.java (modified) (5 diffs)
• gui/MouseEventRouter.java (modified) (1 diff)

trunk/src/org/expeditee/agents/ScaleFrameset.java

@@ -3 +3 @@
 import java.util.Collection;
 
-import org.expeditee.actions.Misc;
 import org.expeditee.gui.Frame;
-import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.FrameKeyboardActions;

trunk/src/org/expeditee/agents/SearchGreenstoneByDate.java

@@ -8 +8 @@
 import org.expeditee.greenstone.ResultDocument;
 import org.expeditee.gui.FrameCreator;
-import org.expeditee.gui.FrameGraphics;
 
 public class SearchGreenstoneByDate extends SearchGreenstone {

trunk/src/org/expeditee/agents/SearchGreenstoneByPages.java

@@ -8 +8 @@
 import org.expeditee.greenstone.ResultDocument;
 import org.expeditee.gui.FrameCreator;
-import org.expeditee.gui.FrameGraphics;
 
 public class SearchGreenstoneByPages extends SearchGreenstone {

trunk/src/org/expeditee/agents/SearchGreenstoneByTitle.java

@@ -8 +8 @@
 import org.expeditee.greenstone.ResultDocument;
 import org.expeditee.gui.FrameCreator;
-import org.expeditee.gui.FrameGraphics;
 
 public class SearchGreenstoneByTitle extends SearchGreenstone {

trunk/src/org/expeditee/greenstone/Query.java

@@ -1 +1 @@
 package org.expeditee.greenstone;
 
-import java.util.Vector;
 
 public class Query implements Cloneable

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

@@ -29 +29 @@
 
         // Next and previous links for the current frame
-        private Item _next;
-
-        private Item _prev;
+        // private Item _next;
+
+        // private Item _prev;
 
         private Frame _firstFrame;
@@ -126 +126 @@
 
                         // add link to previous frame
-                        _prev = addPreviousButton(newFrame, _current.getName());
+                        // _prev =
+                        addPreviousButton(newFrame, _current.getName());
 
                         // add link to new frame
-                        _next = addNextButton(_current, newFrame.getName());
+                        // _next =
+                        addNextButton(_current, newFrame.getName());
 
                         // add link to new frame
@@ -180 +182 @@
                                 // if there is no more room on the X axis, we have to start a
                                 // new frame
-                                if (!_multiColumn || toAdd.getBoundsWidth() + _lastX > FrameGraphics
-                                                .getMaxSize().width) {
+                                if (!_multiColumn
+                                                || toAdd.getBoundsWidth() + _lastX > FrameGraphics
+                                                                .getMaxSize().width) {
                                         // Make sure text items that are created on the current
                                         // frame are removed
@@ -207 +210 @@
                 }
         }
-        
+
         public Text addText(String toAdd, Color c, String link, String action,
                         boolean bSave) {
@@ -270 +273 @@
                 return title.getY() + title.getBoundsHeight();
         }
-        
-        public void setTitle(String titleText){
+
+        public void setTitle(String titleText) {
                 _current.setTitle(titleText);
         }

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

@@ -336 +336 @@
                                 e.getX(),
                                 e.getY(),
-                                e.getXOnScreen(),
-                                e.getYOnScreen(),
+                                /**The below methods are not compatible with Java 1.5*/
+                                /*e.getXOnScreen(),
+                                e.getYOnScreen(),*/
                                 e.getClickCount(),
                                 e.isPopupTrigger(),