Index: /trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java (revision 12541) +++ /trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java (revision 12542) @@ -30,6 +30,6 @@ // TODO: Switch to checked list. We can do this as soon as we do not see any more warnings. - private static final ListenerList LISTENERS = ListenerList.createUnchecked(); - private static final ListenerList VISIBILITY_TOGGLE_LISTENERS = ListenerList.createUnchecked(); + private static final ListenerList listeners = ListenerList.createUnchecked(); + private static final ListenerList visibilityToggleListeners = ListenerList.createUnchecked(); private static final BooleanProperty PREF_EXPERT = new BooleanProperty("expert", false); @@ -38,6 +38,6 @@ private static synchronized void fireExpertModeChanged(boolean isExpert) { - LISTENERS.fireEvent(listener -> listener.expertChanged(isExpert)); - VISIBILITY_TOGGLE_LISTENERS.fireEvent(c -> c.setVisible(isExpert)); + listeners.fireEvent(listener -> listener.expertChanged(isExpert)); + visibilityToggleListeners.fireEvent(c -> c.setVisible(isExpert)); } @@ -53,5 +53,5 @@ public static synchronized void addExpertModeChangeListener(ExpertModeChangeListener listener, boolean fireWhenAdding) { if (listener == null) return; - LISTENERS.addWeakListener(listener); + listeners.addWeakListener(listener); if (fireWhenAdding) { listener.expertChanged(isExpert()); @@ -66,5 +66,5 @@ public static synchronized void removeExpertModeChangeListener(ExpertModeChangeListener listener) { if (listener == null) return; - LISTENERS.removeListener(listener); + listeners.removeListener(listener); } @@ -75,5 +75,5 @@ public static synchronized void addVisibilitySwitcher(Component c) { if (c == null) return; - VISIBILITY_TOGGLE_LISTENERS.addWeakListener(c); + visibilityToggleListeners.addWeakListener(c); c.setVisible(isExpert()); } @@ -86,5 +86,5 @@ public static synchronized void removeVisibilitySwitcher(Component c) { if (c == null) return; - VISIBILITY_TOGGLE_LISTENERS.removeListener(c); + visibilityToggleListeners.removeListener(c); } Index: /trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (revision 12541) +++ /trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (revision 12542) @@ -42,5 +42,5 @@ * @since 4869 */ - private static final ArrayList IMPORTERS; + private static final ArrayList importers; /** @@ -48,5 +48,5 @@ * @since 4869 */ - private static final ArrayList EXPORTERS; + private static final ArrayList exporters; // add some file types only if the relevant classes are there. @@ -56,5 +56,5 @@ static { - IMPORTERS = new ArrayList<>(); + importers = new ArrayList<>(); final List> importerNames = Arrays.asList( @@ -73,5 +73,5 @@ try { FileImporter importer = importerClass.getConstructor().newInstance(); - IMPORTERS.add(importer); + importers.add(importer); } catch (ReflectiveOperationException e) { Main.debug(e); @@ -95,5 +95,5 @@ } - EXPORTERS = new ArrayList<>(); + exporters = new ArrayList<>(); final List> exporterClasses = Arrays.asList( @@ -110,5 +110,5 @@ try { FileExporter exporter = exporterClass.getConstructor().newInstance(); - EXPORTERS.add(exporter); + exporters.add(exporter); Main.getLayerManager().addAndFireActiveLayerChangeListener(exporter); } catch (ReflectiveOperationException e) { @@ -147,5 +147,5 @@ public static void addImporter(FileImporter importer) { if (importer != null) { - IMPORTERS.add(importer); + importers.add(importer); } } @@ -158,5 +158,5 @@ public static void addImporterFirst(FileImporter importer) { if (importer != null) { - IMPORTERS.add(0, importer); + importers.add(0, importer); } } @@ -169,5 +169,5 @@ public static void addExporter(FileExporter exporter) { if (exporter != null) { - EXPORTERS.add(exporter); + exporters.add(exporter); } } @@ -180,5 +180,5 @@ public static void addExporterFirst(FileExporter exporter) { if (exporter != null) { - EXPORTERS.add(0, exporter); + exporters.add(0, exporter); } } @@ -190,5 +190,5 @@ */ public static List getImporters() { - return Collections.unmodifiableList(IMPORTERS); + return Collections.unmodifiableList(importers); } @@ -199,5 +199,5 @@ */ public static List getExporters() { - return Collections.unmodifiableList(EXPORTERS); + return Collections.unmodifiableList(exporters); } @@ -213,7 +213,7 @@ */ public static void updateAllFormatsImporter() { - for (int i = 0; i < IMPORTERS.size(); i++) { - if (IMPORTERS.get(i) instanceof AllFormatsImporter) { - IMPORTERS.set(i, new AllFormatsImporter()); + for (int i = 0; i < importers.size(); i++) { + if (importers.get(i) instanceof AllFormatsImporter) { + importers.set(i, new AllFormatsImporter()); } } @@ -231,5 +231,5 @@ updateAllFormatsImporter(); List filters = new LinkedList<>(); - for (FileImporter importer : IMPORTERS) { + for (FileImporter importer : importers) { filters.add(importer.filter); } @@ -248,5 +248,5 @@ public static List getExportExtensionFileFilters() { List filters = new LinkedList<>(); - for (FileExporter exporter : EXPORTERS) { + for (FileExporter exporter : exporters) { if (filters.contains(exporter.filter) || !exporter.isEnabled()) { continue; @@ -267,5 +267,5 @@ public static ExtensionFileFilter getDefaultImportExtensionFileFilter(String extension) { if (extension == null) return new AllFormatsImporter().filter; - for (FileImporter importer : IMPORTERS) { + for (FileImporter importer : importers) { if (extension.equals(importer.filter.getDefaultExtension())) return importer.filter; @@ -283,5 +283,5 @@ public static ExtensionFileFilter getDefaultExportExtensionFileFilter(String extension) { if (extension == null) return new AllFormatsImporter().filter; - for (FileExporter exporter : EXPORTERS) { + for (FileExporter exporter : exporters) { if (extension.equals(exporter.filter.getDefaultExtension())) return exporter.filter; @@ -290,5 +290,5 @@ // scan all supported extensions File file = new File("file." + extension); - for (FileExporter exporter : EXPORTERS) { + for (FileExporter exporter : exporters) { if (exporter.filter.accept(file)) return exporter.filter; Index: /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 12541) +++ /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 12542) @@ -75,5 +75,5 @@ * Remember movements, so the user can later undo it for certain nodes */ - private static final Map REMEMBER_MOVEMENTS = new HashMap<>(); + private static final Map rememberMovements = new HashMap<>(); /** @@ -108,8 +108,8 @@ if (!(p instanceof Node)) throw new InvalidUserInputException("selected object is not a node"); Node n = (Node) p; - if (REMEMBER_MOVEMENTS.containsKey(n)) { - EastNorth tmp = REMEMBER_MOVEMENTS.get(n); + if (rememberMovements.containsKey(n)) { + EastNorth tmp = rememberMovements.get(n); commands.add(new MoveCommand(n, -tmp.east(), -tmp.north())); - REMEMBER_MOVEMENTS.remove(n); + rememberMovements.remove(n); } } @@ -209,5 +209,5 @@ } else { if (nodeList.size() == 2 || nodeList.isEmpty()) { - REMEMBER_MOVEMENTS.clear(); + OrthogonalizeAction.rememberMovements.clear(); final Collection commands = new LinkedList<>(); @@ -424,5 +424,5 @@ throw new AssertionError("heading node has changed"); } else { - REMEMBER_MOVEMENTS.put(n, new EastNorth(dx, dy)); + OrthogonalizeAction.rememberMovements.put(n, new EastNorth(dx, dy)); commands.add(new MoveCommand(n, dx, dy)); } Index: /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 12541) +++ /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 12542) @@ -125,10 +125,10 @@ } - private static final LinkedList SEARCH_HISTORY = new LinkedList<>(); + private static final LinkedList searchHistory = new LinkedList<>(); static { for (String s: Main.pref.getCollection("search.history", Collections.emptyList())) { SearchSetting ss = SearchSetting.readFromString(s); if (ss != null) { - SEARCH_HISTORY.add(ss); + searchHistory.add(ss); } } @@ -140,5 +140,5 @@ */ public static Collection getSearchHistory() { - return SEARCH_HISTORY; + return searchHistory; } @@ -148,17 +148,17 @@ */ public static void saveToHistory(SearchSetting s) { - if (SEARCH_HISTORY.isEmpty() || !s.equals(SEARCH_HISTORY.getFirst())) { - SEARCH_HISTORY.addFirst(new SearchSetting(s)); - } else if (SEARCH_HISTORY.contains(s)) { + if (searchHistory.isEmpty() || !s.equals(searchHistory.getFirst())) { + searchHistory.addFirst(new SearchSetting(s)); + } else if (searchHistory.contains(s)) { // move existing entry to front, fixes #8032 - search history loses entries when re-using queries - SEARCH_HISTORY.remove(s); - SEARCH_HISTORY.addFirst(new SearchSetting(s)); + searchHistory.remove(s); + searchHistory.addFirst(new SearchSetting(s)); } int maxsize = Main.pref.getInteger("search.history-size", DEFAULT_SEARCH_HISTORY_SIZE); - while (SEARCH_HISTORY.size() > maxsize) { - SEARCH_HISTORY.removeLast(); - } - Set savedHistory = new LinkedHashSet<>(SEARCH_HISTORY.size()); - for (SearchSetting item: SEARCH_HISTORY) { + while (searchHistory.size() > maxsize) { + searchHistory.removeLast(); + } + Set savedHistory = new LinkedHashSet<>(searchHistory.size()); + for (SearchSetting item: searchHistory) { savedHistory.add(item.writeToString()); } Index: /trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java (revision 12541) +++ /trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java (revision 12542) @@ -80,5 +80,5 @@ } - private static final CopyOnWriteArrayList SOM_CHANGE_LISTENERS = new CopyOnWriteArrayList<>(); + private static final CopyOnWriteArrayList somChangeListeners = new CopyOnWriteArrayList<>(); /** @@ -89,5 +89,5 @@ */ public static void removeSoMChangeListener(SoMChangeListener listener) { - SOM_CHANGE_LISTENERS.remove(listener); + somChangeListeners.remove(listener); } @@ -100,10 +100,10 @@ public static void addSoMChangeListener(SoMChangeListener listener) { if (listener != null) { - SOM_CHANGE_LISTENERS.addIfAbsent(listener); + somChangeListeners.addIfAbsent(listener); } } protected static void fireSoMChanged(String oldSoM, String newSoM) { - for (SoMChangeListener l : SOM_CHANGE_LISTENERS) { + for (SoMChangeListener l : somChangeListeners) { l.systemOfMeasurementChanged(oldSoM, newSoM); } Index: /trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (revision 12541) +++ /trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (revision 12542) @@ -81,6 +81,6 @@ - private static final ConcurrentMap> IN_PROGRESS = new ConcurrentHashMap<>(); - private static final ConcurrentMap USE_HEAD = new ConcurrentHashMap<>(); + private static final ConcurrentMap> inProgress = new ConcurrentHashMap<>(); + private static final ConcurrentMap useHead = new ConcurrentHashMap<>(); protected final long now; // when the job started @@ -162,9 +162,9 @@ throw new IllegalArgumentException("No url returned"); } - synchronized (IN_PROGRESS) { - Set newListeners = IN_PROGRESS.get(deduplicationKey); + synchronized (inProgress) { + Set newListeners = inProgress.get(deduplicationKey); if (newListeners == null) { newListeners = new HashSet<>(); - IN_PROGRESS.put(deduplicationKey, newListeners); + inProgress.put(deduplicationKey, newListeners); first = true; } @@ -259,7 +259,7 @@ private void finishLoading(LoadResult result) { Set listeners; - synchronized (IN_PROGRESS) { + synchronized (inProgress) { try { - listeners = IN_PROGRESS.remove(getUrl().toString()); + listeners = inProgress.remove(getUrl().toString()); } catch (IOException e) { listeners = null; @@ -312,5 +312,5 @@ // then just use HEAD request and check returned values if (isObjectLoadable() && - Boolean.TRUE.equals(USE_HEAD.get(getServerKey())) && + Boolean.TRUE.equals(useHead.get(getServerKey())) && isCacheValidUsingHead()) { LOG.log(Level.FINE, "JCS - cache entry verified using HEAD request: {0}", getUrl()); @@ -346,5 +346,5 @@ LOG.log(Level.INFO, "JCS - Host: {0} found not to return 304 codes for If-Modified-Since or If-None-Match headers", serverKey); - USE_HEAD.put(serverKey, Boolean.TRUE); + useHead.put(serverKey, Boolean.TRUE); } Index: /trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java (revision 12541) +++ /trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java (revision 12542) @@ -51,5 +51,5 @@ // we need another deduplication of Tile Loader listeners, as for each submit, new TMSCachedTileLoaderJob was created // that way, we reduce calls to tileLoadingFinished, and general CPU load due to surplus Map repaints - private static final ConcurrentMap> IN_PROGRESS = new ConcurrentHashMap<>(); + private static final ConcurrentMap> inProgress = new ConcurrentHashMap<>(); /** @@ -71,9 +71,9 @@ if (listener != null) { String deduplicationKey = getCacheKey(); - synchronized (IN_PROGRESS) { - Set newListeners = IN_PROGRESS.get(deduplicationKey); + synchronized (inProgress) { + Set newListeners = inProgress.get(deduplicationKey); if (newListeners == null) { newListeners = new HashSet<>(); - IN_PROGRESS.put(deduplicationKey, newListeners); + inProgress.put(deduplicationKey, newListeners); } newListeners.add(listener); @@ -162,6 +162,6 @@ this.attributes = attributes; // as we might get notification from other object than our selfs, pass attributes along Set listeners; - synchronized (IN_PROGRESS) { - listeners = IN_PROGRESS.remove(getCacheKey()); + synchronized (inProgress) { + listeners = inProgress.remove(getCacheKey()); } boolean status = result.equals(LoadResult.SUCCESS); Index: /trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (revision 12541) +++ /trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (revision 12542) @@ -47,5 +47,5 @@ } - private static final AtomicLong ID_COUNTER = new AtomicLong(0); + private static final AtomicLong idCounter = new AtomicLong(0); /** @@ -54,5 +54,5 @@ */ static long generateUniqueId() { - return ID_COUNTER.decrementAndGet(); + return idCounter.decrementAndGet(); } @@ -63,5 +63,5 @@ */ public static long currentUniqueId() { - return ID_COUNTER.get(); + return idCounter.get(); } @@ -76,5 +76,5 @@ throw new IllegalArgumentException("Cannot modify the id counter backwards"); } - ID_COUNTER.set(newId); + idCounter.set(newId); } Index: /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (revision 12541) +++ /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (revision 12542) @@ -638,5 +638,5 @@ * dataset. (However, the selection does only change in the active layer) */ - private static final Collection SEL_LISTENERS = new CopyOnWriteArrayList<>(); + private static final Collection selListeners = new CopyOnWriteArrayList<>(); /** @@ -647,5 +647,5 @@ */ public static void addSelectionListener(SelectionChangedListener listener) { - ((CopyOnWriteArrayList) SEL_LISTENERS).addIfAbsent(listener); + ((CopyOnWriteArrayList) selListeners).addIfAbsent(listener); } @@ -657,5 +657,5 @@ */ public static void removeSelectionListener(SelectionChangedListener listener) { - SEL_LISTENERS.remove(listener); + selListeners.remove(listener); } @@ -671,5 +671,5 @@ private static void fireDreprecatedSelectionChange(Collection currentSelection) { - for (SelectionChangedListener l : SEL_LISTENERS) { + for (SelectionChangedListener l : selListeners) { l.selectionChanged(currentSelection); } Index: /trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java (revision 12541) +++ /trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java (revision 12542) @@ -79,11 +79,11 @@ private static double griddetail; - private static final Collection IGNORED_ERRORS = new TreeSet<>(); + private static final Collection ignoredErrors = new TreeSet<>(); /** * All registered tests */ - private static final Collection> ALL_TESTS = new ArrayList<>(); - private static final Map ALL_TESTS_MAP = new HashMap<>(); + private static final Collection> allTests = new ArrayList<>(); + private static final Map allTestsMap = new HashMap<>(); /** @@ -139,7 +139,7 @@ */ public static void addTest(Class testClass) { - ALL_TESTS.add(testClass); + allTests.add(testClass); try { - ALL_TESTS_MAP.put(testClass.getName(), testClass.getConstructor().newInstance()); + allTestsMap.put(testClass.getName(), testClass.getConstructor().newInstance()); } catch (ReflectiveOperationException e) { Main.error(e); @@ -182,10 +182,10 @@ private static void loadIgnoredErrors() { - IGNORED_ERRORS.clear(); + ignoredErrors.clear(); if (ValidatorPreference.PREF_USE_IGNORE.get()) { Path path = Paths.get(getValidatorDir()).resolve("ignorederrors"); if (path.toFile().exists()) { try { - IGNORED_ERRORS.addAll(Files.readAllLines(path, StandardCharsets.UTF_8)); + ignoredErrors.addAll(Files.readAllLines(path, StandardCharsets.UTF_8)); } catch (final FileNotFoundException e) { Main.debug(Main.getErrorMessage(e)); @@ -204,5 +204,5 @@ */ public static void addIgnoredError(String s) { - IGNORED_ERRORS.add(s); + ignoredErrors.add(s); } @@ -213,5 +213,5 @@ */ public static boolean hasIgnoredError(String s) { - return IGNORED_ERRORS.contains(s); + return ignoredErrors.contains(s); } @@ -221,5 +221,5 @@ public static void saveIgnoredErrors() { try (PrintWriter out = new PrintWriter(new File(getValidatorDir(), "ignorederrors"), StandardCharsets.UTF_8.name())) { - for (String e : IGNORED_ERRORS) { + for (String e : ignoredErrors) { out.println(e); } @@ -254,7 +254,7 @@ */ public static SortedMap getAllTestsMap() { - applyPrefs(ALL_TESTS_MAP, false); - applyPrefs(ALL_TESTS_MAP, true); - return new TreeMap<>(ALL_TESTS_MAP); + applyPrefs(allTestsMap, false); + applyPrefs(allTestsMap, true); + return new TreeMap<>(allTestsMap); } @@ -271,5 +271,5 @@ return null; } - return (T) ALL_TESTS_MAP.get(testClass.getName()); + return (T) allTestsMap.get(testClass.getName()); } @@ -318,5 +318,5 @@ */ public static Collection> getAllAvailableTestClasses() { - return Collections.unmodifiableCollection(ALL_TESTS); + return Collections.unmodifiableCollection(allTests); } Index: /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 12541) +++ /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 12542) @@ -53,5 +53,5 @@ private static DefaultNameFormatter instance; - private static final List FORMAT_HOOKS = new LinkedList<>(); + private static final List formatHooks = new LinkedList<>(); /** @@ -75,6 +75,6 @@ public static void registerFormatHook(NameFormatterHook hook) { if (hook == null) return; - if (!FORMAT_HOOKS.contains(hook)) { - FORMAT_HOOKS.add(0, hook); + if (!formatHooks.contains(hook)) { + formatHooks.add(0, hook); } } @@ -87,6 +87,6 @@ public static void unregisterFormatHook(NameFormatterHook hook) { if (hook == null) return; - if (FORMAT_HOOKS.contains(hook)) { - FORMAT_HOOKS.remove(hook); + if (formatHooks.contains(hook)) { + formatHooks.remove(hook); } } @@ -203,5 +203,5 @@ String result = name.toString(); - for (NameFormatterHook hook: FORMAT_HOOKS) { + for (NameFormatterHook hook: formatHooks) { String hookResult = hook.checkFormat(node, result); if (hookResult != null) @@ -295,5 +295,5 @@ String result = name.toString(); - for (NameFormatterHook hook: FORMAT_HOOKS) { + for (NameFormatterHook hook: formatHooks) { String hookResult = hook.checkFormat(way, result); if (hookResult != null) @@ -333,5 +333,5 @@ String result = name.toString(); - for (NameFormatterHook hook: FORMAT_HOOKS) { + for (NameFormatterHook hook: formatHooks) { String hookResult = hook.checkFormat(relation, result); if (hookResult != null) @@ -430,5 +430,5 @@ } - for (NameFormatterHook hook: FORMAT_HOOKS) { + for (NameFormatterHook hook: formatHooks) { String hookResult = hook.checkRelationTypeName(relation, name); if (hookResult != null) Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 12541) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 12542) @@ -75,5 +75,5 @@ /** list of custom components that can be added by plugins at JOSM startup */ - private static final Collection CUSTOM_COMPONENTS = new ArrayList<>(); + private static final Collection customComponents = new ArrayList<>(); /** the "created_by" changeset OSM key */ @@ -136,5 +136,5 @@ // Custom components - for (Component c : CUSTOM_COMPONENTS) { + for (Component c : customComponents) { pnl.add(c, GBC.eol().fill(GBC.HORIZONTAL)); } @@ -406,5 +406,5 @@ public static boolean addCustomComponent(Component c) { if (c != null) { - return CUSTOM_COMPONENTS.add(c); + return customComponents.add(c); } return false; Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java (revision 12541) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java (revision 12542) @@ -31,5 +31,5 @@ /** The collection of tagging presets */ - private static final Collection TAGGING_PRESETS = new ArrayList<>(); + private static final Collection taggingPresets = new ArrayList<>(); /** cache for key/value pairs found in the preset */ @@ -39,5 +39,5 @@ /** The collection of listeners */ - private static final Collection LISTENERS = new ArrayList<>(); + private static final Collection listeners = new ArrayList<>(); private TaggingPresets() { @@ -49,7 +49,7 @@ */ public static void readFromPreferences() { - TAGGING_PRESETS.clear(); - TAGGING_PRESETS.addAll(TaggingPresetReader.readFromPreferences(false, false)); - cachePresets(TAGGING_PRESETS); + taggingPresets.clear(); + taggingPresets.addAll(TaggingPresetReader.readFromPreferences(false, false)); + cachePresets(taggingPresets); } @@ -59,14 +59,14 @@ public static void initialize() { readFromPreferences(); - for (TaggingPreset tp: TAGGING_PRESETS) { + for (TaggingPreset tp: taggingPresets) { if (!(tp instanceof TaggingPresetSeparator)) { Main.toolbar.register(tp); } } - if (TAGGING_PRESETS.isEmpty()) { + if (taggingPresets.isEmpty()) { Main.main.menu.presetsMenu.setVisible(false); } else { Map submenus = new HashMap<>(); - for (final TaggingPreset p : TAGGING_PRESETS) { + for (final TaggingPreset p : taggingPresets) { JMenu m = p.group != null ? submenus.get(p.group) : Main.main.menu.presetsMenu; if (m == null && p.group != null) { @@ -136,5 +136,5 @@ */ public static Collection getTaggingPresets() { - return Collections.unmodifiableCollection(TAGGING_PRESETS); + return Collections.unmodifiableCollection(taggingPresets); } @@ -199,6 +199,6 @@ */ public static void addTaggingPresets(Collection presets) { - if (presets != null && TAGGING_PRESETS.addAll(presets)) { - for (TaggingPresetListener listener : LISTENERS) { + if (presets != null && taggingPresets.addAll(presets)) { + for (TaggingPresetListener listener : listeners) { listener.taggingPresetsModified(); } @@ -212,5 +212,5 @@ public static void addListener(TaggingPresetListener listener) { if (listener != null) { - LISTENERS.add(listener); + listeners.add(listener); } } @@ -222,5 +222,5 @@ public static void removeListener(TaggingPresetListener listener) { if (listener != null) { - LISTENERS.remove(listener); + listeners.remove(listener); } } Index: /trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java (revision 12541) +++ /trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java (revision 12542) @@ -99,5 +99,5 @@ static final Pattern OUTPUT_FORMAT_STATEMENT = Pattern.compile(".*\\[out:([a-z]{3,})\\].*", Pattern.DOTALL); - static final Map> OUTPUT_FORMAT_READERS = new ConcurrentHashMap<>(); + static final Map> outputFormatReaders = new ConcurrentHashMap<>(); final String overpassServer; @@ -125,5 +125,5 @@ public static final Class registerOverpassOutpoutFormatReader( OverpassOutpoutFormat format, Class readerClass) { - return OUTPUT_FORMAT_READERS.put(Objects.requireNonNull(format), Objects.requireNonNull(readerClass)); + return outputFormatReaders.put(Objects.requireNonNull(format), Objects.requireNonNull(readerClass)); } @@ -232,5 +232,5 @@ Matcher m = OUTPUT_FORMAT_STATEMENT.matcher(overpassQuery); if (m.matches()) { - Class readerClass = OUTPUT_FORMAT_READERS.get(OverpassOutpoutFormat.from(m.group(1))); + Class readerClass = outputFormatReaders.get(OverpassOutpoutFormat.from(m.group(1))); if (readerClass != null) { try { Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 12541) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 12542) @@ -51,5 +51,5 @@ private final String sender; - private static final Set TRUSTED_SENDERS = new HashSet<>(); + private static final Set trustedSenders = new HashSet<>(); static final class PropertyTableModel extends DefaultTableModel { @@ -227,12 +227,12 @@ tablePanel.add(propertyTable.getTableHeader(), GBC.eol().fill(GBC.HORIZONTAL)); tablePanel.add(propertyTable, GBC.eol().fill(GBC.BOTH)); - if (!sender.isEmpty() && !TRUSTED_SENDERS.contains(sender)) { + if (!sender.isEmpty() && !trustedSenders.contains(sender)) { final JCheckBox c = new JCheckBox(); c.setAction(new AbstractAction(tr("Accept all tags from {0} for this session", sender)) { @Override public void actionPerformed(ActionEvent e) { if (c.isSelected()) - TRUSTED_SENDERS.add(sender); + trustedSenders.add(sender); else - TRUSTED_SENDERS.remove(sender); + trustedSenders.remove(sender); } }); @@ -263,5 +263,5 @@ } if (buttonIndex == 2) { - TRUSTED_SENDERS.remove(sender); + trustedSenders.remove(sender); } setVisible(false); @@ -308,5 +308,5 @@ */ public static void addTags(String[][] keyValue, String sender, Collection primitives) { - if (TRUSTED_SENDERS.contains(sender)) { + if (trustedSenders.contains(sender)) { if (Main.getLayerManager().getEditDataSet() != null) { for (String[] row : keyValue) { Index: /trunk/src/org/openstreetmap/josm/io/session/SessionReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/session/SessionReader.java (revision 12541) +++ /trunk/src/org/openstreetmap/josm/io/session/SessionReader.java (revision 12542) @@ -147,5 +147,5 @@ } - private static final Map> SESSION_LAYER_IMPORTERS = new HashMap<>(); + private static final Map> sessionLayerImporters = new HashMap<>(); private URI sessionFileURI; @@ -174,5 +174,5 @@ */ public static void registerSessionLayerImporter(String layerType, Class importer) { - SESSION_LAYER_IMPORTERS.put(layerType, importer); + sessionLayerImporters.put(layerType, importer); } @@ -183,5 +183,5 @@ */ public static SessionLayerImporter getSessionLayerImporter(String layerType) { - Class importerClass = SESSION_LAYER_IMPORTERS.get(layerType); + Class importerClass = sessionLayerImporters.get(layerType); if (importerClass == null) return null; Index: /trunk/tools/pmd/josm-ruleset.xml =================================================================== --- /trunk/tools/pmd/josm-ruleset.xml (revision 12541) +++ /trunk/tools/pmd/josm-ruleset.xml (revision 12542) @@ -43,5 +43,18 @@ - +