Changeset 1245 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-01-11T16:14:58+01:00 (16 years ago)

Author:

stoecker

Message:

added link to presets, fix #1675

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/CreateCircleAction.java (modified) (1 diff)
• actions/audio/AudioBackAction.java (modified) (2 diffs)
• actions/audio/AudioFastSlowAction.java (modified) (1 diff)
• actions/audio/AudioFwdAction.java (modified) (2 diffs)
• actions/mapmode/DrawAction.java (modified) (1 diff)
• actions/mapmode/SelectAction.java (modified) (3 diffs)
• data/Preferences.java (modified) (1 diff)
• gui/download/DownloadDialog.java (modified) (1 diff)
• gui/layer/GpxLayer.java (modified) (2 diffs)
• gui/layer/markerlayer/PlayHeadMarker.java (modified) (3 diffs)
• gui/preferences/AudioPreference.java (modified) (1 diff)
• gui/tagging/TaggingPreset.java (modified) (8 diffs)
• tools/AudioPlayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java

@@ -70 +70 @@
 
     public void actionPerformed(ActionEvent e) {
-        int numberOfNodesInCircle = Integer.parseInt(Main.pref.get("createcircle.nodecount", "8"));
+        int numberOfNodesInCircle = Main.pref.getInteger("createcircle.nodecount", 8);
         if (numberOfNodesInCircle < 1) {
             numberOfNodesInCircle = 1;

trunk/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java

@@ -15 +15 @@
 public class AudioBackAction extends JosmAction {
 
-    private double amount; // note, normally negative, i.e. jump backwards in time
-
     public AudioBackAction() {
         super(tr("Back"), "audio-back", tr("Jump back."),
         Shortcut.registerShortcut("audio:back", tr("Audio: {0}", tr("Back")), KeyEvent.VK_F6, Shortcut.GROUP_DIRECT), true);
-        amount = -Main.pref.getDouble("audio.forwardbackamount","10.0");
         this.putValue("help", "Action/Back");
     }
@@ -27 +24 @@
         try {
             if (AudioPlayer.playing() || AudioPlayer.paused())
-                AudioPlayer.play(AudioPlayer.url(), AudioPlayer.position() + amount);
+                AudioPlayer.play(AudioPlayer.url(), AudioPlayer.position()
+                - Main.pref.getDouble("audio.forwardbackamount","10.0"));
             else
                 MarkerLayer.playAudio();

trunk/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java

@@ -15 +15 @@
     public AudioFastSlowAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean fast) {
         super(name, iconName, tooltip, shortcut, true);
-        try {
-            multiplier = Double.parseDouble(Main.pref.get("audio.fastfwdmultiplier","1.3"));
-        } catch (NumberFormatException e) {
-            multiplier = 1.3;
-        }
+        multiplier = Main.pref.getDouble("audio.fastfwdmultiplier","1.3");
         if (! fast)
             multiplier = 1.0 / multiplier;

trunk/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java

@@ -14 +14 @@
 
 public class AudioFwdAction extends JosmAction {
-
-    private double amount;
-
     public AudioFwdAction() {
         super(tr("Forward"), "audio-fwd", tr("Jump forward"),
         Shortcut.registerShortcut("audio:forward", tr("Audio: {0}", tr("Forward")), KeyEvent.VK_F7, Shortcut.GROUP_DIRECT), true);
-        amount = Main.pref.getDouble("audio.forwardbackamount","10.0");
     }
 
@@ -26 +22 @@
         try {
             if (AudioPlayer.playing() || AudioPlayer.paused())
-                AudioPlayer.play(AudioPlayer.url(), AudioPlayer.position() + amount);
+                AudioPlayer.play(AudioPlayer.url(), AudioPlayer.position()
+                + Main.pref.getDouble("audio.forwardbackamount","10.0"));
             else
                 MarkerLayer.playAudio();

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

@@ -536 +536 @@
                     B.north() + q * (A.north() - B.north()));
 
-            int snapToIntersectionThreshold=0;
-            try { snapToIntersectionThreshold = Integer.parseInt(Main.pref.get("edit.snap-intersection-threshold","10")); } catch (NumberFormatException x) {}
+            int snapToIntersectionThreshold
+            = Main.pref.getInteger("edit.snap-intersection-threshold",10);
 
             // only adjust to intersection if within snapToIntersectionThreshold pixel of mouse click; otherwise

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

@@ -73 +73 @@
      * counts as a move, in milliseconds
      */
-    private int initialMoveDelay = 200;
+    private int initialMoveDelay;
 
     /**
@@ -79 +79 @@
      * counts as a move, in pixels
      */
-    private int initialMoveThreshold = 15;
+    private int initialMoveThreshold;
     private boolean initialMoveThresholdExceeded = false;
     /**
@@ -92 +92 @@
         putValue("help", "Action/Move/Move");
         selectionManager = new SelectionManager(this, false, mapFrame.mapView);
-        try { initialMoveDelay = Integer.parseInt(Main.pref.get("edit.initial-move-delay","200")); } catch (NumberFormatException x) {}
-        try { initialMoveThreshold = Integer.parseInt(Main.pref.get("edit.initial-move-threshold","5")); } catch (NumberFormatException x) {}
-
+        initialMoveDelay = Main.pref.getInteger("edit.initial-move-delay",200);
+        initialMoveThreshold = Main.pref.getInteger("edit.initial-move-threshold",5);
     }
 

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -433 +433 @@
         putDefault(key, def);
         String v = get(key);
-        try {
-            return Double.parseDouble(v == null ? def : v);
-        } catch(NumberFormatException e) {
-            // fall out
-        }
+        if(v != null && v.length() != 0)
+            try { return Double.parseDouble(v); } catch(NumberFormatException e) {}
+        try { return Double.parseDouble(def); } catch(NumberFormatException e) {}
         return 0.0;
     }

trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java

@@ -138 +138 @@
 
         try {
-            tabpane.setSelectedIndex(Integer.parseInt(Main.pref.get("download.tab", "0")));
+            tabpane.setSelectedIndex(Main.pref.getInteger("download.tab", 0));
         } catch (Exception ex) {
-            Main.pref.put("download.tab", "0");
+            Main.pref.putInteger("download.tab", 0);
         }
 

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -378 +378 @@
         boolean forceLines = Main.pref.getBoolean("draw.rawgps.lines.force");                     // also draw lines between points belonging to different segments
         boolean direction = Main.pref.getBoolean("draw.rawgps.direction");                        // draw direction arrows on the lines
-        int maxLineLength = -1;
-        try {
-            maxLineLength = Integer.parseInt(Main.pref.get("draw.rawgps.max-line-length", "-1"));   // don't draw lines if longer than x meters
-        } catch (java.lang.NumberFormatException e) {
-            Main.pref.put("draw.rawgps.max-line-length", "-1");
-        }
+        int maxLineLength = Main.pref.getInteger("draw.rawgps.max-line-length", -1);
+        // don't draw lines if longer than x meters
         boolean lines = Main.pref.getBoolean("draw.rawgps.lines");                                // draw line between points, global setting
         String linesKey = "draw.rawgps.lines.layer "+name;
@@ -391 +387 @@
         boolean colored = Main.pref.getBoolean("draw.rawgps.colors");                             // color the lines
         boolean alternatedirection = Main.pref.getBoolean("draw.rawgps.alternatedirection");      // paint direction arrow with alternate math. may be faster
-        int delta = 0;
-        try {
-            delta = Integer.parseInt(Main.pref.get("draw.rawgps.min-arrow-distance", "0"));         // don't draw arrows nearer to each other than this
-        } catch (java.lang.NumberFormatException e) {
-            Main.pref.put("draw.rawgps.min-arrow-distance", "0");
-        }
+        int delta = Main.pref.getInteger("draw.rawgps.min-arrow-distance", 0);
+        // don't draw arrows nearer to each other than this
 
         /****************************************************************

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java

@@ -46 +46 @@
     private boolean enabled;
     private boolean wasPlaying = false;
-    private int dropTolerance = 50; /* pixels */
+    private int dropTolerance; /* pixels */
 
     public static PlayHeadMarker create() {
@@ -65 +65 @@
         enabled = Main.pref.getBoolean("marker.traceaudio", true);
         if (! enabled) return;
-        try { dropTolerance = Integer.parseInt(Main.pref.get("marker.playHeadDropTolerance", "50")); }
-        catch(NumberFormatException x) { dropTolerance = 50; }
+        dropTolerance = Main.pref.getInteger("marker.playHeadDropTolerance", 50);
         Main.map.mapView.addMouseListener(new MouseAdapter() {
             @Override public void mousePressed(MouseEvent ev) {
@@ -87 +86 @@
     @Override public boolean containsPoint(Point p) {
         Point screen = Main.map.mapView.getPoint(eastNorth);
-        Rectangle r = new Rectangle(screen.x, screen.y, symbol.getIconWidth(), symbol.getIconHeight());
+        Rectangle r = new Rectangle(screen.x, screen.y, symbol.getIconWidth(),
+        symbol.getIconHeight());
         return r.contains(p);
     }

trunk/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java

@@ -145 +145 @@
         gui.audio.add(audioFastForwardMultiplier, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
 
-        audioLeadIn.setText(Main.pref.get("audio.leadin", "1"));
+        audioLeadIn.setText(Main.pref.get("audio.leadin", "1.0"));
         audioLeadIn.setToolTipText(tr("Playback starts this number of seconds before (or after, if negative) the audio track position requested"));
         gui.audio.add(new JLabel(tr("Lead-in time (seconds)")), GBC.std());

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -8 +8 @@
 import java.awt.Image;
 import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -24 +25 @@
 import javax.swing.Action;
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
@@ -43 +45 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.OpenBrowser;
 import org.openstreetmap.josm.tools.XmlObjectParser;
 import org.xml.sax.SAXException;
@@ -179 +182 @@
         public String text;
         public String locale_text;
-        public boolean default_ = false; // not used!
+        public boolean default_ = false; // only used for tagless objects
         public boolean use_last_as_default = false;
 
@@ -196 +199 @@
             for (String s : usage.values) oneValue = s;
             if (usage.values.size() < 2 && (oneValue == null || OsmUtils.trueval.equals(oneValue) || OsmUtils.falseval.equals(oneValue))) {
+                if(default_)
+                {
+                    for (OsmPrimitive s : sel)
+                        if(s.keys != null && s.keys.size() > 0) default_ = false;
+                }
+
                 // all selected objects share the same value which is either true or false or unset,
                 // we can display a standard check box.
@@ -202 +211 @@
                             OsmUtils.falseval.equals(oneValue) ?
                             QuadStateCheckBox.State.NOT_SELECTED :
-                            QuadStateCheckBox.State.UNSET;
+                            default_ ? QuadStateCheckBox.State.SELECTED
+                            : QuadStateCheckBox.State.UNSET;
                 check = new QuadStateCheckBox(locale_text, initialState,
                         new QuadStateCheckBox.State[] {
@@ -357 +367 @@
     }
 
+    public static class Link extends Item {
+        public String href;
+        public String text;
+        public String locale_text;
+
+        @Override public void addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
+            if(locale_text == null)
+                locale_text = text == null ? tr("Open map features in browser") : tr(text);
+            JButton b = new JButton(locale_text);
+            b.addActionListener(new ActionListener(){
+                public void actionPerformed(ActionEvent e) {
+                    OpenBrowser.displayUrl(href);
+                }
+            });
+            p.add(b, GBC.eol().anchor(GBC.EAST));
+        }
+        @Override public void addCommands(Collection<OsmPrimitive> sel, List<Command> cmds) {}
+    }
+
     public static class Optional extends Item {
         // TODO: Draw a box around optional stuff
@@ -458 +487 @@
         parser.mapBoth("group", TaggingPresetMenu.class);
         parser.map("text", Text.class);
+        parser.map("link", Link.class);
         parser.mapOnStart("optional", Optional.class);
         parser.map("check", Check.class);

trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java

@@ -197 +197 @@
         command = new Execute();
         playingUrl = null;
-        try {
-            leadIn = Double.parseDouble(Main.pref.get("audio.leadin", "1.0" /* default, seconds */));
-        } catch (NumberFormatException e) {
-            leadIn = 1.0; // failed to parse
-        }
-        try {
-            calibration = Double.parseDouble(Main.pref.get("audio.calibration", "1.0" /* default, ratio */));
-        } catch (NumberFormatException e) {
-            calibration = 1.0; // failed to parse
-        }
+        leadIn = Main.pref.getDouble("audio.leadin", "1.0" /* default, seconds */);
+        calibration = Main.pref.getDouble("audio.calibration", "1.0" /* default, ratio */);
         start();
         while (state == State.INITIALIZING) { yield(); }