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

Timestamp:

07/15/08 12:55:33 (16 years ago)

Author:

ra33

Message:

Fixed some repaint issues

File:

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

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

@@ -27 +27 @@
         private static final int _MINIMUM_DOT_SIZE = 6;
 
+        private static final int MINIMUM_DOT_SIZE = 2;
+
         private int _pointType = Item.POINTTYPE_SQUARE;
 
         private boolean _filled = true;
-        
+
         public Dot(int id) {
                 super();
@@ -74 +76 @@
                 updatePolygon();
         }
-        
+
         @Override
         public void setColor(Color c) {
@@ -90 +92 @@
                         g.setColor(highlightColor);
                         g.setStroke(HIGHLIGHT_STROKE);
-                        //g.setStroke()
+                        // g.setStroke()
                         // Draw the highlighting rectangle surrounding the dot
                         // this is drawn even if its part of a rectangle
@@ -103 +105 @@
                                 g.fillOval(rect.x, rect.y, rect.width, rect.height);
                         }
-                        //System.out.println(_mode.toString());
+                        // System.out.println(_mode.toString());
                 }
 
@@ -113 +115 @@
 
                 int thick = (int) getThickness();
-                if (thick < 2)
-                        thick = 2;
+                if (thick < MINIMUM_DOT_SIZE)
+                        thick = MINIMUM_DOT_SIZE;
 
                 int width = thick / 2;
@@ -192 +194 @@
                 // if the item being merged with is another Dot
                 if (merger instanceof Dot) {
-                        if(merger.hasEnclosures() || hasEnclosures())
+                        if (merger.hasEnclosures() || hasEnclosures())
                                 return merger;
-                        
+
                         Item dot = (Item) merger;
                         merger.setPosition(this.getPosition());
@@ -262 +264 @@
                 return "P " + getID();
         }
-        
+
         @Override
         public void delete() {
@@ -270 +272 @@
                         l.delete();
         }
-        
+
         @Override
         public void anchor() {
                 Frame current = getParentOrCurrentFrame();
-                //This is to make lines anchored across frames be on one frame
-                for(Line l: getLines()) {
+                // This is to make lines anchored across frames be on one frame
+                for (Line l : getLines()) {
                         Frame parent = l.getOppositeEnd(this).getParent();
                         if (parent != null && parent != current) {
                                 this.setParent(parent);
-                                if(DisplayIO.getCurrentSide() == 0)
+                                if (DisplayIO.getCurrentSide() == 0)
                                         this.setX(this.getX() - DisplayIO.getMiddle());
                                 else
@@ -286 +288 @@
                         break;
                 }
-                
+
                 super.anchor();
-                
-                //TODO is the code below needed... what for?
+
+                // TODO is the code below needed... what for?
                 for (Line line : getLines()) {
                         if (line.getID() < 0 && !current.getItems().contains(line)) {
@@ -295 +297 @@
                                 line.setHighlightColor();
                                 // Mike: Why was this line here?
-                                //anchor(line);
-                        }
-                }
-        }
-        
+                                // anchor(line);
+                        }
+                }
+        }
+
         @Override
         public void addLine(Line line) {
@@ -307 +309 @@
                 line.setLinePattern(getLinePattern());
         }
-        
+
         @Override
         public void lineColorChanged(Color c) {
@@ -314 +316 @@
                 }
         }
+
+        @Override
+        public boolean dontSave() {
+                if (getThickness() <= 1 && (getLines().size() == 0)
+                                && getConstraints().size() == 0) {
+                        return true;
+                }
+                return super.dontSave();
+        }
 }