Changeset 6069 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

Timestamp:

2013-07-17T00:01:07+02:00 (13 years ago)

Author:

stoecker

Message:

see #8853 remove tabs, trailing spaces, windows line ends, strange characters

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (modified) (17 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

@@ -73 +73 @@
     private Color mainColor;
     private Stroke mainStroke;
-    
+
     /**
      * drawing settings for helper lines
@@ -88 +88 @@
     private List<ReferenceSegment> possibleMoveDirections;
 
-    
+
     /**
      * Collection of nodes that is moved
@@ -238 +238 @@
         if (e.getButton() != MouseEvent.BUTTON1)
             return;
-        
+
         requestFocusInMapView();
         updateKeyModifiers(e);
-        
+
         selectedNode = Main.map.mapView.getNearestNode(e.getPoint(), OsmPrimitive.isSelectablePredicate);
         selectedSegment = Main.map.mapView.getNearestWaySegment(e.getPoint(), OsmPrimitive.isSelectablePredicate);
-        
+
         // If nothing gets caught, stay in select mode
         if (selectedSegment == null && selectedNode == null) return;
-        
+
         if (selectedNode != null) {
             if (ctrl || nodeDragWithoutCtrl) {
@@ -253 +253 @@
                 movingNodeList.add(selectedNode);
                 calculatePossibleDirectionsByNode();
-                if (possibleMoveDirections.isEmpty()) { 
+                if (possibleMoveDirections.isEmpty()) {
                     // if no directions fould, do not enter dragging mode
                     return;
@@ -278 +278 @@
             calculatePossibleDirectionsBySegment();
         }
-        
+
         // Signifies that nothing has happened yet
         newN1en = null;
@@ -386 +386 @@
         }
     }
-    
+
     /**
      * Insert node into nearby segment
-     * @param e - current mouse point 
+     * @param e - current mouse point
      */
     private void addNewNode(MouseEvent e) {
@@ -488 +488 @@
         Main.main.undoRedo.add(c);
     }
-    
+
     /**
      * This method tests if a node has other ways apart from the given one.
@@ -502 +502 @@
         return false;
     }
-    
+
     /**
      * Determine best movenemnt from initialMousePos  to current position @param mouseEn,
      * choosing one of the directions @field possibleMoveDirections
-     * @return movement vector 
+     * @return movement vector
      */
     private EastNorth calculateBestMovement(EastNorth mouseEn) {
-        
+
         EastNorth initialMouseEn = Main.map.mapView.getEastNorth(initialMousePos.x, initialMousePos.y);
         EastNorth mouseMovement = initialMouseEn.sub(mouseEn);
-        
+
         double bestDistance = Double.POSITIVE_INFINITY;
         EastNorth bestMovement = null;
@@ -565 +565 @@
         initialN1en = selectedSegment.getFirstNode().getEastNorth();
         initialN2en = selectedSegment.getSecondNode().getEastNorth();
-            
+
         //add direction perpendicular to the selected segment
         possibleMoveDirections = new ArrayList<ReferenceSegment>();
@@ -573 +573 @@
                 ), initialN1en, initialN2en, true));
 
-        
+
         //add directions parallel to neighbor segments
         Node prevNode = getPreviousNode(selectedSegment.lowerIndex);
@@ -593 +593 @@
         }
     }
-    
+
     /**
      * Gather possible move directions - along all adjacent segments
@@ -609 +609 @@
                         initialN1en.getX() - en.getX(),
                         initialN1en.getY() - en.getY()
-                    ), initialN1en, en, false));                                    
+                    ), initialN1en, en, false));
                 }
             }
         }
     }
-    
+
     /**
      * Gets a node from selected way before given index.
@@ -685 +685 @@
 
                 EastNorth normalUnitVector = getNormalUniVector();
-                
+
                 if (mode == Mode.extrude || mode == Mode.create_new) {
                     g2.setColor(mainColor);
@@ -722 +722 @@
                     if (p1.distance(p2) < 3) {
                         g2.setStroke(mainStroke);
-                        g2.drawOval((int)(p1.x-symbolSize/2), (int)(p1.y-symbolSize/2), 
+                        g2.drawOval((int)(p1.x-symbolSize/2), (int)(p1.y-symbolSize/2),
                                 (int)(symbolSize), (int)(symbolSize));
                     } else {
@@ -752 +752 @@
         }
     }
-    
+
     private EastNorth getNormalUniVector() {
         double fac = 1.0 / activeMoveDirection.en.distance(0,0);
@@ -770 +770 @@
         return normalUnitVector;
     }
-    
+
     private void drawAngleSymbol(Graphics2D g2, Point2D center, EastNorth normal, boolean mirror) {
         // EastNorth units per pixel
@@ -776 +776 @@
         double raoffsetx = symbolSize*factor*normal.getX();
         double raoffsety = symbolSize*factor*normal.getY();
-        
-        double cx = center.getX(), cy = center.getY(); 
+
+        double cx = center.getX(), cy = center.getY();
         double k = (mirror ? -1 : 1);
         Point2D ra1 = new Point2D.Double(cx + raoffsetx, cy + raoffsety);
         Point2D ra3 = new Point2D.Double(cx - raoffsety*k, cy + raoffsetx*k);
         Point2D ra2 = new Point2D.Double(ra1.getX() - raoffsety*k, ra1.getY() + raoffsetx*k);
-        
+
         GeneralPath ra = new GeneralPath();
         ra.moveTo((float)ra1.getX(), (float)ra1.getY());