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

Timestamp:

2006-01-21T19:02:06+01:00 (18 years ago)

Author:

imi

Message:

fixed fancy download world chooser

File:

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

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

@@ -89 +89 @@
         private Point mousePos;
         /**
-         * The MapView, the selection rectangle is drawn onto.
-         */
-        private final MapView mv;
+         * The Component, the selection rectangle is drawn onto.
+         */
+        private final NavigatableComponent nc;
         /**
          * Whether the selection rectangle must obtain the aspect ratio of the 
@@ -105 +105 @@
          * @param aspectRatio If true, the selection window must obtain the aspect
          *              ratio of the drawComponent.
-         * @param mapView The view, the rectangle is drawn onto.
-         */
-        public SelectionManager(SelectionEnded selectionEndedListener, boolean aspectRatio, MapView mapView) {
+         * @param navComp The component, the rectangle is drawn onto.
+         */
+        public SelectionManager(SelectionEnded selectionEndedListener, boolean aspectRatio, NavigatableComponent navComp) {
                 this.selectionEndedListener = selectionEndedListener;
                 this.aspectRatio = aspectRatio;
-                this.mv = mapView;
+                this.nc = navComp;
         }
         
@@ -196 +196 @@
                 if (mousePos == null || mousePosStart == null || mousePos == mousePosStart)
                         return;
-                Graphics g = mv.getGraphics();
+                Graphics g = nc.getGraphics();
                 g.setColor(Color.BLACK);
                 g.setXORMode(Color.WHITE);
@@ -224 +224 @@
                 if (aspectRatio) {
                         // keep the aspect ration by shrinking the rectangle
-                        double aspectRatio = (double)mv.getWidth()/mv.getHeight();
+                        double aspectRatio = (double)nc.getWidth()/nc.getHeight();
                         if ((double)w/h > aspectRatio) {
                                 int neww = (int)(h*aspectRatio);
@@ -267 +267 @@
 
                 if (clicked) {
-                        OsmPrimitive osm = mv.getNearest(center, alt);
+                        OsmPrimitive osm = nc.getNearest(center, alt);
                         if (osm != null)
                                 selection.add(osm);
@@ -273 +273 @@
                         // nodes
                         for (Node n : Main.main.ds.nodes) {
-                                if (r.contains(mv.getScreenPoint(n.coor)))
+                                if (r.contains(nc.getScreenPoint(n.coor)))
                                         selection.add(n);
                         }
@@ -310 +310 @@
         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 = nc.getScreenPoint(ls.start.coor);
+                        Point p2 = nc.getScreenPoint(ls.end.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(nc.getScreenPoint(ls.start.coor))
+                                        && r.contains(nc.getScreenPoint(ls.end.coor)))
                                 return true;
                 }