Index: applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java =================================================================== --- applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java (revision 11937) +++ applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java (revision 11938) @@ -79,5 +79,5 @@ i = 7; } else { - throw new ArrayIndexOutOfBoundsException("Direction index '"+direction+"' not found"); + throw new ArrayIndexOutOfBoundsException(tr("Direction index '{0}' not found",direction)); } return i; @@ -106,10 +106,10 @@ 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,5 +135,5 @@ 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,6 +143,6 @@ // 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,5 +195,5 @@ 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 Index: applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java =================================================================== --- applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java (revision 11937) +++ applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java (revision 11938) @@ -13,4 +13,5 @@ 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,5 +20,4 @@ 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,7 +35,5 @@ 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,6 +56,5 @@ 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.
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,6 +72,5 @@ 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,6 +93,4 @@ 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,6 +117,5 @@ 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());