Changeset 25883 in osm

Timestamp:

2011-04-20T22:44:27+02:00 (13 years ago)

Author:

mzdila

Message:

configuration dialog constants

Location:

applications/editors/josm/plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify

Files:

• SimplifyAreaAction.java (modified) (2 diffs)
• SimplifyAreaPreferenceSetting.java (modified) (3 diffs)

applications/editors/josm/plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java

@@ -203 +203 @@
     // average nearby nodes
     private Collection<Command> averageNearbyNodes(final Collection<Way> ways, final Collection<Node> nodesAlreadyDeleted) {
-        final double mergeThreshold = Main.pref.getDouble("simplify-area.merge.threshold", 0.2);
+        final double mergeThreshold = Main.pref.getDouble(SimplifyAreaPreferenceSetting.MERGE_THRESHOLD, 0.2);
 
         final Map<Node, LatLon> coordMap = new HashMap<Node, LatLon>();
@@ -316 +316 @@
 
     private void addNodesToDelete(final Collection<Node> nodesToDelete, final Way w) {
-        final double angleThreshold = Main.pref.getDouble("simplify-area.angle.threshold", 10);
-        final double angleFactor = Main.pref.getDouble("simplify-area.angle.factor", 1.0);
-        final double areaThreshold = Main.pref.getDouble("simplify-area.area.threshold", 5.0);
-        final double areaFactor = Main.pref.getDouble("simplify-area.area.factor", 1.0);
-        final double distanceThreshold = Main.pref.getDouble("simplify-area.dist.threshold", 3);
-        final double distanceFactor = Main.pref.getDouble("simplify-area.dist.factor", 3);
+        final double angleThreshold = Main.pref.getDouble(SimplifyAreaPreferenceSetting.ANGLE_THRESHOLD, 10);
+        final double angleFactor = Main.pref.getDouble(SimplifyAreaPreferenceSetting.ANGLE_FACTOR, 1.0);
+        final double areaThreshold = Main.pref.getDouble(SimplifyAreaPreferenceSetting.AREA_THRESHOLD, 5.0);
+        final double areaFactor = Main.pref.getDouble(SimplifyAreaPreferenceSetting.AREA_FACTOR, 1.0);
+        final double distanceThreshold = Main.pref.getDouble(SimplifyAreaPreferenceSetting.DIST_THRESHOLD, 3);
+        final double distanceFactor = Main.pref.getDouble(SimplifyAreaPreferenceSetting.DIST_FACTOR, 3);
 
         final List<Node> nodes = w.getNodes();

applications/editors/josm/plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaPreferenceSetting.java

@@ -14 +14 @@
 
 public class SimplifyAreaPreferenceSetting implements PreferenceSetting {
+
+    static final String DIST_FACTOR = "simplify-area.dist.factor";
+    static final String DIST_THRESHOLD = "simplify-area.dist.threshold";
+    static final String AREA_FACTOR = "simplify-area.area.factor";
+    static final String AREA_THRESHOLD = "simplify-area.area.threshold";
+    static final String ANGLE_FACTOR = "simplify-area.angle.factor";
+    static final String ANGLE_THRESHOLD = "simplify-area.angle.threshold";
+    static final String MERGE_THRESHOLD = "simplify-area.merge.threshold";
 
     private final JTextField mergeThreshold = new JTextField(8);
@@ -36 +44 @@
                         "Merge Nearby Nodes is another step of the simplification that merges adjanced nodes that are closer than <u>Threshold</u> meters.");
 
-        angleThreshold.setText(Main.pref.get("simplify-area.angle.threshold", "10"));
+        angleThreshold.setText(Main.pref.get(ANGLE_THRESHOLD, "10"));
         tab.add(new JLabel(tr("Angle Threshold")), GBC.std());
         tab.add(angleThreshold, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
 
-        angleFactor.setText(Main.pref.get("simplify-area.angle.factor", "1.0"));
+        angleFactor.setText(Main.pref.get(ANGLE_FACTOR, "1.0"));
         tab.add(new JLabel(tr("Angle Factor")), GBC.std());
         tab.add(angleFactor, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
 
-        areaThreshold.setText(Main.pref.get("simplify-area.area.threshold", "5.0"));
+        areaThreshold.setText(Main.pref.get(AREA_THRESHOLD, "5.0"));
         tab.add(new JLabel(tr("Area Threshold")), GBC.std());
         tab.add(areaThreshold, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
 
-        areaFactor.setText(Main.pref.get("simplify-area.area.factor", "1.0"));
+        areaFactor.setText(Main.pref.get(AREA_FACTOR, "1.0"));
         tab.add(new JLabel(tr("Area Factor")), GBC.std());
         tab.add(areaFactor, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
 
-        distanceThreshold.setText(Main.pref.get("simplify-area.dist.threshold", "3"));
+        distanceThreshold.setText(Main.pref.get(DIST_THRESHOLD, "3"));
         tab.add(new JLabel(tr("Distance Threshold")), GBC.std());
         tab.add(distanceThreshold, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
 
-        distanceFactor.setText(Main.pref.get("simplify-area.dist.factor", "3"));
+        distanceFactor.setText(Main.pref.get(DIST_FACTOR, "3"));
         tab.add(new JLabel(tr("Distance Factor")), GBC.std());
         tab.add(distanceFactor, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
 
-        mergeThreshold.setText(Main.pref.get("simplify-area.merge.threshold", "0.2"));
+        mergeThreshold.setText(Main.pref.get(MERGE_THRESHOLD, "0.2"));
         // mergeThreshold.setToolTipText(tr("bla bla"));
         tab.add(new JLabel(tr("Merge Nearby Nodes Threshold")), GBC.std());
@@ -70 +78 @@
     @Override
     public boolean ok() {
-        Main.pref.put("simplify-area.merge.threshold", mergeThreshold.getText());
-        Main.pref.put("simplify-area.angle.threshold", angleThreshold.getText());
-        Main.pref.put("simplify-area.angle.factor", angleFactor.getText());
-        Main.pref.put("simplify-area.area.threshold", areaThreshold.getText());
-        Main.pref.put("simplify-area.area.factor", areaFactor.getText());
-        Main.pref.put("simplify-area.dist.threshold", distanceThreshold.getText());
-        Main.pref.put("simplify-area.dist.factor", distanceFactor.getText());
+        Main.pref.put(MERGE_THRESHOLD, mergeThreshold.getText());
+        Main.pref.put(ANGLE_THRESHOLD, angleThreshold.getText());
+        Main.pref.put(ANGLE_FACTOR, angleFactor.getText());
+        Main.pref.put(AREA_THRESHOLD, areaThreshold.getText());
+        Main.pref.put(AREA_FACTOR, areaFactor.getText());
+        Main.pref.put(DIST_THRESHOLD, distanceThreshold.getText());
+        Main.pref.put(DIST_FACTOR, distanceFactor.getText());
         return false;
     }