Changeset 3461 in josm for trunk

Timestamp:

2010-08-24T10:32:50+02:00 (14 years ago)

Author:

bastiK

Message:

added gui preference for autosave; fixed #5359 - Button to delete autosaved data

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/AutosaveTask.java (modified) (5 diffs)
• data/preferences/IntegerProperty.java (modified) (1 diff)
• gui/MainApplication.java (modified) (2 diffs)
• gui/preferences/BackupPreference.java (added)
• gui/preferences/PreferenceDialog.java (modified) (1 diff)
• gui/preferences/PreferenceTabbedPane.java (modified) (1 diff)
• gui/preferences/ProjectionPreference.java (modified) (2 diffs)
• gui/preferences/ServerAccessPreference.java (modified) (4 diffs)
• gui/preferences/server/BackupPreferencesPanel.java (deleted)
• gui/widgets/HtmlPanel.java (modified) (2 diffs)
• io/OsmExporter.java (modified) (1 diff)
• tools/I18n.java (modified) (3 diffs)

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

@@ -25 +25 @@
 import org.openstreetmap.josm.data.osm.event.DataSetListenerAdapter;
 import org.openstreetmap.josm.data.osm.event.DataSetListenerAdapter.Listener;
+import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.gui.MapView;
@@ -41 +42 @@
     private static final String DELETED_LAYERS_DIR = "autosave/deleted_layers";
 
-
+    public static final BooleanProperty PROP_AUTOSAVE_ENABLED = new BooleanProperty("autosave.enabled", true);
     public static final IntegerProperty PROP_FILES_PER_LAYER = new IntegerProperty("autosave.filesPerLayer", 1);
     public static final IntegerProperty PROP_DELETED_LAYERS = new IntegerProperty("autosave.deletedLayersBackupCount", 5);
     public static final IntegerProperty PROP_INTERVAL = new IntegerProperty("autosave.interval", 5 * 60);
+    public static final IntegerProperty PROP_INDEX_LIMIT = new IntegerProperty("autosave.index-limit", 1000);
 
     private static class AutosaveLayerInfo {
@@ -59 +61 @@
     private final List<AutosaveLayerInfo> layersInfo = new ArrayList<AutosaveLayerInfo>();
     private Timer timer;
-    private Object layersLock = new Object();
+    private final Object layersLock = new Object();
     private final Deque<File> deletedLayers = new LinkedList<File>();
 
@@ -136 +138 @@
                 else {
                     System.out.println(tr("Unable to create file {0}, other filename will be used", result.getAbsolutePath()));
+                    if (index > PROP_INDEX_LIMIT.get())
+                        throw new IOException("index limit exceeded");
                 }
             } catch (IOException e) {
@@ -278 +282 @@
     }
 
+    public void dicardUnsavedLayers() {
+        for (File f: getUnsavedLayersFiles()) {
+            f.renameTo(new File(deletedLayersDir, f.getName()));
+        }
+    }
 
 }

trunk/src/org/openstreetmap/josm/data/preferences/IntegerProperty.java

@@ -22 +22 @@
     }
 
+    /**
+     * parses and saves an integer value
+     * @param value the value to be parsed
+     * @return true - preference value has changed
+     *         false - parsing failed or preference value has not changed
+     */
+    public boolean parseAndPut(String value) {
+        Integer intVal;
+        try {
+            intVal = Integer.parseInt(value);
+        } catch (NumberFormatException ex) {
+            return false;
+        }
+        return put(intVal);
+    }
+
     public String getKey() {
         return key;

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

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.awt.EventQueue;
@@ -247 +248 @@
         }
 
-        AutosaveTask autosaveTask = new AutosaveTask();
-        List<File> unsavedLayerFiles = autosaveTask.getUnsavedLayersFiles();
-        if (!unsavedLayerFiles.isEmpty()) {
-            ExtendedDialog dialog = new ExtendedDialog(
-                    Main.parent,
-                    tr("Unsaved osm data"),
-                    new String[] {tr("Restore"), tr("Cancel")}
-            );
-            dialog.setContent(tr("JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last time. Do you want to restore data?",
-                    unsavedLayerFiles.size()));
-            dialog.setButtonIcons(new String[] {"ok.png", "cancel.png"});
-            dialog.showDialog();
-            if (dialog.getValue() == 1) {
-                for (OsmDataLayer layer: autosaveTask.getUnsavedLayers()) {
-                    Main.main.addLayer(layer);
+        if (AutosaveTask.PROP_AUTOSAVE_ENABLED.get()) {
+            AutosaveTask autosaveTask = new AutosaveTask();
+            List<File> unsavedLayerFiles = autosaveTask.getUnsavedLayersFiles();
+            if (!unsavedLayerFiles.isEmpty()) {
+                ExtendedDialog dialog = new ExtendedDialog(
+                        Main.parent,
+                        tr("Unsaved osm data"),
+                        new String[] {tr("Restore"), tr("Cancel"), tr("Discard")}
+                );
+                dialog.setContent(
+                        trn("JOSM found {0} unsaved osm data layer. ",
+                        "JOSM found {0} unsaved osm data layers. ", unsavedLayerFiles.size(), unsavedLayerFiles.size()) +
+                        tr("It looks like JOSM crashed last time. Do you like to restore the data?"));
+                dialog.setButtonIcons(new String[] {"ok", "cancel", "dialogs/remove"});
+                int selection = dialog.showDialog().getValue();
+                if (selection == 1) {
+                    for (OsmDataLayer layer: autosaveTask.getUnsavedLayers()) {
+                        Main.main.addLayer(layer);
+                    }
+                    AutoScaleAction.autoScale("data");
+                } else if (selection == 3) {
+                    autosaveTask.dicardUnsavedLayers();
                 }
-                AutoScaleAction.autoScale("data");
-            }
-
-
-        }
-        autosaveTask.schedule();
+            }
+            autosaveTask.schedule();
+        }
 
 

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

@@ -78 +78 @@
                     WindowGeometry.centerInWindow(
                             getParent(),
-                            new Dimension(600,800)
+                            new Dimension(700,800)
                     )
             ).applySafe(this);

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

@@ -268 +268 @@
         settingsFactory.add(new MapPaintPreference.Factory());
         settingsFactory.add(new TaggingPresetPreference.Factory());
+        settingsFactory.add(new BackupPreference.Factory());
         if(!Main.applet) {
             settingsFactory.add(new PluginPreference.Factory());

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

@@ -29 +29 @@
 import org.openstreetmap.josm.data.projection.ProjectionSubPrefs;
 import org.openstreetmap.josm.gui.NavigatableComponent;
+import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -107 +108 @@
      * This is the panel holding all projection preferences
      */
-    private JPanel projPanel = new JPanel();
+    private JPanel projPanel = new VerticallyScrollablePanel();
 
     /**

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

@@ -36 +36 @@
     private ProxyPreferencesPanel pnlProxyPreferences;
     /** panel for backup preferences */
-    private BackupPreferencesPanel pnlBackupPreferences;
 
     /**
@@ -63 +62 @@
         pnlProxyPreferences = new ProxyPreferencesPanel();
         tpServerPreferences.add(wrapVerticallyScrollablePanel(pnlProxyPreferences));
-        pnlBackupPreferences = new BackupPreferencesPanel();
-        tpServerPreferences.add(wrapVerticallyScrollablePanel(pnlBackupPreferences));
 
         tpServerPreferences.setTitleAt(0, tr("Authentication"));
         tpServerPreferences.setTitleAt(1, tr("Proxy settings"));
-        tpServerPreferences.setTitleAt(2, tr("File backup"));
         tpServerPreferences.setToolTipTextAt(0, tr("Configure your identity and how to authenticate at the OSM server"));
         tpServerPreferences.setToolTipTextAt(1, tr("Configure whether to use a proxy server"));
-        tpServerPreferences.setToolTipTextAt(2, tr("Configure whether to create backup files"));
 
         pnl.add(tpServerPreferences, BorderLayout.CENTER);
@@ -127 +122 @@
         pnlAuthPreferences.initFromPreferences();
         pnlProxyPreferences.initFromPreferences();
-        pnlBackupPreferences.initFromPreferences();
     }
 
@@ -137 +131 @@
         pnlAuthPreferences.saveToPreferences();
         pnlProxyPreferences.saveToPreferences();
-        pnlBackupPreferences.saveToPreferences();
         return false;
     }

trunk/src/org/openstreetmap/josm/gui/widgets/HtmlPanel.java

@@ -13 +13 @@
 
 /**
- * This panel can be used to display larger larger sections of formatted text in
+ * This panel can be used to display larger sections of formatted text in
  * HTML.
  *
@@ -61 +61 @@
     }
 
+    public HtmlPanel(String text) {
+        this();
+        setText(text);
+    }
+
     /**
      * Replies the editor pane used internally to render the HTML text.

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

@@ -79 +79 @@
             }
             // FIXME - how to close?
-            if (!Main.pref.getBoolean("save.keepbackup") && (tmpFile != null)) {
+            if (!Main.pref.getBoolean("save.keepbackup", false) && (tmpFile != null)) {
                 tmpFile.delete();
             }

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

@@ -118 +118 @@
 
     /**
-     * Set by MainApplication. Changes here later will probably mess up everything, because
-     * many strings are already loaded.
+     * Translates some text for the current locale.
+     * These strings are collected by a script that runs on the source code files.
+     * After translation, the localizations are distributed with the main program.
+     *
+     * @param text the text to translate.
+     * Must be a string literal. (No constants or local vars.)
+     * Can be broken over multiple lines.
+     * An apostrophe ' must be quoted by another apostrophe.
+     * @param objects Parameters for the string.
+     * Mark occurrences in <code>text</code> with {0}, {1}, ...
+     * @return the translated string
+     *
+     * Example: tr("JOSM''s default value is ''{0}''.", val);
      */
     public static final String tr(String text, Object... objects) {
@@ -131 +142 @@
     }
 
-    public static final String trc(String ctx, String text) {
-        if (ctx == null)
+    /**
+     * Provide translation in a context.
+     * There can be different translations for the same text (but 
+     * different context).
+     *
+     * @param context string that helps translators to find an appropriate
+     * translation for <code>text</code>
+     * @param text the text to translate
+     * @return the translated string
+     */
+    public static final String trc(String context, String text) {
+        if (context == null)
             return tr(text);
         if (text == null)
             return null;
-        return MessageFormat.format(gettext(text, ctx), (Object)null);
-    }
-
-    /* NOTE: marktr does NOT support context strings - use marktrc instead */
+        return MessageFormat.format(gettext(text, context), (Object)null);
+    }
+
+    /**
+     * Marks a string for translation (such that a script can harvest
+     * the translatable strings from the source files).
+     *
+     * Example:
+     * String[] options = new String[] {marktr("up"), marktr("down")};
+     * lbl.setText(tr(options[0]));
+     */
     public static final String marktr(String text) {
         return text;
@@ -148 +176 @@
     }
 
+    /**
+     * Example: trn("Found {0} error!", "Found {0} errors!", i, Integer.toString(i));
+     */
     public static final String trn(String text, String pluralText, long n, Object... objects) {
         return MessageFormat.format(gettextn(text, pluralText, null, n), objects);
     }
 
+    /**
+     * Example: trn("There was an error!", "There were errors!", i);
+     */
     public static final String trn(String text, String pluralText, long n) {
         return MessageFormat.format(gettextn(text, pluralText, null, n), (Object)null);