Changeset 26163 in osm for applications/editors

Timestamp:

2011-06-20T18:30:38+02:00 (13 years ago)

Author:

stoecker

Message:

add I18N notes

File:

• applications/editors/josm/plugins/turbopen/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java (modified) (26 diffs)

applications/editors/josm/plugins/turbopen/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java

@@ -5 +5 @@
  * Licence: GPL v2 or later
  * Author:  Alexei Kasatkin, 2011
- * Thanks to authors of BuildingTools, ImproveWayAccuracy and LakeWalker 
+ * Thanks to authors of BuildingTools, ImproveWayAccuracy and LakeWalker
  * for good sample code
  */
@@ -53 +53 @@
         AWTEventListener {
     private static final String SIMPLIFYMODE_MESSAGE=
-            "Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to tune simplification";
+            tr("Press Enter to simplify or save, Ctrl-Enter to save with tags, Up/Down to tune simplification");
     private static final String DRAWINGMODE_MESSAGE=
-    "Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click to delete, Enter to simplify or save, Ctrl-Shift-Click to start new line";
-    
+    tr("Click or Click&drag to continue, Ctrl-Click to add fixed node, Shift-Click to delete, Enter to simplify or save, Ctrl-Shift-Click to start new line");
+
     private Color COLOR_FIXED;
     private Color COLOR_NORMAL;
@@ -62 +62 @@
     private Color COLOR_SELECTEDFRAGMENT;
     private Color COLOR_EDITEDFRAGMENT;
-    
+
     private double maxDist;
     private double epsilonMult;
@@ -70 +70 @@
     /// Initial tolerance for Douglas-Pecker algorithm
     private double startingEps;
-    
+
     private DrawnPolyLine line;
     private MapView mv;
@@ -92 +92 @@
     private Stroke strokeForDelete;
     private int dragNode=-1;
-    
+
 
     FastDrawingMode(MapFrame mapFrame) {
@@ -121 +121 @@
         mv = Main.map.mapView;
         line.setMv(mv);
-        
+
         if (getCurrentDataSet() == null) return;
-        
+
         Main.map.mapView.addMouseListener(this);
         Main.map.mapView.addMouseMotionListener(this);
         Main.map.mapView.addTemporaryLayer(this);
-        
+
         Main.map.mapView.setCursor(cursorDraw);
 
@@ -166 +166 @@
 
     //////////    Event listener methods
-    
+
     @Override
     public void paint(Graphics2D g, MapView mv, Bounds bbox) {
         LinkedList<LatLon> pts=line.getPoints();
         if (pts.isEmpty()) return;
-        
+
         if (line.wasSimplified()) {
             // we are drawing simplified version, that exists
@@ -178 +178 @@
             g.setStroke(strokeForOriginal);
         }
-        
+
         Point p1, p2;
         LatLon pp1, pp2;
@@ -246 +246 @@
         if (!isEnabled()) return;
         if (e.getButton() != MouseEvent.BUTTON1) return;
-        
-        
+
+
         int idx=line.findClosestPoint(e.getPoint(),maxDist);
         if (idx==0 && !line.isClosed()) {
@@ -256 +256 @@
             updateCursor();
             return;
-        } 
-        
+        }
+
         if (ctrl && shift) newDrawing();
         if (!ctrl && shift) {
             if (idx>=0) {line.deleteNode(idx); nearestIdx=-1;}
-            else line.tryToDeleteSegment(e.getPoint()); 
+            else line.tryToDeleteSegment(e.getPoint());
             return;
         }
@@ -267 +267 @@
             if (ctrl) {
                 // toggle fixed point
-                line.toggleFixed(idx);                
+                line.toggleFixed(idx);
             }
             // node dragging
@@ -276 +276 @@
         //if (line.isClosed()) { setStatusLine(tr(SIMPLIFYMODE_MESSAGE));return;  }
         drawing = true;
-        
+
         LatLon p = getLatLon(e);
         Node nd1 = getNearestNode(e.getPoint(), maxDist);
@@ -284 +284 @@
             p=nd1.getCoor();
             line.fixPoint(p);
-        }         
-        
+        }
+
         line.addLast(p);
         if (ctrl) line.fixPoint(p);
         line.clearSimplifiedVersion();
-               
+
         setStatusLine(tr("Please move the mouse to draw new way"));
         repaint();
 
     }
- 
+
     @Override
     public void mouseReleased(MouseEvent e) {
@@ -302 +302 @@
         drawing = false;
         highlighted=null;
-        if (!line.isClosed()) setStatusLine(tr(DRAWINGMODE_MESSAGE));
+        if (!line.isClosed()) setStatusLine(DRAWINGMODE_MESSAGE);
         repaint();
     }
@@ -315 +315 @@
         if (!isEnabled()) return;
         Node nd1 = getNearestNode(e.getPoint(), maxDist);
-        boolean nearpoint2=nd1!=null; 
+        boolean nearpoint2=nd1!=null;
         if (nearpoint!=nearpoint2) {nearpoint=nearpoint2;updateCursor();}
-        
+
         nearestIdx=line.findClosestPoint(e.getPoint(),maxDist);
-        
+
         if (!drawing) {
             if (dragNode>=0) {
@@ -333 +333 @@
                     highlighted=h2;
                     repaint();
-                } 
+                }
             }
             return;
         }
-        if (line.isClosed()) setStatusLine(tr(SIMPLIFYMODE_MESSAGE));
-        
+        if (line.isClosed()) setStatusLine(SIMPLIFYMODE_MESSAGE);
+
         // do not draw points close to existing points - we do not want self-intersections
         if (nearestIdx>=0) { return; }
-        
+
         Point lastP = line.getLastPoint(); // last point of line fragment being edited
-                
+
         if (nearpoint){
             if ( Math.hypot(e.getX() - lastP.x, e.getY() - lastP.y) > 1e-2) {
                 line.addFixed(nd1.getCoor()); // snap to node coords
                 repaint();
-            } 
+            }
         } else {
             if (Math.hypot(e.getX() - lastP.x, e.getY() - lastP.y) > minPixelsBetweenPoints) {
@@ -355 +355 @@
             }
         }
-        
+
         //statusText = getLatLon(e).toString();        updateStatusLine();
     }
@@ -373 +373 @@
             if (!line.wasSimplified()) {
                 line.simplify(eps);
-                setStatusLine(tr(SIMPLIFYMODE_MESSAGE));
+                setStatusLine(SIMPLIFYMODE_MESSAGE);
             } else saveAsWay();
         }
@@ -391 +391 @@
             line.moveToTheEnd();
         }
-              
+
 
     }
@@ -421 +421 @@
         int n = pts.size();
         if (n == 0) return;
-        
+
         Collection<Command> cmds = new LinkedList<Command>();
         int i = 0;
@@ -427 +427 @@
         LatLon first=pts.get(0);
         Node firstNode=null;
-        
+
         for (LatLon p : pts) {
             Node nd=null;
@@ -482 +482 @@
         //System.out.println(tr("Eps={0}", eps));
         eps*=k;
-        setStatusLine(tr("Eps={0}", eps));
+        /* I18N: Eps = Epsilon, the tolerance parameter */ setStatusLine(tr("Eps={0}", eps));
         line.simplify(eps);
         repaint();
     }
-    
+
     private void setStatusLine(String tr) {
         statusText=tr;
@@ -509 +509 @@
     }*/
 
-    
+
     void loadPrefs() {
         COLOR_DELETE = Main.pref.getColor("fastdraw.color.delete", Color.red);
@@ -523 +523 @@
         eps=startingEps;
     }
-    
+
     void savePrefs() {
          Main.pref.putColor("fastdraw.color.delete", COLOR_DELETE );
@@ -546 +546 @@
         if (nearpoint) Main.map.mapView.setCursor(cursorCtrl); else
         Main.map.mapView.setCursor(cursorDraw);
-        
-        
+
+
     }
 // </editor-fold>
 
 // <editor-fold defaultstate="collapsed" desc="Helper functions">
-    
+
     private Node getNearestNode(Point point, double maxDist) {
        Node nd = Main.map.mapView.getNearestNode(point, OsmPrimitive.isUsablePredicate);
-       if (nd!=null && line.getPoint(nd.getCoor()).distance(point)<=maxDist) return nd; 
+       if (nd!=null && line.getPoint(nd.getCoor()).distance(point)<=maxDist) return nd;
        else return null;
     }
@@ -563 +563 @@
     }
 // </editor-fold>
-    
+
 }