Changeset 19108 in josm for trunk/src/org/openstreetmap/josm/actions/SessionSaveAction.java

Timestamp:

2024-06-17T19:37:02+02:00 (23 months ago)

Author:

taylor.smock

Message:

Cleanup some new PMD warnings from PMD 7.x (followup of r19101)

File:

• trunk/src/org/openstreetmap/josm/actions/SessionSaveAction.java (modified) (10 diffs)

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

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trn;
@@ -8 +9 @@
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
@@ -84 +86 @@
     private static final BooleanProperty SAVE_PLUGIN_INFORMATION_PROPERTY = new BooleanProperty("session.saveplugins", false);
     private static final String TOOLTIP_DEFAULT = tr("Save the current session.");
+    private static final String SAVE_SESSION = marktr("Save Session");
 
     protected transient FileFilter joz = new ExtensionFileFilter("joz", "joz", tr("Session file (archive) (*.joz)"));
@@ -120 +123 @@
      */
     protected SessionSaveAction(boolean toolbar, boolean installAdapters) {
-        this(tr("Save Session"), "session", TOOLTIP_DEFAULT,
+        this(tr(SAVE_SESSION), "session", TOOLTIP_DEFAULT,
                 Shortcut.registerShortcut("system:savesession", tr("File: {0}", tr("Save Session...")), KeyEvent.VK_S, Shortcut.ALT_CTRL),
                 toolbar, "save-session", installAdapters);
@@ -183 +186 @@
                 .collect(Collectors.toList());
 
-        boolean zipRequired = layersOut.stream().map(l -> exporters.get(l))
+        boolean zipRequired = layersOut.stream().map(exporters::get)
                 .anyMatch(ex -> ex != null && ex.requiresZip()) || pluginsWantToSave();
 
@@ -333 +336 @@
 
         if (zipRequired) {
-            fc = createAndOpenFileChooser(false, false, tr("Save Session"), joz, JFileChooser.FILES_ONLY, "lastDirectory");
+            fc = createAndOpenFileChooser(false, false, tr(SAVE_SESSION), joz, JFileChooser.FILES_ONLY, "lastDirectory");
         } else {
-            fc = createAndOpenFileChooser(false, false, tr("Save Session"), Arrays.asList(jos, joz), jos,
+            fc = createAndOpenFileChooser(false, false, tr(SAVE_SESSION), Arrays.asList(jos, joz), jos,
                     JFileChooser.FILES_ONLY, "lastDirectory");
         }
@@ -366 +369 @@
          */
         public SessionSaveAsDialog() {
-            super(MainApplication.getMainFrame(), tr("Save Session"), tr("Save As"), tr("Cancel"));
+            super(MainApplication.getMainFrame(), tr(SAVE_SESSION), tr("Save As"), tr("Cancel"));
             configureContextsensitiveHelp("Action/SessionSaveAs", true /* show help button */);
             initialize();
@@ -442 +445 @@
                 JPanel wrapper = new JPanel(new GridBagLayout());
                 wrapper.setBorder(BorderFactory.createEtchedBorder(EtchedBorder.RAISED));
-                wrapper.add(exportPanel, GBC.std().fill(GBC.HORIZONTAL));
-                ip.add(wrapper, GBC.eol().fill(GBC.HORIZONTAL).insets(2, 2, 4, 2));
-            }
-            ip.add(GBC.glue(0, 1), GBC.eol().fill(GBC.VERTICAL));
+                wrapper.add(exportPanel, GBC.std().fill(GridBagConstraints.HORIZONTAL));
+                ip.add(wrapper, GBC.eol().fill(GridBagConstraints.HORIZONTAL).insets(2, 2, 4, 2));
+            }
+            ip.add(GBC.glue(0, 1), GBC.eol().fill(GridBagConstraints.VERTICAL));
             JScrollPane sp = new JScrollPane(ip);
             sp.setBorder(BorderFactory.createEmptyBorder());
@@ -475 +478 @@
             p.add(include, GBC.std());
             p.add(lbl, GBC.std());
-            p.add(GBC.glue(1, 0), GBC.std().fill(GBC.HORIZONTAL));
+            p.add(GBC.glue(1, 0), GBC.std().fill(GridBagConstraints.HORIZONTAL));
             return p;
         }
@@ -538 +541 @@
      * @deprecated since 18833, use {@link #setCurrentSession(File, List, SessionWriter.SessionWriterFlags...)} instead
      */
-    @Deprecated
+    @Deprecated(since = "18833")
     public static void setCurrentSession(File file, boolean zip, List<Layer> layers) {
         if (zip) {