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

Timestamp:

06/27/08 16:44:21 (16 years ago)

Author:

ra33

Message:

Heaps of changes!!!!
Added circles...
Better drawing of lines etc etc

File:

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

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

@@ -26 +26 @@
 
         private static final int _MINIMUM_DOT_SIZE = 6;
-
-        // the polygon surrounding this point, used for 'gravity'
-        private Polygon _poly = null;
 
         private int _pointType = Item.POINTTYPE_SQUARE;
@@ -92 +89 @@
         public void paint(Graphics2D g) {
                 if (isHighlighted() /* && !Frame.FreeItems.contains(this) */) {
-                        g.setColor(getHighlightColor());
+                        Color backgroundColor = g.getBackground();
+                        Color highlightColor = getHighlightColor();
+                        if (highlightColor.equals(backgroundColor)){
+                                highlightColor = ALTERNATE_HIGHLIGHT;
+                        }
+                        g.setColor(highlightColor);
+                        g.setStroke(HIGHLIGHT_STROKE);
+                        //g.setStroke()
                         // Draw the highlighting rectangle surrounding the dot
                         // this is drawn even if its part of a rectangle
@@ -150 +154 @@
          */
         protected void updatePolygon() {
-                int thick = (int) Math.ceil(getThickness());
+                int thick = Math.round(getThickness());
                 // Sets a minimum size for the dot
                 thick = Math.max(thick, _MINIMUM_DOT_SIZE);
@@ -165 +169 @@
 
         @Override
-        public Polygon getPolygon() {
-                if (_poly == null)
-                        updatePolygon();
-
-                Polygon external = new Polygon(_poly.xpoints, _poly.ypoints,
-                                _poly.npoints);
-
-                return external;
-        }
-
-        @Override
         public Item copy() {
                 Dot copy = new Dot(getX(), getY(), getID());
@@ -205 +198 @@
                 // if the item being merged with is another Dot
                 if (merger instanceof Dot) {
+                        if(merger.hasEnclosures() || hasEnclosures())
+                                return merger;
+                        
                         Item dot = (Item) merger;
                         merger.setPosition(this.getPosition());