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

Timestamp:

2008-12-26T00:34:48+01:00 (16 years ago)

Author:

stoecker

Message:

minor cleanup

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/audio/AudioBackAction.java (modified) (1 diff)
• actions/audio/AudioFwdAction.java (modified) (1 diff)
• gui/MapFrame.java (modified) (1 diff)

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

@@ -20 +20 @@
         super(tr("Back"), "audio-back", tr("Jump back."),
         Shortcut.registerShortcut("audio:back", tr("Audio: {0}", tr("Back")), KeyEvent.VK_F6, Shortcut.GROUP_DIRECT), true);
-        try {
-            amount = - Double.parseDouble(Main.pref.get("audio.forwardbackamount","10.0"));
-        } catch (NumberFormatException e) {
-            amount = 10.0;
-        }
+        amount = -Main.pref.getDouble("audio.forwardbackamount",10.0);
         this.putValue("help", "Action/Back");
     }

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

@@ -20 +20 @@
         super(tr("Forward"), "audio-fwd", tr("Jump forward"),
         Shortcut.registerShortcut("audio:forward", tr("Audio: {0}", tr("Forward")), KeyEvent.VK_F7, Shortcut.GROUP_DIRECT), true);
-        try {
-            amount = Double.parseDouble(Main.pref.get("audio.forwardbackamount","10.0"));
-        } catch (NumberFormatException e) {
-            amount = 10.0;
-        }
+        amount = Main.pref.getDouble("audio.forwardbackamount",10.0);
     }
 

trunk/src/org/openstreetmap/josm/gui/MapFrame.java

@@ -199 +199 @@
         jb.addSeparator();
         jb.add(toolBarToggle);
-        panel.add(new ScrollViewport(jb, ScrollViewport.VERTICAL_DIRECTION),
-        BorderLayout.WEST);
-        if (statusLine != null)
+        if(Main.pref.getBoolean("sidetoolbar.visible", true))
+        {
+            if(Main.pref.getBoolean("sidetoolbar.scrollable", true))
+                panel.add(new ScrollViewport(jb, ScrollViewport.VERTICAL_DIRECTION),
+                BorderLayout.WEST);
+            else
+                panel.add(jb, BorderLayout.WEST);
+        }
+        if (statusLine != null && Main.pref.getBoolean("statusline.visible", true))
             panel.add(statusLine, BorderLayout.SOUTH);
     }