Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompTextField.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompTextField.java (revision 18257) +++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompTextField.java (revision 18258) @@ -38,5 +38,5 @@ private boolean autocompleteEnabled = true; /** a filter to enforce max. text length */ - private MaxLengthDocumentFilter docFilter; + private transient MaxLengthDocumentFilter docFilter; /** the model */ protected AutoCompComboBoxModel model; @@ -203,10 +203,6 @@ * @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,4 +241,6 @@ ((AutoCompListener) listeners[i + 1]).autoCompBefore(e); break; + default: + break; } } @@ -261,11 +259,9 @@ @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,8 +269,10 @@ @Override public void keyPressed(KeyEvent e) { + // not interested } @Override public void keyReleased(KeyEvent e) { + // not interested } Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java (revision 18257) +++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java (revision 18258) @@ -43,5 +43,5 @@ * 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,5 +97,5 @@ */ public Boolean matches(Map tags) { - return null; + return null; // NOSONAR } Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java (revision 18257) +++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java (revision 18258) @@ -53,5 +53,5 @@ * 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 Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java (revision 18257) +++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java (revision 18258) @@ -260,5 +260,5 @@ private List checkListsSameLength(List a, List 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,8 +292,8 @@ List 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++) { Index: trunk/src/org/openstreetmap/josm/gui/widgets/OrientationAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/widgets/OrientationAction.java (revision 18257) +++ trunk/src/org/openstreetmap/josm/gui/widgets/OrientationAction.java (revision 18258) @@ -35,8 +35,8 @@ public class OrientationAction extends AbstractAction implements PropertyChangeListener { /** Default for {@link #RTL_LANGUAGES} */ - public static final List DEFAULT_RTL_LANGUAGES = Arrays.asList("ar", "he", "fa", "iw", "ur", "lld"); + private static final List DEFAULT_RTL_LANGUAGES = Arrays.asList("ar", "he", "fa", "iw", "ur"); /** Default for {@link #LOCALIZED_KEYS} */ - public static final List DEFAULT_LOCALIZED_KEYS = Arrays.asList( + private static final List DEFAULT_LOCALIZED_KEYS = Arrays.asList( "(\\p{Alnum}+_)?name", "addr", "description", "fixme", "note", "source", "strapline", "operator"); @@ -57,10 +57,11 @@ 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 RTLLanguages = new HashSet<>(RTL_LANGUAGES.get()); - protected static Pattern localizedKeys = compile_localized_keys(); + protected static final Set RTLLanguages = new HashSet<>(RTL_LANGUAGES.get()); + protected static final Pattern localizedKeys = compileLocalizedKeys(); /** @@ -84,5 +85,5 @@ @Override public void actionPerformed(ActionEvent e) { - firePropertyChange("orientationAction", null, getValue("newState")); + firePropertyChange("orientationAction", null, getValue(NEW_STATE)); } @@ -95,10 +96,10 @@ 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,5 +207,5 @@ } - private static Pattern compile_localized_keys() { + private static Pattern compileLocalizedKeys() { return Pattern.compile("^(" + String.join("|", LOCALIZED_KEYS.get()) + ")$"); }