Changeset 11938 in osm for applications/editors/josm/plugins/lakewalker

Timestamp:

2008-11-15T13:55:26+01:00 (16 years ago)

Author:

stoecker

Message:

some locale fixes

Location:

applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker

Files:

• Lakewalker.java (modified) (5 diffs)
• LakewalkerPreferences.java (modified) (7 diffs)

applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java

@@ -79 +79 @@
                         i =  7;
                 } else {
-                        throw new ArrayIndexOutOfBoundsException("Direction index '"+direction+"' not found");
+                        throw new ArrayIndexOutOfBoundsException(tr("Direction index '{0}' not found",direction));
                 }
                 return i;
@@ -106 +106 @@
                 
                 if(!bbox.contains(lat, lon)){
-                        throw new LakewalkerException("The starting location was not within the bbox");
+                        throw new LakewalkerException(tr("The starting location was not within the bbox"));
                 }
                 
                 int v;
                 
-                setStatus("Looking for shoreline...");
+                setStatus(tr("Looking for shoreline..."));
                 
                 while(true){
@@ -135 +135 @@
                 double[] startgeo = xy_to_geo(xy[0],xy[1],this.resolution);
 
-                System.out.printf("Found shore at lat %.4f lon %.4f\n",lat,lon);
+                //System.out.printf("Found shore at lat %.4f lon %.4f\n",lat,lon);
                 
                 int last_dir = this.getDirectionIndex(this.startdir);
@@ -143 +143 @@
                         // Print a counter
                         if(i % 250 == 0){
-                                setStatus(i+" nodes so far...");
-                                System.out.println(i+" nodes so far...");
+                                setStatus(tr("{0} nodes so far...",i));
+                                //System.out.println(i+" nodes so far...");
                         }
                         
@@ -195 +195 @@
                         double[] geo = xy_to_geo(xy[0],xy[1],this.resolution);
                         nodelist.add(geo);
-                        System.out.println("Adding node at "+xy[0]+","+xy[1]+" ("+geo[1]+","+geo[0]+")");
+                        //System.out.println("Adding node at "+xy[0]+","+xy[1]+" ("+geo[1]+","+geo[0]+")");
                         
                         // Check if we got stuck in a loop 

applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java

@@ -13 +13 @@
 public class LakewalkerPreferences implements PreferenceSetting {
 
+  // TODO: Make these translatable
   public static final String[] DIRECTIONS = new String[] {"east", "northeast", "north", "northwest", "west", "southwest", "south", "southeast"};
   public static final String[] WAYTYPES = new String[] {"water", "coastline", "land", "none"};
@@ -19 +20 @@
   public static final String PREF_MAX_SEG = "lakewalker.max_segs_in_way";
   public static final String PREF_MAX_NODES = "lakewalker.max_nodes";
-  public static final String PREF_THRESHOLD = "lakewalker.threshold";
   public static final String PREF_THRESHOLD_VALUE = "lakewalker.thresholdvalue";
   public static final String PREF_EPSILON = "lakewalker.epsilon";
@@ -35 +35 @@
   protected JLabel maxNodesLabel = new JLabel(tr("Maximum number of nodes in initial trace"));
   protected IntConfigurer thresholdConfig = new IntConfigurer();
-  protected JLabel thresholdLabel = new JLabel(tr("Maximum gray value to count as water (0-255) [For old script]"));
-  protected IntConfigurer thresholdConfigNew = new IntConfigurer();
-  protected JLabel thresholdLabelNew = new JLabel(tr("Maximum gray value to count as water (0-255)"));
+  protected JLabel thresholdLabel = new JLabel(tr("Maximum gray value to count as water (0-255)"));
   protected DoubleConfigurer epsilonConfig = new DoubleConfigurer();
   protected JLabel epsilonLabel = new JLabel(tr("Line simplification accuracy (degrees)"));
@@ -58 +56 @@
     maxSegsConfig.setToolTipText(tr("Maximum number of segments allowed in each generated way. Default 250."));
     maxNodesConfig.setToolTipText(tr("Maximum number of nodes to generate before bailing out (before simplifying lines). Default 50000."));
-    thresholdConfig.setToolTipText(tr("Maximum gray value to accept as water (based on Landsat IR-1 data). Can be in the range 0-255. Default 35."));
-    thresholdConfigNew.setToolTipText(tr("Maximum gray value to accept as water (based on Landsat IR-1 data). Can be in the range 0-255. Default 90."));
+    thresholdConfig.setToolTipText(tr("Maximum gray value to accept as water (based on Landsat IR-1 data). Can be in the range 0-255. Default 90."));
     epsilonConfig.setToolTipText(tr("Accuracy of Douglas-Peucker line simplification, measured in degrees.<br>Lower values give more nodes, and more accurate lines. Default 0.0003."));
     landsatResConfig.setToolTipText(tr("Resolution of Landsat tiles, measured in pixels per degree. Default 4000."));
@@ -75 +72 @@
     maxSegsConfig.setValue(Main.pref.getInteger(PREF_MAX_SEG, 500));
     maxNodesConfig.setValue(Main.pref.getInteger(PREF_MAX_NODES, 50000));
-    thresholdConfig.setValue(Main.pref.getInteger(PREF_THRESHOLD, 35));
-    thresholdConfigNew.setValue(Main.pref.getInteger(PREF_THRESHOLD_VALUE, 90));
+    thresholdConfig.setValue(Main.pref.getInteger(PREF_THRESHOLD_VALUE, 90));
     epsilonConfig.setValue(Main.pref.getDouble(PREF_EPSILON, 0.0003));
     landsatResConfig.setValue(Main.pref.getInteger(PREF_LANDSAT_RES, 4000));
@@ -97 +93 @@
     prefPanel.add(thresholdLabel, labelConstraints);
     prefPanel.add(thresholdConfig.getControls(), dataConstraints);
-    prefPanel.add(thresholdLabelNew, labelConstraints);
-    prefPanel.add(thresholdConfigNew.getControls(), dataConstraints);
     prefPanel.add(epsilonLabel, labelConstraints);
     prefPanel.add(epsilonConfig.getControls(), dataConstraints);
@@ -123 +117 @@
     Main.pref.put(PREF_MAX_SEG, maxSegsConfig.getValueString());
     Main.pref.put(PREF_MAX_NODES, maxNodesConfig.getValueString());
-    Main.pref.put(PREF_THRESHOLD, thresholdConfig.getValueString());
-    Main.pref.put(PREF_THRESHOLD_VALUE, thresholdConfigNew.getValueString());
+    Main.pref.put(PREF_THRESHOLD_VALUE, thresholdConfig.getValueString());
     Main.pref.put(PREF_EPSILON, epsilonConfig.getValueString());
     Main.pref.put(PREF_LANDSAT_RES, landsatResConfig.getValueString());