Changeset 311

Timestamp:

09/22/08 16:23:12 (16 years ago)

Author:

ra33

Message:

Fixed a few bugs that were makin unit tests fail...
Also added Greenstone search of HCI Bib tex

Location:

trunk/src/org/expeditee

Files:

• actions/Actions.java (modified) (1 diff)
• actions/Misc.java (modified) (3 diffs)
• actions/Simple.java (modified) (1 diff)
• agents/MailTree.java (modified) (1 diff)
• agents/PdfFrameset.java (modified) (1 diff)
• agents/WriteTree.java (modified) (1 diff)
• agents/mail/MailSession.java (modified) (1 diff)
• gui/Browser.java (modified) (6 diffs)
• gui/DisplayIO.java (modified) (1 diff)
• gui/Frame.java (modified) (4 diffs)
• gui/FrameCreator.java (modified) (2 diffs)
• gui/FrameGraphics.java (modified) (2 diffs)
• gui/FrameIO.java (modified) (1 diff)
• gui/FrameKeyboardActions.java (modified) (2 diffs)
• gui/FrameMouseActions.java (modified) (1 diff)
• gui/FrameUtils.java (modified) (2 diffs)
• gui/UserSettings.java (modified) (1 diff)
• io/DefaultFramesetWriter.java (modified) (1 diff)
• items/Circle.java (modified) (1 diff)
• items/FramePicture.java (modified) (1 diff)
• items/Item.java (modified) (4 diffs)
• items/ItemUtils.java (modified) (2 diffs)
• items/Line.java (modified) (3 diffs)
• items/Picture.java (modified) (1 diff)
• items/Text.java (modified) (3 diffs)
• items/XRayable.java (modified) (1 diff)
• items/widgets/WidgetCorner.java (modified) (1 diff)
• items/widgets/charts/AbstractCategory.java (modified) (1 diff)
• items/widgets/charts/AbstractPie.java (modified) (1 diff)
• items/widgets/charts/TimeSeries.java (modified) (1 diff)
• math/ExpediteeJEP.java (modified) (1 diff)
• network/DefaultServer.java (modified) (1 diff)
• network/FrameSaver.java (modified) (1 diff)
• network/FrameServer.java (modified) (1 diff)
• network/FrameShare.java (modified) (2 diffs)
• network/MessageReciever.java (modified) (1 diff)
• network/Peer.java (modified) (1 diff)
• simple/IncorrectTypeException.java (modified) (1 diff)
• simple/Primitives.java (modified) (1 diff)

trunk/src/org/expeditee/actions/Actions.java

@@ -861 +861 @@
                 try {
                         return PerformAction(current, launcher, command);
+                }catch (RuntimeException e) {
+                        MessageBay.errorMessage("Action failed: " + e.getMessage());
                 } catch (Exception e) {
-                        MessageBay.errorMessage(e.getMessage());
+                        MessageBay.errorMessage("Action failed: " + e.getClass().getSimpleName());
                 }
                 return null;

trunk/src/org/expeditee/actions/Misc.java

@@ -764 +764 @@
                 for (Item i : items) {
                         i.setParent(null);
+                        i.invalidateAll();
                 }
                 FrameMouseActions.pickup(items);
-                FrameGraphics.Repaint();
+                // TODO figure out why this isnt repainting stuff immediately
+                // All of text item doesnt repaint until the cursor is moved
+                FrameGraphics.requestRefresh(true);
         }
 
@@ -856 +859 @@
                         if (item instanceof Text && item.getBackgroundColor() != null) {
                                 d[0].setFillColor(item.getBackgroundColor());
-                        }else{
+                        } else {
                                 d[0].setFillColor(item.getFillColor());
                         }
@@ -874 +877 @@
                 Reminders.stop();
         }
-        
-        public static void print(String file){
+
+        public static void print(String file) {
                 try {
                         if (Browser._theBrowser.isVersion6()) {

trunk/src/org/expeditee/actions/Simple.java

@@ -2053 +2053 @@
                                 } catch (Exception e) {
                                 }
+                        }else{
+                                Frame zero = FrameIO.LoadFrame(freshCopy.getFramesetName() + "0");
+                                freshCopy.setPath(zero.getPath());
                         }
                         boolean success = false;

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

@@ -2 +2 @@
 
 import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 

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

@@ -6 +6 @@
 import org.expeditee.gui.MessageBay;
 import org.expeditee.io.PdfFramesetWriter;
-import org.expeditee.items.widgets.InteractiveWidget;
 
 

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

@@ -68 +68 @@
         public boolean initialise(Frame start, Item launcher) {
                 if (_outFile == null)
-                        _outFile = start.getExportFileName();
+                        _outFile = start.getExportFileTagValue();
 
                 try {

trunk/src/org/expeditee/agents/mail/MailSession.java

@@ -35 +35 @@
 import org.expeditee.gui.MessageBay;
 import org.expeditee.importer.FrameDNDTransferHandler;
-import org.expeditee.items.Item;
 import org.expeditee.items.Text;
 

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

@@ -58 +58 @@
 
         private boolean _version6 = false;
-        
+
         public boolean isVersion6() {
                 return _version6;
@@ -193 +193 @@
                 if (version.startsWith("1.6")) {
                         // Set the drag and drop handler
-                        _version6  = true;
+                        _version6 = true;
                         setTransferHandler(FrameDNDTransferHandler.getInstance());
                 } else {
@@ -405 +405 @@
                                                  */
                                                 while (Simple.isProgramRunning()) {
-                                                        Thread.sleep(100); // Brook: What purpose does this
-                                                        // serve?
+                                                        Thread.sleep(100);
+                                                        /* Brook: What purpose does this serve? */
                                                 }
-                                                MessageBay.displayMessage("Stopping Agents..."); // TODO:
-                                                // Only
-                                                // stop
-                                                // if
-                                                // need
-                                                // to...
+                                                MessageBay.displayMessage("Stopping Agents...");
+                                                /* TODO: Only stop if need to... */
                                                 while (Actions.isAgentRunning()) {
                                                         Thread.sleep(100); // Brook: What purpose does this
@@ -424 +420 @@
                                         MessageBay.displayMessage("Saving current frame...");
                                         FrameIO.SaveFrame(DisplayIO.getCurrentFrame());
-
-                                        while (FrameIO.moveFrameset("messages",
-                                                        FrameIO.MESSAGES_PATH))
-                                                ;
 
                                         MessageBay.displayMessage("Saving stats...");
@@ -446 +438 @@
 
                                         MessageBay.displayMessage("System exited");
+
+                                        //Finally remove the messages frameset
+                                        while (FrameIO.moveFrameset("messages",
+                                                        FrameIO.MESSAGES_PATH)) {
+                                                ;
+                                        }
+
                                         System.exit(0);
                                 }
@@ -459 +458 @@
         public static Browser initializeForTesting() {
                 if (Browser._theBrowser == null) {
+                        FrameShare.disableNetworking = true;
                         MailSession._autoConnect = false;
+
                         Browser.main(null);
                         try {

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

@@ -69 +69 @@
          * The title to display in the Title bar.
          */
-        public static final String TITLE = "Exp16Sep2008A";
+        public static final String TITLE = "Exp22Sep2008A";
 
         private DisplayIO() {

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

@@ -84 +84 @@
 
         private String path;
-        
+
         private boolean _isLocal = true;
 
@@ -206 +206 @@
                         notifyObservers();
                 }
-                
+
                 if (oldValue == value)
                         return;
@@ -1654 +1654 @@
          */
         public String getExportFileName() {
-                return getAnnotationValue("file");
+                String fileName = getExportFileTagValue();
+
+                if (fileName == null) {
+                        fileName = getTitle();
+
+                        if (fileName == null) {
+                                fileName = getName();
+                        }
+                }
+
+                return fileName;
         }
 
@@ -2068 +2078 @@
                 return _isLocal;
         }
+
+        public String getExportFileTagValue() {
+                return getAnnotationValue("file");
+        }
 }

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

@@ -207 +207 @@
                 }
         }
-
+        
         public Text addText(String toAdd, Color c, String link, String action,
                         boolean bSave) {
@@ -270 +270 @@
                 return title.getY() + title.getBoundsHeight();
         }
+        
+        public void setTitle(String titleText){
+                _current.setTitle(titleText);
+        }
 }

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

@@ -146 +146 @@
                         if (DisplayIO.isTwinFramesOn()) {
                                 Frame opposite = DisplayIO.getOppositeFrame();
-                                // if (opposite != null) {
+                                
+                                /*When running the test suite opposite may be null!*/
+                                if (opposite != null) {
                                 opposite.setBuffer(null);
                                 opposite.refreshSize();
-                                // }
+                                }
                         }
                 }
@@ -918 +920 @@
                                 damagedAreas.clear();
                         }
-                        // System.out.println("FULLSCREEN REFRESH"); // TODO: REMOVE
+                        //System.out.println("FULLSCREEN REFRESH"); // TODO: REMOVE
                 }
 

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

@@ -906 +906 @@
                         }
                 } catch (IOException ioe) {
+                        ioe.printStackTrace();
                         ioe.getStackTrace();
                         Logger.Log(ioe);

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

@@ -1254 +1254 @@
                                 // Either position the new item below the title or just above
                                 // the first item below the title
-                                if (toDropFrom == title)
+                                if (toDropFrom == title && column.get(0) != title)
                                         yPos = Math.min(column.get(0).getY() - 1, title.getY()
                                                         + title.getBoundsHeight()
@@ -1583 +1583 @@
                                 float current = Math.abs(line.getThickness());
                                 current = Math.max(current + diff, Item.MINIMUM_THICKNESS);
-                                line.getStartItem().setThickness(current);
+                                line.setThickness(current);
                                 FrameGraphics.Repaint();
                                 return;

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

@@ -648 +648 @@
 
                 if (clicked instanceof Text) {
-                        if (((Text) clicked).getText().length() == 0)
+                        Text text = (Text) clicked;
+                        /*Dont follow link when just highlighting text with the left button*/
+                        if (text.getText().length() == 0)
                                 clicked = null;
+                        else if (text.getSelectionSize() > 0){
+                                return;
+                        }
                 }
 

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

@@ -14 +14 @@
 import java.util.List;
 
+import org.expeditee.agents.SearchGreenstone;
 import org.expeditee.agents.mail.MailSession;
 import org.expeditee.io.Logger;
@@ -584 +585 @@
                         else if (attribute.equals("networksettings"))
                                 FrameShare.init(item.getChild());
+                        else if (attribute.equals("greenstonesettings"))
+                                SearchGreenstone.init(item.getChild());
                         else if (attribute.equals("reminders"))
                                 Reminders.init(item.getChild());

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

@@ -3 +3 @@
 import java.io.File;
 import java.net.URL;
-import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;

trunk/src/org/expeditee/io/DefaultFramesetWriter.java

@@ -19 +19 @@
         protected void outputFrame(Frame toWrite) throws IOException {
                 String framesetName = toWrite.getFramesetName();
-                int count = FrameIO.getLastNumber(framesetName);
-
-                for (long i = _firstFrame; i <= _maxFrame && i <= count; i++) {
+                
+                _maxFrame = Math.min(_maxFrame, FrameIO.getLastNumber(framesetName));
+                
+                for (long i = _firstFrame; i <= _maxFrame; i++) {
                         if (_stop) {
                                 break;

trunk/src/org/expeditee/items/Circle.java

@@ -325 +325 @@
                 _line.setPermission(p);
         }
+        
+        @Override
+        public void scale(Float scale, int originX, int originY) {
+                getCenter().scale(scale, originX, originY);
+                super.scale(scale, originX, originY);
+        }
+        
+        @Override
+        public void setThickness(float thick, boolean setConnected) {
+                super.setThickness(thick, setConnected);
+                _line.refreshStroke(thick);
+        }
 }

trunk/src/org/expeditee/items/FramePicture.java

@@ -5 +5 @@
 import java.awt.image.ImageObserver;
 
-import org.expeditee.gui.AttributeUtils;
 import org.expeditee.gui.AttributeValuePair;
 import org.expeditee.gui.Frame;

trunk/src/org/expeditee/items/Item.java

@@ -35 +35 @@
 import org.expeditee.gui.MessageBay;
 import org.expeditee.gui.Overlay;
-import org.expeditee.gui.UserSettings;
 import org.expeditee.gui.Vector;
 import org.expeditee.io.Conversion;
@@ -1724 +1723 @@
          * @param thick
          */
-        public void setThickness(float thick) {
+        public final void setThickness(float thick) {
                 setThickness(thick, true);
         }
@@ -1757 +1756 @@
                         line.setThickness(thick, setConnectedThickness);
 
-                updatePolygon();
+                if (setConnectedThickness)
+                        updatePolygon();
 
                 if (bigger) {
@@ -2698 +2698 @@
                 return _editTarget;
         }
+
+        public void scale(Float scale, int originX, int originY) {
+                setXY(getX() * scale + originX, getY() * scale + originY);
+                setArrowheadLength(getArrowheadLength() * scale);
+
+                float thickness = getThickness();
+                if (thickness > 0)
+                        setThickness(thickness * scale, false);
+
+                // DONT PUT SIZE IN HERE CAUSE IT STUFFS UP CIRCLES
+
+                updatePolygon();
+        }
 }

trunk/src/org/expeditee/items/ItemUtils.java

@@ -940 +940 @@
 
                 //TODO encapsulate this somewhere inside of circle class!
-                if(item instanceof Circle){
-                        scaleItem(v, ((Circle)item).getCenter());
-                }
+//              if(item instanceof Circle){
+//                      scaleItem(v, ((Circle)item).getCenter());
+//              }
                 
-                if (!(item instanceof Line)) {
-                        item.setXY(item.getX() * scale + originX, item.getY() * scale
-                                        + originY);
-                        item.setArrowheadLength(item.getArrowheadLength() * scale);
+                if (!(item instanceof Line)) {          
                         if (item.getColor() == null) {
                                 item.setColor(defaultForeground);
@@ -957 +954 @@
                                 item.setFillColor(defaultBackground);
                         }
-                        
-                        float thickness = item.getThickness();
-                        if(thickness > 0)
-                                item.setThickness(thickness * scale);
-                        
-                        if (item instanceof Text)
-                                item.setSize(item.getSize() * scale);
-                        else if (item instanceof Picture) {
-                                Picture p = (Picture) item;
-                                p.setScale(p.getScale() * scale);
-                        }
+
                         if (permission.equals(Permission.none)) {
                                 item.setLinkMark(false);
                                 item.setActionMark(false);
-                        } else {
-                                item.updatePolygon();
-                        }
+                        }
+                        
+                        item.scale(scale, originX, originY);
                 }
 

trunk/src/org/expeditee/items/Line.java

@@ -85 +85 @@
         }
 
-        private void refreshStroke(float thick) {
+        public void refreshStroke(float thick) {
                 thick = Math.round(thick);
                 
@@ -638 +638 @@
         @Override
         public final float getThickness() {
-                return (_start.getThickness() + _end.getThickness()) / 2;
+                assert(_start.getThickness() == _end.getThickness());
+                
+                return _start.getThickness();
         }
 
@@ -1188 +1190 @@
                 return true;
         }
+        
+        @Override
+        public void scale(Float scale, int originX, int originY) {
+        }
 }

trunk/src/org/expeditee/items/Picture.java

@@ -616 +616 @@
 
         }
+        
+        @Override
+        public void scale(Float scale, int originX, int originY){
+                setScale(getScale() * scale);
+                super.scale(scale, originX, originY);
+        }
 
 }

trunk/src/org/expeditee/items/Text.java

@@ -970 +970 @@
                 newFace = newFace.toLowerCase().trim();
 
-                if (newFace.equals("plain")) {
+                if (newFace.equals("plain") || newFace.equals("p")) {
                         setFont(getPaintFont().deriveFont(Font.PLAIN));
-                } else if (newFace.equals("bold")) {
+                } else if (newFace.equals("bold") || newFace.equals("b")) {
                         setFont(getPaintFont().deriveFont(Font.BOLD));
-                } else if (newFace.equals("italic")) {
+                } else if (newFace.equals("italic") || newFace.equals("i")) {
                         setFont(getPaintFont().deriveFont(Font.ITALIC));
-                } else if (newFace.equals("bolditalic") || newFace.equals("italicbold")) {
+                } else if (newFace.equals("bolditalic") || newFace.equals("italicbold")
+                                || newFace.equals("bi") || newFace.equals("ib")) {
                         setFont(getPaintFont().deriveFont(Font.BOLD + Font.ITALIC));
                 }
@@ -1555 +1556 @@
         public void setSize(float size) {
                 invalidateAll();
-                //size *= UserSettings.ScaleFactor;
+                // size *= UserSettings.ScaleFactor;
                 // Dont want to have size set when duplicating a point which has size 0
                 if (size < 0)
@@ -2041 +2042 @@
                 invalidateFill();
         }
+
+        @Override
+        public void scale(Float scale, int originX, int originY) {
+                setSize(getSize() * scale);
+                setWidth(Math.round(getWidth() * scale));
+                super.scale(scale, originX, originY);
+                rebuild(true);
+        }
 }

trunk/src/org/expeditee/items/XRayable.java

@@ -135 +135 @@
         
         @Override
-        public void setThickness(float thick) {
+        public void setThickness(float thick, boolean setConnected) {
                 this.invalidateCommonTrait(ItemAppearence.Thickness);
-                _source.setThickness(thick);
+                _source.setThickness(thick, setConnected);
                 this.invalidateCommonTrait(ItemAppearence.Thickness);
         }

trunk/src/org/expeditee/items/widgets/WidgetCorner.java

@@ -6 +6 @@
 import java.util.List;
 
-import org.expeditee.gui.FrameGraphics;
 import org.expeditee.items.Dot;
 import org.expeditee.items.ItemParentStateChangedEvent;

trunk/src/org/expeditee/items/widgets/charts/AbstractCategory.java

@@ -4 +4 @@
 import java.util.Collection;
 
-import org.expeditee.gui.AttributeUtils;
 import org.expeditee.gui.AttributeValuePair;
 import org.expeditee.items.Text;

trunk/src/org/expeditee/items/widgets/charts/AbstractPie.java

@@ -4 +4 @@
 import java.awt.Color;
 
-import org.expeditee.gui.AttributeUtils;
 import org.expeditee.gui.AttributeValuePair;
 import org.expeditee.gui.Frame;

trunk/src/org/expeditee/items/widgets/charts/TimeSeries.java

@@ -9 +9 @@
 import java.util.Date;
 
-import org.expeditee.gui.AttributeUtils;
 import org.expeditee.gui.AttributeValuePair;
 import org.expeditee.gui.Frame;

trunk/src/org/expeditee/math/ExpediteeJEP.java

@@ -7 +7 @@
 import java.util.Observer;
 
-import org.expeditee.gui.AttributeUtils;
 import org.expeditee.gui.AttributeValuePair;
 import org.expeditee.gui.Frame;

trunk/src/org/expeditee/network/DefaultServer.java

@@ -3 +3 @@
 import java.io.IOException;
 import java.net.DatagramSocket;
-import java.net.SocketException;
-
-import org.expeditee.gui.MessageBay;
 
 public abstract class DefaultServer extends Thread {

trunk/src/org/expeditee/network/FrameSaver.java

@@ -5 +5 @@
 import java.io.StringReader;
 import java.net.DatagramPacket;
-import java.net.DatagramSocket;
 
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.MessageBay;
-import org.expeditee.io.ExpReader;
 
 public class FrameSaver extends DefaultServer {

trunk/src/org/expeditee/network/FrameServer.java

@@ -4 +4 @@
 import java.io.IOException;
 import java.net.DatagramPacket;
-import java.net.DatagramSocket;
 import java.net.InetAddress;
 

trunk/src/org/expeditee/network/FrameShare.java

@@ -27 +27 @@
 public class FrameShare {
 
+        public static boolean disableNetworking = false;
+        
         private static final int SOCKET_TIMEOUT = 1000;
 
@@ -38 +40 @@
 
         public static void init(Frame settingsFrame) {
-                if (settingsFrame == null)
+                if (disableNetworking || settingsFrame == null)
                         return;
 

trunk/src/org/expeditee/network/MessageReciever.java

@@ -3 +3 @@
 import java.io.IOException;
 import java.net.DatagramPacket;
-import java.net.DatagramSocket;
 
 import org.expeditee.gui.MessageBay;

trunk/src/org/expeditee/network/Peer.java

@@ -2 +2 @@
 
 import java.net.InetAddress;
-import java.net.SocketAddress;
 import java.net.UnknownHostException;
 

trunk/src/org/expeditee/simple/IncorrectTypeException.java

@@ -11 +11 @@
                 super("Expected param " + var + " to be " + type);
         }
+        
+        public IncorrectTypeException(String message) {
+                super(message);
+        }
 }

trunk/src/org/expeditee/simple/Primitives.java

@@ -37 +37 @@
                                 throw ite;
                         }catch(Exception ex){
+                                throw new IncorrectTypeException(ex.getClass().getSimpleName());
                                 //DO NOTHING... THIS SHOULD NOT HAPPEN
                                 //But the ANT builder is complaining
-                                ex.printStackTrace();
+                                //ex.printStackTrace();
                         }
                 }