Changeset 29377 in osm for applications/editors/josm/plugins/imagery_offset_db/src/iodb/DeprecateOffsetAction.java

Timestamp:

2013-03-20T08:05:48+01:00 (11 years ago)

Author:

zverik

Message:

some updates to iodb plugin

File:

• applications/editors/josm/plugins/imagery_offset_db/src/iodb/DeprecateOffsetAction.java (modified) (2 diffs)

applications/editors/josm/plugins/imagery_offset_db/src/iodb/DeprecateOffsetAction.java

@@ -30 +30 @@
             return;
         
+        String desc = offset instanceof ImageryOffset ? "imagery offset is wrong"
+                : "calibration geometry is aligned badly";
         if( JOptionPane.showConfirmDialog(Main.parent,
-                tr("Warning: deprecation is irreversible"), // todo: expand
+                tr("Warning: deprecation is basically irreversible!\nAre you sure this " + desc + "?"),
                 ImageryOffsetTools.DIALOG_TITLE, JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE) != JOptionPane.YES_OPTION ) {
             return;
@@ -46 +48 @@
 
         String message = "Please enter the reason why you mark this "
-                + (offset instanceof ImageryOffset ? "imagery offset" : "calibraion object") + " as deprecated:";
-        String reason = null;
-        boolean iterated = false;
-        while( reason == null ) {
-            reason = JOptionPane.showInputDialog(Main.parent, message, ImageryOffsetTools.DIALOG_TITLE, JOptionPane.PLAIN_MESSAGE);
-            if( reason == null || reason.length() == 0 ) {
-                return;
-            }
-            if( reason.length() < 3 || reason.length() > 200 ) {
-                reason = null;
-                if( !iterated ) {
-                    message = message + "\n" + tr("Reason text should be 3 to 200 letters long.");
-                    iterated = true;
-                }
-            }
-        }
+                + (offset instanceof ImageryOffset ? "imagery offset" : "calibraion geometry") + " as deprecated:";
+        String reason = StoreImageryOffsetAction.queryDescription(message);
+        if( reason == null )
+            return;
         
         try {