Changeset 8 in josm for src/org/openstreetmap/josm/gui/SelectionManager.java

Timestamp:

2005-10-03T04:18:02+02:00 (19 years ago)

Author:

imi

Message:

• added Selection Dialog
• added support for graphic engines with a better default engine
• reorganized data classes with back references

File:

• src/org/openstreetmap/josm/gui/SelectionManager.java (modified) (7 diffs)

src/org/openstreetmap/josm/gui/SelectionManager.java

@@ -137 +137 @@
          */
         public void mousePressed(MouseEvent e) {
-                if (e.getButton() == MouseEvent.BUTTON1) {
-                        mousePosStart = e.getPoint();
-                        mousePos = e.getPoint();
-                        paintRect();
-                }
+                if (e.getButton() == MouseEvent.BUTTON1)
+                        mousePosStart = mousePos = e.getPoint();
         }
 
@@ -150 +147 @@
                 int buttonPressed = e.getModifiersEx() & (MouseEvent.BUTTON1_DOWN_MASK | MouseEvent.BUTTON3_DOWN_MASK); 
 
+                
                 if (buttonPressed != 0) {
-                        if (mousePosStart == null) {
-                                mousePosStart = e.getPoint();
-                                mousePos = e.getPoint();
-                                paintRect();
-                        }
+                        if (mousePosStart == null)
+                                mousePosStart = mousePos = e.getPoint();
                         paintRect();
                 }
@@ -176 +171 @@
                 if (e.getButton() != MouseEvent.BUTTON1)
                         return;
+                if (mousePos == null || mousePosStart == null)
+                        return; // injected release from outside
+                        
                 // disable the selection rect
                 paintRect();
@@ -195 +193 @@
          */
         private void paintRect() {
+                if (mousePos == null || mousePosStart == null || mousePos == mousePosStart)
+                        return;
                 Graphics g = mv.getGraphics();
                 g.setColor(Color.BLACK);
@@ -244 +244 @@
          */
         public void propertyChange(PropertyChangeEvent evt) {
-                if (evt.getPropertyName() == "active" && !(Boolean)evt.getNewValue() && mousePosStart != null) {
+                if (evt.getPropertyName().equals("active") && !(Boolean)evt.getNewValue() && mousePosStart != null) {
                         paintRect();
                         mousePosStart = null;
@@ -277 +277 @@
                         
                         // pending line segments
-                        for (LineSegment ls : mv.dataSet.pendingLineSegments)
+                        for (LineSegment ls : mv.dataSet.pendingLineSegments())
                                 if (rectangleContainLineSegment(r, alt, ls))
                                         selection.add(ls);
 
                         // tracks
-                        for (Track t : mv.dataSet.tracks) {
-                                boolean wholeTrackSelected = t.segments.size() > 0;
-                                for (LineSegment ls : t.segments)
+                        for (Track t : mv.dataSet.tracks()) {
+                                boolean wholeTrackSelected = !t.segments().isEmpty();
+                                for (LineSegment ls : t.segments())
                                         if (rectangleContainLineSegment(r, alt, ls))
                                                 selection.add(ls);
@@ -309 +309 @@
         private boolean rectangleContainLineSegment(Rectangle r, boolean alt, LineSegment ls) {
                 if (alt) {
-                        Point p1 = mv.getScreenPoint(ls.start.coor);
-                        Point p2 = mv.getScreenPoint(ls.end.coor);
+                        Point p1 = mv.getScreenPoint(ls.getStart().coor);
+                        Point p2 = mv.getScreenPoint(ls.getEnd().coor);
                         if (r.intersectsLine(p1.x, p1.y, p2.x, p2.y))
                                 return true;
                 } else {
-                        if (r.contains(mv.getScreenPoint(ls.start.coor))
-                                        && r.contains(mv.getScreenPoint(ls.end.coor)))
+                        if (r.contains(mv.getScreenPoint(ls.getStart().coor))
+                                        && r.contains(mv.getScreenPoint(ls.getEnd().coor)))
                                 return true;
                 }