Changeset 72 for trunk/src/org/expeditee/items/Dot.java

Timestamp:

05/23/08 09:02:59 (16 years ago)

Author:

ra33

Message:

Added lots of stuff

File:

• trunk/src/org/expeditee/items/Dot.java (modified) (6 diffs)

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

@@ -9 +9 @@
 import java.util.List;
 
+import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.Frame;
+import org.expeditee.gui.FrameKeyboardActions;
 
 /**
@@ -90 +92 @@
                 for (Line line : getLines())
                         line.setColor(c);
-        }
-
-        public void paintFill(Graphics2D g) {
-                if (getFillColor() != null && getEnclosingDots() != null) {
-                        g.setColor(getFillColor());
-                        g.fillPolygon(getEnclosedShape());
-                }
         }
 
@@ -186 +181 @@
 
         @Override
-        public Dot copy() {
+        public Item copy() {
                 Dot copy = new Dot(getX(), getY(), getID());
 
@@ -207 +202 @@
         @Override
         public void setAnnotation(boolean val) {
-        }
-
-        @Override
-        public boolean isAnnotation() {
-                return false;
+                DisplayIO.setCursorPosition(this.getPosition());
+                //Make all the dots this dot is connected to be annotations
+                for(Item i: getAllConnected())
+                        if (i.isLineEnd())
+                                i._connectedToAnnotation = val;
+                
+                FrameKeyboardActions.replaceDot(this, '@');
         }
 
@@ -218 +215 @@
                 // if the item being merged with is another Dot
                 if (merger instanceof Dot) {
-                        Dot dot = (Dot) merger;
+                        Item dot = (Item) merger;
                         merger.setPosition(this.getPosition());
                         // prevent concurrency issues if removing lines
@@ -231 +228 @@
                                 } else {
                                         // check for duplicated lines as a result of merging
-                                        Dot check = (Dot) line.getOppositeEnd(dot);
+                                        Item check = (Item) line.getOppositeEnd(dot);
                                         boolean dup = false;