- Timestamp:
- 09/22/08 16:23:12 (16 years ago)
- Location:
- trunk/src/org/expeditee
- Files:
-
- 39 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/actions/Actions.java
r306 r311 861 861 try { 862 862 return PerformAction(current, launcher, command); 863 }catch (RuntimeException e) { 864 MessageBay.errorMessage("Action failed: " + e.getMessage()); 863 865 } catch (Exception e) { 864 MessageBay.errorMessage( e.getMessage());866 MessageBay.errorMessage("Action failed: " + e.getClass().getSimpleName()); 865 867 } 866 868 return null; -
trunk/src/org/expeditee/actions/Misc.java
r309 r311 764 764 for (Item i : items) { 765 765 i.setParent(null); 766 i.invalidateAll(); 766 767 } 767 768 FrameMouseActions.pickup(items); 768 FrameGraphics.Repaint(); 769 // TODO figure out why this isnt repainting stuff immediately 770 // All of text item doesnt repaint until the cursor is moved 771 FrameGraphics.requestRefresh(true); 769 772 } 770 773 … … 856 859 if (item instanceof Text && item.getBackgroundColor() != null) { 857 860 d[0].setFillColor(item.getBackgroundColor()); 858 } else{861 } else { 859 862 d[0].setFillColor(item.getFillColor()); 860 863 } … … 874 877 Reminders.stop(); 875 878 } 876 877 public static void print(String file) {879 880 public static void print(String file) { 878 881 try { 879 882 if (Browser._theBrowser.isVersion6()) { -
trunk/src/org/expeditee/actions/Simple.java
r306 r311 2053 2053 } catch (Exception e) { 2054 2054 } 2055 }else{ 2056 Frame zero = FrameIO.LoadFrame(freshCopy.getFramesetName() + "0"); 2057 freshCopy.setPath(zero.getPath()); 2055 2058 } 2056 2059 boolean success = false; -
trunk/src/org/expeditee/agents/MailTree.java
r284 r311 2 2 3 3 import java.util.Collection; 4 import java.util.List;5 4 import java.util.Map; 6 5 -
trunk/src/org/expeditee/agents/PdfFrameset.java
r286 r311 6 6 import org.expeditee.gui.MessageBay; 7 7 import org.expeditee.io.PdfFramesetWriter; 8 import org.expeditee.items.widgets.InteractiveWidget;9 8 10 9 -
trunk/src/org/expeditee/agents/WriteTree.java
r133 r311 68 68 public boolean initialise(Frame start, Item launcher) { 69 69 if (_outFile == null) 70 _outFile = start.getExportFile Name();70 _outFile = start.getExportFileTagValue(); 71 71 72 72 try { -
trunk/src/org/expeditee/agents/mail/MailSession.java
r306 r311 35 35 import org.expeditee.gui.MessageBay; 36 36 import org.expeditee.importer.FrameDNDTransferHandler; 37 import org.expeditee.items.Item;38 37 import org.expeditee.items.Text; 39 38 -
trunk/src/org/expeditee/gui/Browser.java
r309 r311 58 58 59 59 private boolean _version6 = false; 60 60 61 61 public boolean isVersion6() { 62 62 return _version6; … … 193 193 if (version.startsWith("1.6")) { 194 194 // Set the drag and drop handler 195 _version6 195 _version6 = true; 196 196 setTransferHandler(FrameDNDTransferHandler.getInstance()); 197 197 } else { … … 405 405 */ 406 406 while (Simple.isProgramRunning()) { 407 Thread.sleep(100); // Brook: What purpose does this408 / / serve?407 Thread.sleep(100); 408 /* Brook: What purpose does this serve? */ 409 409 } 410 MessageBay.displayMessage("Stopping Agents..."); // TODO: 411 // Only 412 // stop 413 // if 414 // need 415 // to... 410 MessageBay.displayMessage("Stopping Agents..."); 411 /* TODO: Only stop if need to... */ 416 412 while (Actions.isAgentRunning()) { 417 413 Thread.sleep(100); // Brook: What purpose does this … … 424 420 MessageBay.displayMessage("Saving current frame..."); 425 421 FrameIO.SaveFrame(DisplayIO.getCurrentFrame()); 426 427 while (FrameIO.moveFrameset("messages",428 FrameIO.MESSAGES_PATH))429 ;430 422 431 423 MessageBay.displayMessage("Saving stats..."); … … 446 438 447 439 MessageBay.displayMessage("System exited"); 440 441 //Finally remove the messages frameset 442 while (FrameIO.moveFrameset("messages", 443 FrameIO.MESSAGES_PATH)) { 444 ; 445 } 446 448 447 System.exit(0); 449 448 } … … 459 458 public static Browser initializeForTesting() { 460 459 if (Browser._theBrowser == null) { 460 FrameShare.disableNetworking = true; 461 461 MailSession._autoConnect = false; 462 462 463 Browser.main(null); 463 464 try { -
trunk/src/org/expeditee/gui/DisplayIO.java
r309 r311 69 69 * The title to display in the Title bar. 70 70 */ 71 public static final String TITLE = "Exp 16Sep2008A";71 public static final String TITLE = "Exp22Sep2008A"; 72 72 73 73 private DisplayIO() { -
trunk/src/org/expeditee/gui/Frame.java
r298 r311 84 84 85 85 private String path; 86 86 87 87 private boolean _isLocal = true; 88 88 … … 206 206 notifyObservers(); 207 207 } 208 208 209 209 if (oldValue == value) 210 210 return; … … 1654 1654 */ 1655 1655 public String getExportFileName() { 1656 return getAnnotationValue("file"); 1656 String fileName = getExportFileTagValue(); 1657 1658 if (fileName == null) { 1659 fileName = getTitle(); 1660 1661 if (fileName == null) { 1662 fileName = getName(); 1663 } 1664 } 1665 1666 return fileName; 1657 1667 } 1658 1668 … … 2068 2078 return _isLocal; 2069 2079 } 2080 2081 public String getExportFileTagValue() { 2082 return getAnnotationValue("file"); 2083 } 2070 2084 } -
trunk/src/org/expeditee/gui/FrameCreator.java
r298 r311 207 207 } 208 208 } 209 209 210 210 public Text addText(String toAdd, Color c, String link, String action, 211 211 boolean bSave) { … … 270 270 return title.getY() + title.getBoundsHeight(); 271 271 } 272 273 public void setTitle(String titleText){ 274 _current.setTitle(titleText); 275 } 272 276 } -
trunk/src/org/expeditee/gui/FrameGraphics.java
r298 r311 146 146 if (DisplayIO.isTwinFramesOn()) { 147 147 Frame opposite = DisplayIO.getOppositeFrame(); 148 // if (opposite != null) { 148 149 /*When running the test suite opposite may be null!*/ 150 if (opposite != null) { 149 151 opposite.setBuffer(null); 150 152 opposite.refreshSize(); 151 //}153 } 152 154 } 153 155 } … … 918 920 damagedAreas.clear(); 919 921 } 920 // 922 //System.out.println("FULLSCREEN REFRESH"); // TODO: REMOVE 921 923 } 922 924 -
trunk/src/org/expeditee/gui/FrameIO.java
r307 r311 906 906 } 907 907 } catch (IOException ioe) { 908 ioe.printStackTrace(); 908 909 ioe.getStackTrace(); 909 910 Logger.Log(ioe); -
trunk/src/org/expeditee/gui/FrameKeyboardActions.java
r306 r311 1254 1254 // Either position the new item below the title or just above 1255 1255 // the first item below the title 1256 if (toDropFrom == title )1256 if (toDropFrom == title && column.get(0) != title) 1257 1257 yPos = Math.min(column.get(0).getY() - 1, title.getY() 1258 1258 + title.getBoundsHeight() … … 1583 1583 float current = Math.abs(line.getThickness()); 1584 1584 current = Math.max(current + diff, Item.MINIMUM_THICKNESS); 1585 line. getStartItem().setThickness(current);1585 line.setThickness(current); 1586 1586 FrameGraphics.Repaint(); 1587 1587 return; -
trunk/src/org/expeditee/gui/FrameMouseActions.java
r306 r311 648 648 649 649 if (clicked instanceof Text) { 650 if (((Text) clicked).getText().length() == 0) 650 Text text = (Text) clicked; 651 /*Dont follow link when just highlighting text with the left button*/ 652 if (text.getText().length() == 0) 651 653 clicked = null; 654 else if (text.getSelectionSize() > 0){ 655 return; 656 } 652 657 } 653 658 -
trunk/src/org/expeditee/gui/FrameUtils.java
r309 r311 14 14 import java.util.List; 15 15 16 import org.expeditee.agents.SearchGreenstone; 16 17 import org.expeditee.agents.mail.MailSession; 17 18 import org.expeditee.io.Logger; … … 584 585 else if (attribute.equals("networksettings")) 585 586 FrameShare.init(item.getChild()); 587 else if (attribute.equals("greenstonesettings")) 588 SearchGreenstone.init(item.getChild()); 586 589 else if (attribute.equals("reminders")) 587 590 Reminders.init(item.getChild()); -
trunk/src/org/expeditee/gui/UserSettings.java
r309 r311 3 3 import java.io.File; 4 4 import java.net.URL; 5 import java.util.Collection;6 5 import java.util.LinkedList; 7 6 import java.util.List; -
trunk/src/org/expeditee/io/DefaultFramesetWriter.java
r286 r311 19 19 protected void outputFrame(Frame toWrite) throws IOException { 20 20 String framesetName = toWrite.getFramesetName(); 21 int count = FrameIO.getLastNumber(framesetName); 22 23 for (long i = _firstFrame; i <= _maxFrame && i <= count; i++) { 21 22 _maxFrame = Math.min(_maxFrame, FrameIO.getLastNumber(framesetName)); 23 24 for (long i = _firstFrame; i <= _maxFrame; i++) { 24 25 if (_stop) { 25 26 break; -
trunk/src/org/expeditee/items/Circle.java
r176 r311 325 325 _line.setPermission(p); 326 326 } 327 328 @Override 329 public void scale(Float scale, int originX, int originY) { 330 getCenter().scale(scale, originX, originY); 331 super.scale(scale, originX, originY); 332 } 333 334 @Override 335 public void setThickness(float thick, boolean setConnected) { 336 super.setThickness(thick, setConnected); 337 _line.refreshStroke(thick); 338 } 327 339 } -
trunk/src/org/expeditee/items/FramePicture.java
r235 r311 5 5 import java.awt.image.ImageObserver; 6 6 7 import org.expeditee.gui.AttributeUtils;8 7 import org.expeditee.gui.AttributeValuePair; 9 8 import org.expeditee.gui.Frame; -
trunk/src/org/expeditee/items/Item.java
r294 r311 35 35 import org.expeditee.gui.MessageBay; 36 36 import org.expeditee.gui.Overlay; 37 import org.expeditee.gui.UserSettings;38 37 import org.expeditee.gui.Vector; 39 38 import org.expeditee.io.Conversion; … … 1724 1723 * @param thick 1725 1724 */ 1726 public void setThickness(float thick) {1725 public final void setThickness(float thick) { 1727 1726 setThickness(thick, true); 1728 1727 } … … 1757 1756 line.setThickness(thick, setConnectedThickness); 1758 1757 1759 updatePolygon(); 1758 if (setConnectedThickness) 1759 updatePolygon(); 1760 1760 1761 1761 if (bigger) { … … 2698 2698 return _editTarget; 2699 2699 } 2700 2701 public void scale(Float scale, int originX, int originY) { 2702 setXY(getX() * scale + originX, getY() * scale + originY); 2703 setArrowheadLength(getArrowheadLength() * scale); 2704 2705 float thickness = getThickness(); 2706 if (thickness > 0) 2707 setThickness(thickness * scale, false); 2708 2709 // DONT PUT SIZE IN HERE CAUSE IT STUFFS UP CIRCLES 2710 2711 updatePolygon(); 2712 } 2700 2713 } -
trunk/src/org/expeditee/items/ItemUtils.java
r286 r311 940 940 941 941 //TODO encapsulate this somewhere inside of circle class! 942 if(item instanceof Circle){943 scaleItem(v, ((Circle)item).getCenter());944 }942 // if(item instanceof Circle){ 943 // scaleItem(v, ((Circle)item).getCenter()); 944 // } 945 945 946 if (!(item instanceof Line)) { 947 item.setXY(item.getX() * scale + originX, item.getY() * scale 948 + originY); 949 item.setArrowheadLength(item.getArrowheadLength() * scale); 946 if (!(item instanceof Line)) { 950 947 if (item.getColor() == null) { 951 948 item.setColor(defaultForeground); … … 957 954 item.setFillColor(defaultBackground); 958 955 } 959 960 float thickness = item.getThickness(); 961 if(thickness > 0) 962 item.setThickness(thickness * scale); 963 964 if (item instanceof Text) 965 item.setSize(item.getSize() * scale); 966 else if (item instanceof Picture) { 967 Picture p = (Picture) item; 968 p.setScale(p.getScale() * scale); 969 } 956 970 957 if (permission.equals(Permission.none)) { 971 958 item.setLinkMark(false); 972 959 item.setActionMark(false); 973 } else {974 item.updatePolygon();975 }960 } 961 962 item.scale(scale, originX, originY); 976 963 } 977 964 -
trunk/src/org/expeditee/items/Line.java
r298 r311 85 85 } 86 86 87 p rivatevoid refreshStroke(float thick) {87 public void refreshStroke(float thick) { 88 88 thick = Math.round(thick); 89 89 … … 638 638 @Override 639 639 public final float getThickness() { 640 return (_start.getThickness() + _end.getThickness()) / 2; 640 assert(_start.getThickness() == _end.getThickness()); 641 642 return _start.getThickness(); 641 643 } 642 644 … … 1188 1190 return true; 1189 1191 } 1192 1193 @Override 1194 public void scale(Float scale, int originX, int originY) { 1195 } 1190 1196 } -
trunk/src/org/expeditee/items/Picture.java
r282 r311 616 616 617 617 } 618 619 @Override 620 public void scale(Float scale, int originX, int originY){ 621 setScale(getScale() * scale); 622 super.scale(scale, originX, originY); 623 } 618 624 619 625 } -
trunk/src/org/expeditee/items/Text.java
r307 r311 970 970 newFace = newFace.toLowerCase().trim(); 971 971 972 if (newFace.equals("plain") ) {972 if (newFace.equals("plain") || newFace.equals("p")) { 973 973 setFont(getPaintFont().deriveFont(Font.PLAIN)); 974 } else if (newFace.equals("bold") ) {974 } else if (newFace.equals("bold") || newFace.equals("b")) { 975 975 setFont(getPaintFont().deriveFont(Font.BOLD)); 976 } else if (newFace.equals("italic") ) {976 } else if (newFace.equals("italic") || newFace.equals("i")) { 977 977 setFont(getPaintFont().deriveFont(Font.ITALIC)); 978 } else if (newFace.equals("bolditalic") || newFace.equals("italicbold")) { 978 } else if (newFace.equals("bolditalic") || newFace.equals("italicbold") 979 || newFace.equals("bi") || newFace.equals("ib")) { 979 980 setFont(getPaintFont().deriveFont(Font.BOLD + Font.ITALIC)); 980 981 } … … 1555 1556 public void setSize(float size) { 1556 1557 invalidateAll(); 1557 // size *= UserSettings.ScaleFactor;1558 // size *= UserSettings.ScaleFactor; 1558 1559 // Dont want to have size set when duplicating a point which has size 0 1559 1560 if (size < 0) … … 2041 2042 invalidateFill(); 2042 2043 } 2044 2045 @Override 2046 public void scale(Float scale, int originX, int originY) { 2047 setSize(getSize() * scale); 2048 setWidth(Math.round(getWidth() * scale)); 2049 super.scale(scale, originX, originY); 2050 rebuild(true); 2051 } 2043 2052 } -
trunk/src/org/expeditee/items/XRayable.java
r282 r311 135 135 136 136 @Override 137 public void setThickness(float thick ) {137 public void setThickness(float thick, boolean setConnected) { 138 138 this.invalidateCommonTrait(ItemAppearence.Thickness); 139 _source.setThickness(thick );139 _source.setThickness(thick, setConnected); 140 140 this.invalidateCommonTrait(ItemAppearence.Thickness); 141 141 } -
trunk/src/org/expeditee/items/widgets/WidgetCorner.java
r294 r311 6 6 import java.util.List; 7 7 8 import org.expeditee.gui.FrameGraphics;9 8 import org.expeditee.items.Dot; 10 9 import org.expeditee.items.ItemParentStateChangedEvent; -
trunk/src/org/expeditee/items/widgets/charts/AbstractCategory.java
r247 r311 4 4 import java.util.Collection; 5 5 6 import org.expeditee.gui.AttributeUtils;7 6 import org.expeditee.gui.AttributeValuePair; 8 7 import org.expeditee.items.Text; -
trunk/src/org/expeditee/items/widgets/charts/AbstractPie.java
r298 r311 4 4 import java.awt.Color; 5 5 6 import org.expeditee.gui.AttributeUtils;7 6 import org.expeditee.gui.AttributeValuePair; 8 7 import org.expeditee.gui.Frame; -
trunk/src/org/expeditee/items/widgets/charts/TimeSeries.java
r286 r311 9 9 import java.util.Date; 10 10 11 import org.expeditee.gui.AttributeUtils;12 11 import org.expeditee.gui.AttributeValuePair; 13 12 import org.expeditee.gui.Frame; -
trunk/src/org/expeditee/math/ExpediteeJEP.java
r247 r311 7 7 import java.util.Observer; 8 8 9 import org.expeditee.gui.AttributeUtils;10 9 import org.expeditee.gui.AttributeValuePair; 11 10 import org.expeditee.gui.Frame; -
trunk/src/org/expeditee/network/DefaultServer.java
r307 r311 3 3 import java.io.IOException; 4 4 import java.net.DatagramSocket; 5 import java.net.SocketException;6 7 import org.expeditee.gui.MessageBay;8 5 9 6 public abstract class DefaultServer extends Thread { -
trunk/src/org/expeditee/network/FrameSaver.java
r307 r311 5 5 import java.io.StringReader; 6 6 import java.net.DatagramPacket; 7 import java.net.DatagramSocket;8 7 9 8 import org.expeditee.gui.FrameIO; 10 9 import org.expeditee.gui.MessageBay; 11 import org.expeditee.io.ExpReader;12 10 13 11 public class FrameSaver extends DefaultServer { -
trunk/src/org/expeditee/network/FrameServer.java
r307 r311 4 4 import java.io.IOException; 5 5 import java.net.DatagramPacket; 6 import java.net.DatagramSocket;7 6 import java.net.InetAddress; 8 7 -
trunk/src/org/expeditee/network/FrameShare.java
r307 r311 27 27 public class FrameShare { 28 28 29 public static boolean disableNetworking = false; 30 29 31 private static final int SOCKET_TIMEOUT = 1000; 30 32 … … 38 40 39 41 public static void init(Frame settingsFrame) { 40 if ( settingsFrame == null)42 if (disableNetworking || settingsFrame == null) 41 43 return; 42 44 -
trunk/src/org/expeditee/network/MessageReciever.java
r307 r311 3 3 import java.io.IOException; 4 4 import java.net.DatagramPacket; 5 import java.net.DatagramSocket;6 5 7 6 import org.expeditee.gui.MessageBay; -
trunk/src/org/expeditee/network/Peer.java
r298 r311 2 2 3 3 import java.net.InetAddress; 4 import java.net.SocketAddress;5 4 import java.net.UnknownHostException; 6 5 -
trunk/src/org/expeditee/simple/IncorrectTypeException.java
r21 r311 11 11 super("Expected param " + var + " to be " + type); 12 12 } 13 14 public IncorrectTypeException(String message) { 15 super(message); 16 } 13 17 } -
trunk/src/org/expeditee/simple/Primitives.java
r270 r311 37 37 throw ite; 38 38 }catch(Exception ex){ 39 throw new IncorrectTypeException(ex.getClass().getSimpleName()); 39 40 //DO NOTHING... THIS SHOULD NOT HAPPEN 40 41 //But the ANT builder is complaining 41 ex.printStackTrace();42 //ex.printStackTrace(); 42 43 } 43 44 }
Note:
See TracChangeset
for help on using the changeset viewer.