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

Timestamp:

2009-12-31T13:44:36+01:00 (15 years ago)

Author:

stoecker

Message:

fixed last checkin

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/SelectAction.java (modified) (1 diff)
• gui/ConditionalOptionPaneUtil.java (modified) (1 diff)
• gui/ExtendedDialog.java (modified) (1 diff)
• gui/layer/geoimage/GeoImageLayer.java (modified) (2 diffs)
• io/FileImporter.java (modified) (1 diff)

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

@@ -474 +474 @@
                                 + "Really move them?", max));
                         ed.toggleEnable("movedManyElements");
-                        ed.setToggleCheckboxText(tr("Always move and don't show dialog again"));
                         ed.showDialog();
 
-                        if(ed.getValue() != 1 && ed.getValue() != ExtendedDialog.DialogNotShown)
+                        if(ed.getValue() != 1)
                         {
                             Main.main.undoRedo.undo();

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

@@ -197 +197 @@
 
         public MessagePanel(boolean donotshow, Object message) {
-            cbShowDialog = new JCheckBox(tr("Do not show again"));
+            cbShowDialog = new JCheckBox(tr("Do not show again (remembers choice)"));
             cbShowDialog.setSelected(donotshow);
             setLayout(new GridBagLayout());

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

@@ -37 +37 @@
     private String togglePref = "";
     private int toggleValue = -1;
-    private String toggleCheckboxText = tr("Do not show again");
+    private String toggleCheckboxText = tr("Do not show again (remembers choice)");
     private JCheckBox toggleCheckbox = null;
     private Component parent;

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -582 +582 @@
                     ,toDelete.file.getName()), ImageProvider.get("dialogs/geoimage/deletefromdisk"),SwingConstants.LEFT))
                 .toggleEnable("geoimage.deleteimagefromdisk")
-                .setToggleCheckboxText(tr("Always delete and don't show this dialog again"))
                 .setCancelButton(1)
                 .setDefaultButton(2)
@@ -588 +587 @@
                 .getValue();
 
-            if(result == 2 || result == ExtendedDialog.DialogNotShown)
+            if(result == 2)
             {
                 data.remove(currentPhoto);

trunk/src/org/openstreetmap/josm/io/FileImporter.java

@@ -43 +43 @@
      */
     public void importData(List<File> files) throws IOException, IllegalDataException {
-        throw new IOException(tr("Could not import Files."));
+        throw new IOException(tr("Could not import files."));
     }