Changeset 18258 in josm

Timestamp:

2021-10-08T13:42:59+02:00 (3 years ago)

Author:

Don-vip

Message:

see #21408 - fixups (patch by marcello)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• tagging/ac/AutoCompTextField.java (modified) (5 diffs)
• tagging/presets/TaggingPresetItem.java (modified) (2 diffs)
• tagging/presets/TaggingPresets.java (modified) (1 diff)
• tagging/presets/items/ComboMultiSelect.java (modified) (2 diffs)
• widgets/OrientationAction.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompTextField.java

@@ -38 +38 @@
     private boolean autocompleteEnabled = true;
     /** a filter to enforce max. text length */
-    private MaxLengthDocumentFilter docFilter;
+    private transient MaxLengthDocumentFilter docFilter;
     /** the model */
     protected AutoCompComboBoxModel<E> model;
@@ -203 +203 @@
      * @param l the autoComp listener to be removed
      */
-    public synchronized void removeActionListener(AutoCompListener l) {
-        if ((l != null) && (getAction() == l)) {
-            setAction(null);
-        } else {
-            listenerList.remove(AutoCompListener.class, l);
-        }
+    public synchronized void removeAutoCompListener(AutoCompListener l) {
+        listenerList.remove(AutoCompListener.class, l);
     }
 
@@ -245 +241 @@
                         ((AutoCompListener) listeners[i + 1]).autoCompBefore(e);
                         break;
+                    default:
+                        break;
                 }
             }
@@ -261 +259 @@
     @Override
     public void keyTyped(KeyEvent e) {
-        if (autocompleteEnabled) {
-            // if selection is at the end
-            if (getSelectionEnd() == getText().length()) {
-                final String oldText = getText().substring(0, getSelectionStart());
-                // We got the event before the editor component could see it. Let the editor do its job first.
-                SwingUtilities.invokeLater(() -> autocomplete(oldText));
-            }
+        // if selection is at the end
+        if (autocompleteEnabled && getSelectionEnd() == getText().length()) {
+            final String oldText = getText().substring(0, getSelectionStart());
+            // We got the event before the editor component could see it. Let the editor do its job first.
+            SwingUtilities.invokeLater(() -> autocomplete(oldText));
         }
     }
@@ -273 +269 @@
     @Override
     public void keyPressed(KeyEvent e) {
+        // not interested
     }
 
     @Override
     public void keyReleased(KeyEvent e) {
+        // not interested
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java

@@ -43 +43 @@
      * Display OSM keys as {@linkplain org.openstreetmap.josm.gui.widgets.OsmIdTextField#setHint hint}
      */
-    protected static BooleanProperty DISPLAY_KEYS_AS_HINT = new BooleanProperty("taggingpreset.display-keys-as-hint", true);
+    protected static final BooleanProperty DISPLAY_KEYS_AS_HINT = new BooleanProperty("taggingpreset.display-keys-as-hint", true);
 
     protected void initAutoCompletionField(AutoCompletingTextField field, String... key) {
@@ -97 +97 @@
      */
     public Boolean matches(Map<String, String> tags) {
-        return null;
+        return null; // NOSONAR
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java

@@ -53 +53 @@
      * Sort presets menu alphabetically
      */
-    public static BooleanProperty SORT_MENU = new BooleanProperty("taggingpreset.sortvalues", true);
+    public static final BooleanProperty SORT_MENU = new BooleanProperty("taggingpreset.sortvalues", true);
     /**
      * Custom icon sources

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java

@@ -260 +260 @@
     private List<String> checkListsSameLength(List<String> a, List<String> b, String name) {
         if (a != null && a.size() != b.size()) {
-            Logging.error(tr("Broken tagging preset \"{0}-{1}\" - number of items in ''{2}List'' must be the same as in ''values''",
+            Logging.error(tr("Broken tagging preset \"{0}-{1}\" - number of items in ''{2}'' must be the same as in ''values''",
                             key, text, name));
             Logging.error(tr("Detailed information: {0} <> {1}", a, b));
@@ -292 +292 @@
         List<String> shortDescriptionsList = splitEscaped(delimiter, short_descriptions);
 
-        displayList = checkListsSameLength(displayList, valueList, "display");
-        localeDisplayList = checkListsSameLength(localeDisplayList, valueList, "localeDisplay");
-        shortDescriptionsList = checkListsSameLength(shortDescriptionsList, valueList, "shortDescriptions");
-        localeShortDescriptionsList = checkListsSameLength(localeShortDescriptionsList, valueList, "localeShortDescriptions");
+        displayList = checkListsSameLength(displayList, valueList, "display_values");
+        localeDisplayList = checkListsSameLength(localeDisplayList, valueList, "locale_display_values");
+        shortDescriptionsList = checkListsSameLength(shortDescriptionsList, valueList, "short_descriptions");
+        localeShortDescriptionsList = checkListsSameLength(localeShortDescriptionsList, valueList, "locale_short_descriptions");
 
         for (int i = 0; i < valueList.size(); i++) {

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

@@ -35 +35 @@
 public class OrientationAction extends AbstractAction implements PropertyChangeListener {
     /** Default for {@link #RTL_LANGUAGES} */
-    public static final List<String> DEFAULT_RTL_LANGUAGES = Arrays.asList("ar", "he", "fa", "iw", "ur", "lld");
+    private static final List<String> DEFAULT_RTL_LANGUAGES = Arrays.asList("ar", "he", "fa", "iw", "ur");
 
     /** Default for {@link #LOCALIZED_KEYS} */
-    public static final List<String> DEFAULT_LOCALIZED_KEYS = Arrays.asList(
+    private static final List<String> DEFAULT_LOCALIZED_KEYS = Arrays.asList(
         "(\\p{Alnum}+_)?name", "addr", "description", "fixme", "note", "source", "strapline", "operator");
 
@@ -57 +57 @@
 
     private static final Pattern LANG_PATTERN = Pattern.compile(":([a-z]{2,3})$");
+    private static final String NEW_STATE = "newState";
 
     private Component component;
     private ImageIcon iconRTL;
     private ImageIcon iconLTR;
-    protected static Set<String> RTLLanguages = new HashSet<>(RTL_LANGUAGES.get());
-    protected static Pattern localizedKeys = compile_localized_keys();
+    protected static final Set<String> RTLLanguages = new HashSet<>(RTL_LANGUAGES.get());
+    protected static final Pattern localizedKeys = compileLocalizedKeys();
 
     /**
@@ -84 +85 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        firePropertyChange("orientationAction", null, getValue("newState"));
+        firePropertyChange("orientationAction", null, getValue(NEW_STATE));
     }
 
@@ -95 +96 @@
             putValue(Action.SMALL_ICON, iconRTL);
             putValue(Action.SHORT_DESCRIPTION, tr("Switch the text orientation to Right-to-Left."));
-            putValue("newState", ComponentOrientation.RIGHT_TO_LEFT);
+            putValue(NEW_STATE, ComponentOrientation.RIGHT_TO_LEFT);
         } else {
             putValue(Action.NAME, tr("Left to Right"));
             putValue(Action.SMALL_ICON, iconLTR);
             putValue(Action.SHORT_DESCRIPTION, tr("Switch the text orientation to Left-to-Right."));
-            putValue("newState", ComponentOrientation.LEFT_TO_RIGHT);
+            putValue(NEW_STATE, ComponentOrientation.LEFT_TO_RIGHT);
         }
     }
@@ -206 +207 @@
     }
 
-    private static Pattern compile_localized_keys() {
+    private static Pattern compileLocalizedKeys() {
         return Pattern.compile("^(" + String.join("|", LOCALIZED_KEYS.get()) + ")$");
     }