Index: trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java (revision 12537) @@ -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 visibilityToggleListeners = ListenerList.createUnchecked(); + private static final ListenerList LISTENERS = ListenerList.createUnchecked(); + private static final ListenerList VISIBILITY_TOGGLE_LISTENERS = 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)); - visibilityToggleListeners.fireEvent(c -> c.setVisible(isExpert)); + LISTENERS.fireEvent(listener -> listener.expertChanged(isExpert)); + VISIBILITY_TOGGLE_LISTENERS.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; - visibilityToggleListeners.addWeakListener(c); + VISIBILITY_TOGGLE_LISTENERS.addWeakListener(c); c.setVisible(isExpert()); } @@ -86,5 +86,5 @@ public static synchronized void removeVisibilitySwitcher(Component c) { if (c == null) return; - visibilityToggleListeners.removeListener(c); + VISIBILITY_TOGGLE_LISTENERS.removeListener(c); } Index: trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (revision 12537) @@ -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 12536) +++ trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 12537) @@ -75,5 +75,5 @@ * Remember movements, so the user can later undo it for certain nodes */ - private static final Map rememberMovements = new HashMap<>(); + private static final Map REMEMBER_MOVEMENTS = new HashMap<>(); /** @@ -108,8 +108,8 @@ if (!(p instanceof Node)) throw new InvalidUserInputException("selected object is not a node"); Node n = (Node) p; - if (rememberMovements.containsKey(n)) { - EastNorth tmp = rememberMovements.get(n); + if (REMEMBER_MOVEMENTS.containsKey(n)) { + EastNorth tmp = REMEMBER_MOVEMENTS.get(n); commands.add(new MoveCommand(n, -tmp.east(), -tmp.north())); - rememberMovements.remove(n); + REMEMBER_MOVEMENTS.remove(n); } } @@ -209,5 +209,5 @@ } else { if (nodeList.size() == 2 || nodeList.isEmpty()) { - OrthogonalizeAction.rememberMovements.clear(); + REMEMBER_MOVEMENTS.clear(); final Collection commands = new LinkedList<>(); @@ -424,5 +424,5 @@ throw new AssertionError("heading node has changed"); } else { - OrthogonalizeAction.rememberMovements.put(n, new EastNorth(dx, dy)); + REMEMBER_MOVEMENTS.put(n, new EastNorth(dx, dy)); commands.add(new MoveCommand(n, dx, dy)); } Index: trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java (revision 12537) @@ -24,5 +24,5 @@ public final class PasteTagsAction extends JosmAction { - private static final String help = ht("/Action/PasteTags"); + private static final String HELP = ht("/Action/PasteTags"); private final OsmTransferHandler transferHandler = new OsmTransferHandler(); @@ -35,5 +35,5 @@ Shortcut.registerShortcut("system:pastestyle", tr("Edit: {0}", tr("Paste Tags")), KeyEvent.VK_V, Shortcut.CTRL_SHIFT), true); - putValue("help", help); + putValue("help", HELP); } Index: trunk/src/org/openstreetmap/josm/actions/UploadAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 12537) @@ -52,6 +52,6 @@ * however, a plugin might also want to insert something after that. */ - private static final List uploadHooks = new LinkedList<>(); - private static final List lateUploadHooks = new LinkedList<>(); + private static final List UPLOAD_HOOKS = new LinkedList<>(); + private static final List LATE_UPLOAD_HOOKS = new LinkedList<>(); static { @@ -59,25 +59,25 @@ * Calls validator before upload. */ - uploadHooks.add(new ValidateUploadHook()); + UPLOAD_HOOKS.add(new ValidateUploadHook()); /** * Fixes database errors */ - uploadHooks.add(new FixDataHook()); + UPLOAD_HOOKS.add(new FixDataHook()); /** * Checks server capabilities before upload. */ - uploadHooks.add(new ApiPreconditionCheckerHook()); + UPLOAD_HOOKS.add(new ApiPreconditionCheckerHook()); /** * Adjusts the upload order of new relations */ - uploadHooks.add(new RelationUploadOrderHook()); + UPLOAD_HOOKS.add(new RelationUploadOrderHook()); /** * Removes discardable tags like created_by on modified objects */ - lateUploadHooks.add(new DiscardTagsHook()); + LATE_UPLOAD_HOOKS.add(new DiscardTagsHook()); } @@ -102,10 +102,10 @@ if (hook == null) return; if (late) { - if (!lateUploadHooks.contains(hook)) { - lateUploadHooks.add(0, hook); + if (!LATE_UPLOAD_HOOKS.contains(hook)) { + LATE_UPLOAD_HOOKS.add(0, hook); } } else { - if (!uploadHooks.contains(hook)) { - uploadHooks.add(0, hook); + if (!UPLOAD_HOOKS.contains(hook)) { + UPLOAD_HOOKS.add(0, hook); } } @@ -119,9 +119,9 @@ public static void unregisterUploadHook(UploadHook hook) { if (hook == null) return; - if (uploadHooks.contains(hook)) { - uploadHooks.remove(hook); - } - if (lateUploadHooks.contains(hook)) { - lateUploadHooks.remove(hook); + if (UPLOAD_HOOKS.contains(hook)) { + UPLOAD_HOOKS.remove(hook); + } + if (LATE_UPLOAD_HOOKS.contains(hook)) { + LATE_UPLOAD_HOOKS.remove(hook); } } @@ -204,5 +204,5 @@ // if (apiData != null) { - for (UploadHook hook : uploadHooks) { + for (UploadHook hook : UPLOAD_HOOKS) { if (!hook.checkUpload(apiData)) return false; @@ -240,5 +240,5 @@ return; - for (UploadHook hook : lateUploadHooks) { + for (UploadHook hook : LATE_UPLOAD_HOOKS) { if (!hook.checkUpload(apiData)) return; Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 12537) @@ -56,5 +56,5 @@ private transient WaySegment oldHighlightedWaySegment; - private static final HighlightHelper highlightHelper = new HighlightHelper(); + private static final HighlightHelper HIGHLIGHT_HELPER = new HighlightHelper(); private boolean drawTargetHighlight; @@ -177,5 +177,5 @@ */ private void removeHighlighting() { - highlightHelper.clear(); + HIGHLIGHT_HELPER.clear(); DataSet ds = getLayerManager().getEditDataSet(); if (ds != null) { @@ -232,5 +232,5 @@ oldHighlightedWaySegment = newHighlightedWaySegment; } - needsRepaint |= highlightHelper.highlightOnly(newHighlights); + needsRepaint |= HIGHLIGHT_HELPER.highlightOnly(newHighlights); if (needsRepaint && editLayer != null) { editLayer.invalidate(); Index: trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java (revision 12537) @@ -148,9 +148,9 @@ } - private static final List specialChars = Arrays.asList('"', ':', '(', ')', '|', '^', '=', '?', '<', '>'); - private static final List specialCharsQuoted = Arrays.asList('"'); + private static final List SPECIAL_CHARS = Arrays.asList('"', ':', '(', ')', '|', '^', '=', '?', '<', '>'); + private static final List SPECIAL_CHARS_QUOTED = Arrays.asList('"'); private String getString(boolean quoted) { - List sChars = quoted ? specialCharsQuoted : specialChars; + List sChars = quoted ? SPECIAL_CHARS_QUOTED : SPECIAL_CHARS; StringBuilder s = new StringBuilder(); boolean escape = false; Index: trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 12537) @@ -125,10 +125,10 @@ } - private static final LinkedList searchHistory = new LinkedList<>(); + private static final LinkedList SEARCH_HISTORY = new LinkedList<>(); static { for (String s: Main.pref.getCollection("search.history", Collections.emptyList())) { SearchSetting ss = SearchSetting.readFromString(s); if (ss != null) { - searchHistory.add(ss); + SEARCH_HISTORY.add(ss); } } @@ -140,5 +140,5 @@ */ public static Collection getSearchHistory() { - return searchHistory; + return SEARCH_HISTORY; } @@ -148,17 +148,17 @@ */ public static void saveToHistory(SearchSetting s) { - if (searchHistory.isEmpty() || !s.equals(searchHistory.getFirst())) { - searchHistory.addFirst(new SearchSetting(s)); - } else if (searchHistory.contains(s)) { + if (SEARCH_HISTORY.isEmpty() || !s.equals(SEARCH_HISTORY.getFirst())) { + SEARCH_HISTORY.addFirst(new SearchSetting(s)); + } else if (SEARCH_HISTORY.contains(s)) { // move existing entry to front, fixes #8032 - search history loses entries when re-using queries - searchHistory.remove(s); - searchHistory.addFirst(new SearchSetting(s)); + SEARCH_HISTORY.remove(s); + SEARCH_HISTORY.addFirst(new SearchSetting(s)); } int maxsize = Main.pref.getInteger("search.history-size", DEFAULT_SEARCH_HISTORY_SIZE); - while (searchHistory.size() > maxsize) { - searchHistory.removeLast(); - } - Set savedHistory = new LinkedHashSet<>(searchHistory.size()); - for (SearchSetting item: searchHistory) { + while (SEARCH_HISTORY.size() > maxsize) { + SEARCH_HISTORY.removeLast(); + } + Set savedHistory = new LinkedHashSet<>(SEARCH_HISTORY.size()); + for (SearchSetting item: SEARCH_HISTORY) { savedHistory.add(item.writeToString()); } Index: trunk/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java =================================================================== --- trunk/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java (revision 12537) @@ -36,5 +36,5 @@ * Tags that imply a semantic meaning from the way direction and cannot be changed. */ - private static final TagCollection directionalTags = new TagCollection(Arrays.asList( + private static final TagCollection DIRECTIONAL_TAGS = new TagCollection(Arrays.asList( new Tag("natural", "coastline"), new Tag("natural", "cliff"), @@ -54,5 +54,5 @@ for (Map.Entry entry : way.getKeys().entrySet()) { final Tag tag = new Tag(entry.getKey(), entry.getValue()); - final boolean isDirectional = directionalTags.contains(tag) || tag.isDirectionKey(); + final boolean isDirectional = DIRECTIONAL_TAGS.contains(tag) || tag.isDirectionKey(); if (isDirectional) { final boolean cannotBeCorrected = ReverseWayTagCorrector.getTagCorrections(tag).isEmpty(); Index: trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java =================================================================== --- trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (revision 12537) @@ -53,14 +53,14 @@ } - private static final Collection ignoredKeys = new ArrayList<>(); + private static final Collection IGNORED_KEYS = new ArrayList<>(); static { for (String s : OsmPrimitive.getUninterestingKeys()) { - ignoredKeys.add(getPatternFor(s)); + IGNORED_KEYS.add(getPatternFor(s)); } for (String s : new String[]{"name", "ref", "tiger:county"}) { - ignoredKeys.add(getPatternFor(s, false)); + IGNORED_KEYS.add(getPatternFor(s, false)); } for (String s : new String[]{"tiger:county", "turn:lanes", "change:lanes", "placement"}) { - ignoredKeys.add(getPatternFor(s, true)); + IGNORED_KEYS.add(getPatternFor(s, true)); } } @@ -292,5 +292,5 @@ private static boolean ignoreKeyForCorrection(String key) { - for (Pattern ignoredKey : ignoredKeys) { + for (Pattern ignoredKey : IGNORED_KEYS) { if (ignoredKey.matcher(key).matches()) { return true; Index: trunk/src/org/openstreetmap/josm/data/Preferences.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 12537) @@ -1457,9 +1457,9 @@ throw new IllegalArgumentException(ex); } - for (Entry key_value : hash.entrySet()) { + for (Entry keyValue : hash.entrySet()) { Object value; Field f; try { - f = klass.getDeclaredField(key_value.getKey().replace('-', '_')); + f = klass.getDeclaredField(keyValue.getKey().replace('-', '_')); } catch (NoSuchFieldException ex) { Main.trace(ex); @@ -1471,8 +1471,8 @@ Utils.setObjectsAccessible(f); if (f.getType() == Boolean.class || f.getType() == boolean.class) { - value = Boolean.valueOf(key_value.getValue()); + value = Boolean.valueOf(keyValue.getValue()); } else if (f.getType() == Integer.class || f.getType() == int.class) { try { - value = Integer.valueOf(key_value.getValue()); + value = Integer.valueOf(keyValue.getValue()); } catch (NumberFormatException nfe) { continue; @@ -1480,14 +1480,14 @@ } else if (f.getType() == Double.class || f.getType() == double.class) { try { - value = Double.valueOf(key_value.getValue()); + value = Double.valueOf(keyValue.getValue()); } catch (NumberFormatException nfe) { continue; } } else if (f.getType() == String.class) { - value = key_value.getValue(); + value = keyValue.getValue(); } else if (f.getType().isAssignableFrom(Map.class)) { - value = mapFromJson(key_value.getValue()); + value = mapFromJson(keyValue.getValue()); } else if (f.getType().isAssignableFrom(MultiMap.class)) { - value = multiMapFromJson(key_value.getValue()); + value = multiMapFromJson(keyValue.getValue()); } else throw new JosmRuntimeException("unsupported preference primitive type"); Index: trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java (revision 12537) @@ -80,5 +80,5 @@ } - private static final CopyOnWriteArrayList somChangeListeners = new CopyOnWriteArrayList<>(); + private static final CopyOnWriteArrayList SOM_CHANGE_LISTENERS = new CopyOnWriteArrayList<>(); /** @@ -89,5 +89,5 @@ */ public static void removeSoMChangeListener(SoMChangeListener listener) { - somChangeListeners.remove(listener); + SOM_CHANGE_LISTENERS.remove(listener); } @@ -100,10 +100,10 @@ public static void addSoMChangeListener(SoMChangeListener listener) { if (listener != null) { - somChangeListeners.addIfAbsent(listener); + SOM_CHANGE_LISTENERS.addIfAbsent(listener); } } protected static void fireSoMChanged(String oldSoM, String newSoM) { - for (SoMChangeListener l : somChangeListeners) { + for (SoMChangeListener l : SOM_CHANGE_LISTENERS) { l.systemOfMeasurementChanged(oldSoM, newSoM); } Index: trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java (revision 12537) @@ -48,5 +48,5 @@ public static final BooleanProperty USE_BLOCK_CACHE = new BooleanProperty(PREFERENCE_PREFIX + ".use_block_cache", true); - private static final AuxiliaryCacheFactory diskCacheFactory = + private static final AuxiliaryCacheFactory DISK_CACHE_FACTORY = USE_BLOCK_CACHE.get() ? new BlockDiskCacheFactory() : new IndexedDiskCacheFactory(); private static FileLock cacheDirLock; @@ -177,6 +177,6 @@ try { if (cc.getAuxCaches().length == 0) { - AuxiliaryCache diskCache = diskCacheFactory.createCache(diskAttributes, cacheManager, null, new StandardSerializer()); - cc.setAuxCaches(new AuxiliaryCache[]{diskCache}); + cc.setAuxCaches(new AuxiliaryCache[]{DISK_CACHE_FACTORY.createCache( + diskAttributes, cacheManager, null, new StandardSerializer())}); } } catch (IOException e) { Index: trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (revision 12537) @@ -81,6 +81,6 @@ - private static final ConcurrentMap> inProgress = new ConcurrentHashMap<>(); - private static final ConcurrentMap useHead = new ConcurrentHashMap<>(); + private static final ConcurrentMap> IN_PROGRESS = new ConcurrentHashMap<>(); + private static final ConcurrentMap USE_HEAD = new ConcurrentHashMap<>(); protected final long now; // when the job started @@ -162,9 +162,9 @@ throw new IllegalArgumentException("No url returned"); } - synchronized (inProgress) { - Set newListeners = inProgress.get(deduplicationKey); + synchronized (IN_PROGRESS) { + Set newListeners = IN_PROGRESS.get(deduplicationKey); if (newListeners == null) { newListeners = new HashSet<>(); - inProgress.put(deduplicationKey, newListeners); + IN_PROGRESS.put(deduplicationKey, newListeners); first = true; } @@ -259,7 +259,7 @@ private void finishLoading(LoadResult result) { Set listeners; - synchronized (inProgress) { + synchronized (IN_PROGRESS) { try { - listeners = inProgress.remove(getUrl().toString()); + listeners = IN_PROGRESS.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(useHead.get(getServerKey())) && + Boolean.TRUE.equals(USE_HEAD.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); - useHead.put(serverKey, Boolean.TRUE); + USE_HEAD.put(serverKey, Boolean.TRUE); } Index: trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java (revision 12537) @@ -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> inProgress = new ConcurrentHashMap<>(); + private static final ConcurrentMap> IN_PROGRESS = new ConcurrentHashMap<>(); /** @@ -71,9 +71,9 @@ if (listener != null) { String deduplicationKey = getCacheKey(); - synchronized (inProgress) { - Set newListeners = inProgress.get(deduplicationKey); + synchronized (IN_PROGRESS) { + Set newListeners = IN_PROGRESS.get(deduplicationKey); if (newListeners == null) { newListeners = new HashSet<>(); - inProgress.put(deduplicationKey, newListeners); + IN_PROGRESS.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 (inProgress) { - listeners = inProgress.remove(getCacheKey()); + synchronized (IN_PROGRESS) { + listeners = IN_PROGRESS.remove(getCacheKey()); } boolean status = result.equals(LoadResult.SUCCESS); Index: trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java (revision 12537) @@ -45,5 +45,5 @@ // CHECKSTYLE.ON: SingleSpaceSeparator - private static final NumberFormat latLonFormat = new DecimalFormat("###0.0000000", new DecimalFormatSymbols(Locale.US)); + private static final NumberFormat LATLON_FORMAT = new DecimalFormat("###0.0000000", new DecimalFormatSymbols(Locale.US)); private static final Pattern[] ALL_PATTERNS = { @@ -111,7 +111,9 @@ String bbox; if (switchLatLon) { - bbox = String.format("%s,%s,%s,%s", latLonFormat.format(s), latLonFormat.format(w), latLonFormat.format(n), latLonFormat.format(e)); + bbox = String.format("%s,%s,%s,%s", + LATLON_FORMAT.format(s), LATLON_FORMAT.format(w), LATLON_FORMAT.format(n), LATLON_FORMAT.format(e)); } else { - bbox = String.format("%s,%s,%s,%s", latLonFormat.format(w), latLonFormat.format(s), latLonFormat.format(e), latLonFormat.format(n)); + bbox = String.format("%s,%s,%s,%s", + LATLON_FORMAT.format(w), LATLON_FORMAT.format(s), LATLON_FORMAT.format(e), LATLON_FORMAT.format(n)); } @@ -132,14 +134,14 @@ break; case "w": - replacement = latLonFormat.format(w); + replacement = LATLON_FORMAT.format(w); break; case "s": - replacement = latLonFormat.format(s); + replacement = LATLON_FORMAT.format(s); break; case "e": - replacement = latLonFormat.format(e); + replacement = LATLON_FORMAT.format(e); break; case "n": - replacement = latLonFormat.format(n); + replacement = LATLON_FORMAT.format(n); break; case "width": Index: trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java (revision 12537) @@ -37,5 +37,5 @@ public final class ChangesetCache implements PreferenceChangedListener { /** the unique instance */ - private static final ChangesetCache instance = new ChangesetCache(); + private static final ChangesetCache INSTANCE = new ChangesetCache(); /** the cached changesets */ @@ -56,5 +56,5 @@ */ public static ChangesetCache getInstance() { - return instance; + return INSTANCE; } Index: trunk/src/org/openstreetmap/josm/data/osm/DataSet.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (revision 12537) @@ -638,5 +638,5 @@ * dataset. (However, the selection does only change in the active layer) */ - private static final Collection selListeners = new CopyOnWriteArrayList<>(); + private static final Collection SEL_LISTENERS = new CopyOnWriteArrayList<>(); /** @@ -647,5 +647,5 @@ */ public static void addSelectionListener(SelectionChangedListener listener) { - ((CopyOnWriteArrayList) selListeners).addIfAbsent(listener); + ((CopyOnWriteArrayList) SEL_LISTENERS).addIfAbsent(listener); } @@ -657,5 +657,5 @@ */ public static void removeSelectionListener(SelectionChangedListener listener) { - selListeners.remove(listener); + SEL_LISTENERS.remove(listener); } @@ -671,5 +671,5 @@ private static void fireDreprecatedSelectionChange(Collection currentSelection) { - for (SelectionChangedListener l : selListeners) { + for (SelectionChangedListener l : SEL_LISTENERS) { l.selectionChanged(currentSelection); } Index: trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (revision 12537) @@ -23,5 +23,5 @@ */ public class QuadBuckets implements Collection { - private static final boolean consistency_testing = false; + private static final boolean CONSISTENCY_TESTING = false; private static final byte NW_INDEX = 1; private static final byte NE_INDEX = 3; @@ -271,5 +271,5 @@ void doAdd(T o) { - if (consistency_testing) { + if (CONSISTENCY_TESTING) { if (o instanceof Node && !matches(o, this)) { o.getBBox().getIndex(level); Index: trunk/src/org/openstreetmap/josm/data/osm/User.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/User.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/data/osm/User.java (revision 12537) @@ -34,5 +34,5 @@ * @see #getAnonymous() */ - private static final User anonymous = createLocalUser(tr("")); + private static final User ANONYMOUS = createLocalUser(tr("")); private static long getNextLocalUid() { @@ -131,5 +131,5 @@ */ public static User getAnonymous() { - return anonymous; + return ANONYMOUS; } Index: trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java (revision 12537) @@ -29,5 +29,5 @@ public class DatasetEventManager implements ActiveLayerChangeListener, Listener { - private static final DatasetEventManager instance = new DatasetEventManager(); + private static final DatasetEventManager INSTANCE = new DatasetEventManager(); private final class EdtRunnable implements Runnable { @@ -139,5 +139,5 @@ */ public static DatasetEventManager getInstance() { - return instance; + return INSTANCE; } Index: trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java (revision 12537) @@ -32,5 +32,5 @@ public class SelectionEventManager implements DataSelectionListener, ActiveLayerChangeListener { - private static final SelectionEventManager instance = new SelectionEventManager(); + private static final SelectionEventManager INSTANCE = new SelectionEventManager(); /** @@ -39,5 +39,5 @@ */ public static SelectionEventManager getInstance() { - return instance; + return INSTANCE; } Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java (revision 12537) @@ -93,5 +93,5 @@ private static volatile Color backgroundColorCache; - private static final MapPaintSylesUpdateListener styleOverrideListener = new MapPaintSylesUpdateListener() { + private static final MapPaintSylesUpdateListener STYLE_OVERRIDE_LISTENER = new MapPaintSylesUpdateListener() { //TODO: Listen to wireframe map mode changes. @Override @@ -107,5 +107,5 @@ static { - MapPaintStyles.addMapPaintSylesUpdateListener(styleOverrideListener); + MapPaintStyles.addMapPaintSylesUpdateListener(STYLE_OVERRIDE_LISTENER); } Index: trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java (revision 12537) @@ -79,11 +79,11 @@ private static double griddetail; - private static final Collection ignoredErrors = new TreeSet<>(); + private static final Collection IGNORED_ERRORS = new TreeSet<>(); /** * All registered tests */ - private static final Collection> allTests = new ArrayList<>(); - private static final Map allTestsMap = new HashMap<>(); + private static final Collection> ALL_TESTS = new ArrayList<>(); + private static final Map ALL_TESTS_MAP = new HashMap<>(); /** @@ -139,7 +139,7 @@ */ public static void addTest(Class testClass) { - allTests.add(testClass); + ALL_TESTS.add(testClass); try { - allTestsMap.put(testClass.getName(), testClass.getConstructor().newInstance()); + ALL_TESTS_MAP.put(testClass.getName(), testClass.getConstructor().newInstance()); } catch (ReflectiveOperationException e) { Main.error(e); @@ -182,10 +182,10 @@ private static void loadIgnoredErrors() { - ignoredErrors.clear(); + IGNORED_ERRORS.clear(); if (ValidatorPreference.PREF_USE_IGNORE.get()) { Path path = Paths.get(getValidatorDir()).resolve("ignorederrors"); if (path.toFile().exists()) { try { - ignoredErrors.addAll(Files.readAllLines(path, StandardCharsets.UTF_8)); + IGNORED_ERRORS.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) { - ignoredErrors.add(s); + IGNORED_ERRORS.add(s); } @@ -213,5 +213,5 @@ */ public static boolean hasIgnoredError(String s) { - return ignoredErrors.contains(s); + return IGNORED_ERRORS.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 : ignoredErrors) { + for (String e : IGNORED_ERRORS) { out.println(e); } @@ -254,7 +254,7 @@ */ public static SortedMap getAllTestsMap() { - applyPrefs(allTestsMap, false); - applyPrefs(allTestsMap, true); - return new TreeMap<>(allTestsMap); + applyPrefs(ALL_TESTS_MAP, false); + applyPrefs(ALL_TESTS_MAP, true); + return new TreeMap<>(ALL_TESTS_MAP); } @@ -271,5 +271,5 @@ return null; } - return (T) allTestsMap.get(testClass.getName()); + return (T) ALL_TESTS_MAP.get(testClass.getName()); } @@ -318,5 +318,5 @@ */ public static Collection> getAllAvailableTestClasses() { - return Collections.unmodifiableCollection(allTests); + return Collections.unmodifiableCollection(ALL_TESTS); } Index: trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 12537) @@ -53,5 +53,5 @@ private static DefaultNameFormatter instance; - private static final List formatHooks = new LinkedList<>(); + private static final List FORMAT_HOOKS = new LinkedList<>(); /** @@ -75,6 +75,6 @@ public static void registerFormatHook(NameFormatterHook hook) { if (hook == null) return; - if (!formatHooks.contains(hook)) { - formatHooks.add(0, hook); + if (!FORMAT_HOOKS.contains(hook)) { + FORMAT_HOOKS.add(0, hook); } } @@ -87,6 +87,6 @@ public static void unregisterFormatHook(NameFormatterHook hook) { if (hook == null) return; - if (formatHooks.contains(hook)) { - formatHooks.remove(hook); + if (FORMAT_HOOKS.contains(hook)) { + FORMAT_HOOKS.remove(hook); } } @@ -203,5 +203,5 @@ String result = name.toString(); - for (NameFormatterHook hook: formatHooks) { + for (NameFormatterHook hook: FORMAT_HOOKS) { String hookResult = hook.checkFormat(node, result); if (hookResult != null) @@ -295,5 +295,5 @@ String result = name.toString(); - for (NameFormatterHook hook: formatHooks) { + for (NameFormatterHook hook: FORMAT_HOOKS) { String hookResult = hook.checkFormat(way, result); if (hookResult != null) @@ -333,5 +333,5 @@ String result = name.toString(); - for (NameFormatterHook hook: formatHooks) { + for (NameFormatterHook hook: FORMAT_HOOKS) { String hookResult = hook.checkFormat(relation, result); if (hookResult != null) @@ -430,5 +430,5 @@ } - for (NameFormatterHook hook: formatHooks) { + for (NameFormatterHook hook: FORMAT_HOOKS) { String hookResult = hook.checkRelationTypeName(relation, name); if (hookResult != null) Index: trunk/src/org/openstreetmap/josm/gui/MapSlider.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MapSlider.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/gui/MapSlider.java (revision 12537) @@ -20,5 +20,5 @@ class MapSlider extends JSlider implements PropertyChangeListener, ChangeListener, Helpful { - private static final double zoomStep = 1.1; + private static final double ZOOM_STEP = 1.1; private final MapView mv; private boolean preventChange; @@ -40,5 +40,5 @@ public void propertyChange(PropertyChangeEvent evt) { double maxScale = this.mv.getMaxScale(); - int zoom = (int) Math.round(Math.log(maxScale/mv.getScale())/Math.log(zoomStep)); + int zoom = (int) Math.round(Math.log(maxScale/mv.getScale())/Math.log(ZOOM_STEP)); preventChange = true; setValue(zoom); @@ -59,5 +59,5 @@ } else { double maxScale = this.mv.getMaxScale(); - double scale = maxScale/Math.pow(zoomStep, getValue()); + double scale = maxScale/Math.pow(ZOOM_STEP, getValue()); double snapped = mv.scaleFloor(scale); mv.zoomTo(this.mv.getCenter(), snapped); Index: trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java (revision 12537) @@ -31,5 +31,5 @@ /** A Timer for smoothly moving the map area */ - private static final Timer timer = new Timer(true); + private static final Timer TIMER = new Timer(true); /** Does the moving */ @@ -229,5 +229,5 @@ scheduled = newMoveTaskState; if (newMoveTaskState) { - timer.schedule(this, 0, timerInterval); + TIMER.schedule(this, 0, timerInterval); } else { // We have to create a new instance because rescheduling a Index: trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/TextTagPaster.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/TextTagPaster.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/TextTagPaster.java (revision 12537) @@ -20,5 +20,5 @@ */ public final class TextTagPaster extends AbstractTagPaster { - private static final String help = ht("/Action/PasteTags"); + private static final String HELP = ht("/Action/PasteTags"); /** @@ -47,5 +47,5 @@ Map tags = getTagsImpl(support); if (tags.isEmpty()) { - TextTagParser.showBadBufferMessage(help); + TextTagParser.showBadBufferMessage(HELP); throw new IOException("Invalid tags to paste."); } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java (revision 12537) @@ -17,9 +17,9 @@ public class MemberTableLinkedCellRenderer extends MemberTableCellRenderer { - private static final Image arrowUp = ImageProvider.get("dialogs/relation", "arrowup").getImage(); - private static final Image arrowDown = ImageProvider.get("dialogs/relation", "arrowdown").getImage(); - private static final Image corners = ImageProvider.get("dialogs/relation", "roundedcorners").getImage(); - private static final Image roundabout_right = ImageProvider.get("dialogs/relation", "roundabout_right_tiny").getImage(); - private static final Image roundabout_left = ImageProvider.get("dialogs/relation", "roundabout_left_tiny").getImage(); + private static final Image ARROW_UP = ImageProvider.get("dialogs/relation", "arrowup").getImage(); + private static final Image ARROW_DOWN = ImageProvider.get("dialogs/relation", "arrowdown").getImage(); + private static final Image CORNERS = ImageProvider.get("dialogs/relation", "roundedcorners").getImage(); + private static final Image ROUNDABOUT_RIGHT = ImageProvider.get("dialogs/relation", "roundabout_right_tiny").getImage(); + private static final Image ROUNDABOUT_LEFT = ImageProvider.get("dialogs/relation", "roundabout_left_tiny").getImage(); private transient WayConnectionType value = new WayConnectionType(); @@ -75,6 +75,6 @@ g.setColor(Color.black); y1 = 5; - g.drawImage(corners, xoff, y1-3, xoff+3, y1, 0, 0, 3, 3, new Color(0, 0, 0, 0), null); - g.drawImage(corners, xoff+xloop-2, y1-3, xoff+xloop+1, y1, 2, 0, 5, 3, new Color(0, 0, 0, 0), null); + g.drawImage(CORNERS, xoff, y1-3, xoff+3, y1, 0, 0, 3, 3, new Color(0, 0, 0, 0), null); + g.drawImage(CORNERS, xoff+xloop-2, y1-3, xoff+xloop+1, y1, 2, 0, 5, 3, new Color(0, 0, 0, 0), null); g.drawLine(xoff+3, y1-3, xoff+xloop-3, y1-3); } else { @@ -103,5 +103,5 @@ g.fillRect(xoff-1, y2+2, 3, 3); g.drawLine(xoff, y2, xoff, y2+2); - g.drawImage(corners, xoff+xloop-2, y2+1, xoff+xloop+1, y2+4, 2, 2, 5, 5, new Color(0, 0, 0, 0), null); + g.drawImage(CORNERS, xoff+xloop-2, y2+1, xoff+xloop+1, y2+4, 2, 2, 5, 5, new Color(0, 0, 0, 0), null); g.drawLine(xoff+3-1, y2+3, xoff+xloop-3, y2+3); } else { @@ -160,8 +160,8 @@ switch (value.direction) { case FORWARD: - arrow = arrowDown; + arrow = ARROW_DOWN; break; case BACKWARD: - arrow = arrowUp; + arrow = ARROW_UP; break; default: @@ -169,7 +169,7 @@ } if (value.direction == Direction.ROUNDABOUT_LEFT) { - g.drawImage(roundabout_left, xoff-6, 1, null); + g.drawImage(ROUNDABOUT_LEFT, xoff-6, 1, null); } else if (value.direction == Direction.ROUNDABOUT_RIGHT) { - g.drawImage(roundabout_right, xoff-6, 1, null); + g.drawImage(ROUNDABOUT_RIGHT, xoff-6, 1, null); } @@ -180,8 +180,8 @@ if (value.isOnewayLoopBackwardPart && value.isOnewayLoopForwardPart) { - if (arrow == arrowDown) { - arrow = arrowUp; - } else if (arrow == arrowUp) { - arrow = arrowDown; + if (arrow == ARROW_DOWN) { + arrow = ARROW_UP; + } else if (arrow == ARROW_UP) { + arrow = ARROW_DOWN; } } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java (revision 12537) @@ -3,4 +3,5 @@ import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -26,11 +27,10 @@ } - private static final Collection additionalSorters = new ArrayList<>(); - static { + private static final Collection ADDITIONAL_SORTERS = Arrays.asList( // first adequate sorter is used, so order matters - additionalSorters.add(new AssociatedStreetRoleStreetSorter()); - additionalSorters.add(new AssociatedStreetRoleAddressHouseSorter()); - additionalSorters.add(new PublicTransportRoleStopPlatformSorter()); - } + new AssociatedStreetRoleStreetSorter(), + new AssociatedStreetRoleAddressHouseSorter(), + new PublicTransportRoleStopPlatformSorter() + ); /** @@ -144,5 +144,5 @@ for (RelationMember m : relationMembers) { boolean wasAdded = false; - for (AdditionalSorter sorter : additionalSorters) { + for (AdditionalSorter sorter : ADDITIONAL_SORTERS) { if (sorter.acceptsMember(m)) { List list; Index: trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 12537) @@ -77,5 +77,5 @@ private final transient HelpContentReader reader; - private static final JosmAction focusAction = new JosmAction(tr("JOSM Help Browser"), "help", "", null, false, false) { + private static final JosmAction FOCUS_ACTION = new JosmAction(tr("JOSM Help Browser"), "help", "", null, false, false) { @Override public void actionPerformed(ActionEvent e) { @@ -221,5 +221,5 @@ } if (windowMenuItem == null && visible) { - windowMenuItem = MainMenu.add(Main.main.menu.windowMenu, focusAction, MainMenu.WINDOW_MENU_GROUP.VOLATILE); + windowMenuItem = MainMenu.add(Main.main.menu.windowMenu, FOCUS_ACTION, MainMenu.WINDOW_MENU_GROUP.VOLATILE); } } Index: trunk/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java (revision 12537) @@ -38,5 +38,5 @@ */ class LayerNameAndFilePathTableCell extends JPanel implements TableCellRenderer, TableCellEditor { - private static final Color colorError = new Color(255, 197, 197); + private static final Color COLOR_ERROR = new Color(255, 197, 197); private static final String ELLIPSIS = '…' + File.separator; @@ -46,5 +46,5 @@ private final JButton btnFileChooser = new JButton(new LaunchFileChooserAction()); - private static final GBC defaultCellStyle = GBC.eol().fill(GBC.HORIZONTAL).insets(2, 0, 2, 0); + private static final GBC DEFAULT_CELL_STYLE = GBC.eol().fill(GBC.HORIZONTAL).insets(2, 0, 2, 0); private final transient CellEditorSupport cellEditorSupport = new CellEditorSupport(this); @@ -137,5 +137,5 @@ lblLayerName.setIcon(info.getLayer().getIcon()); lblLayerName.setText(info.getName()); - add(lblLayerName, defaultCellStyle); + add(lblLayerName, DEFAULT_CELL_STYLE); return tr("The bold text is the name of the layer."); } @@ -164,8 +164,8 @@ } - lblFilename.setBackground(error ? colorError : getBackground()); - btnFileChooser.setBackground(error ? colorError : getBackground()); - - add(lblFilename, defaultCellStyle); + lblFilename.setBackground(error ? COLOR_ERROR : getBackground()); + btnFileChooser.setBackground(error ? COLOR_ERROR : getBackground()); + + add(lblFilename, DEFAULT_CELL_STYLE); return tr("Click cell to change the file path.") + "
" + tooltip; } Index: trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java (revision 12537) @@ -27,5 +27,5 @@ private final JLabel needsUpload = new JLabel(tr("should be uploaded")); private final JLabel needsSave = new JLabel(tr("should be saved")); - private static final GBC defaultCellStyle = GBC.eol().fill(GBC.HORIZONTAL).insets(2, 0, 2, 0); + private static final GBC DEFAULT_CELL_STYLE = GBC.eol().fill(GBC.HORIZONTAL).insets(2, 0, 2, 0); /** @@ -48,10 +48,10 @@ String htmlInfoName = Utils.escapeReservedCharactersHTML(info.getName()); if (info.getLayer().requiresUploadToServer() && !info.getLayer().isUploadDiscouraged()) { - panel.add(needsUpload, defaultCellStyle); + panel.add(needsUpload, DEFAULT_CELL_STYLE); sb.append(tr("Layer ''{0}'' has modifications which should be uploaded to the server.", htmlInfoName)); } else { if (info.isUploadable()) { - panel.add(pnlEmpty, defaultCellStyle); + panel.add(pnlEmpty, DEFAULT_CELL_STYLE); } if (info.getLayer().requiresUploadToServer()) { @@ -64,10 +64,10 @@ if (info.getLayer().requiresSaveToFile()) { - panel.add(needsSave, defaultCellStyle); + panel.add(needsSave, DEFAULT_CELL_STYLE); sb.append(tr("Layer ''{0}'' has modifications which should be saved to its associated file ''{1}''.", htmlInfoName, info.getFile().toString())); } else { if (info.isSavable()) { - panel.add(pnlEmpty, defaultCellStyle); + panel.add(pnlEmpty, DEFAULT_CELL_STYLE); } sb.append(tr("Layer ''{0}'' has no modifications to be saved.", htmlInfoName)); Index: trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 12537) @@ -75,5 +75,5 @@ /** list of custom components that can be added by plugins at JOSM startup */ - private static final Collection customComponents = new ArrayList<>(); + private static final Collection CUSTOM_COMPONENTS = new ArrayList<>(); /** the "created_by" changeset OSM key */ @@ -136,5 +136,5 @@ // Custom components - for (Component c : customComponents) { + for (Component c : CUSTOM_COMPONENTS) { pnl.add(c, GBC.eol().fill(GBC.HORIZONTAL)); } @@ -406,5 +406,5 @@ public static boolean addCustomComponent(Component c) { if (c != null) { - return customComponents.add(c); + return CUSTOM_COMPONENTS.add(c); } return false; Index: trunk/src/org/openstreetmap/josm/gui/layer/imagery/SharpenImageProcessor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/imagery/SharpenImageProcessor.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/gui/layer/imagery/SharpenImageProcessor.java (revision 12537) @@ -22,5 +22,5 @@ private ConvolveOp op; - private static float[] KERNEL_IDENTITY = new float[] { + private static final float[] KERNEL_IDENTITY = new float[] { 0, 0, 0, 0, 1, 0, @@ -28,5 +28,5 @@ }; - private static float[] KERNEL_BLUR = new float[] { + private static final float[] KERNEL_BLUR = new float[] { 1f / 16, 2f / 16, 1f / 16, 2f / 16, 4f / 16, 2f / 16, @@ -34,5 +34,5 @@ }; - private static float[] KERNEL_SHARPEN = new float[] { + private static final float[] KERNEL_SHARPEN = new float[] { -.5f, -1f, -.5f, -1f, 7, -1f, Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 12537) @@ -251,6 +251,6 @@ // all created tabs private final transient List tabs = new ArrayList<>(); - private static final Collection settingsFactories = new LinkedList<>(); - private static final PreferenceSettingFactory advancedPreferenceFactory = new AdvancedPreference.Factory(); + private static final Collection SETTINGS_FACTORIES = new LinkedList<>(); + private static final PreferenceSettingFactory ADVANCED_PREFERENCE_FACTORY = new AdvancedPreference.Factory(); private final transient List settings = new ArrayList<>(); @@ -439,7 +439,7 @@ public void buildGui() { - Collection factories = new ArrayList<>(settingsFactories); + Collection factories = new ArrayList<>(SETTINGS_FACTORIES); factories.addAll(PluginHandler.getPreferenceSetting()); - factories.add(advancedPreferenceFactory); + factories.add(ADVANCED_PREFERENCE_FACTORY); for (PreferenceSettingFactory factory : factories) { @@ -531,27 +531,27 @@ static { // order is important! - settingsFactories.add(new DisplayPreference.Factory()); - settingsFactories.add(new DrawingPreference.Factory()); - settingsFactories.add(new ColorPreference.Factory()); - settingsFactories.add(new LafPreference.Factory()); - settingsFactories.add(new LanguagePreference.Factory()); - settingsFactories.add(new ServerAccessPreference.Factory()); - settingsFactories.add(new AuthenticationPreference.Factory()); - settingsFactories.add(new ProxyPreference.Factory()); - settingsFactories.add(new OverpassServerPreference.Factory()); - settingsFactories.add(new MapPreference.Factory()); - settingsFactories.add(new ProjectionPreference.Factory()); - settingsFactories.add(new MapPaintPreference.Factory()); - settingsFactories.add(new TaggingPresetPreference.Factory()); - settingsFactories.add(new BackupPreference.Factory()); - settingsFactories.add(new PluginPreference.Factory()); - settingsFactories.add(Main.toolbar); - settingsFactories.add(new AudioPreference.Factory()); - settingsFactories.add(new ShortcutPreference.Factory()); - settingsFactories.add(new ValidatorPreference.Factory()); - settingsFactories.add(new ValidatorTestsPreference.Factory()); - settingsFactories.add(new ValidatorTagCheckerRulesPreference.Factory()); - settingsFactories.add(new RemoteControlPreference.Factory()); - settingsFactories.add(new ImageryPreference.Factory()); + SETTINGS_FACTORIES.add(new DisplayPreference.Factory()); + SETTINGS_FACTORIES.add(new DrawingPreference.Factory()); + SETTINGS_FACTORIES.add(new ColorPreference.Factory()); + SETTINGS_FACTORIES.add(new LafPreference.Factory()); + SETTINGS_FACTORIES.add(new LanguagePreference.Factory()); + SETTINGS_FACTORIES.add(new ServerAccessPreference.Factory()); + SETTINGS_FACTORIES.add(new AuthenticationPreference.Factory()); + SETTINGS_FACTORIES.add(new ProxyPreference.Factory()); + SETTINGS_FACTORIES.add(new OverpassServerPreference.Factory()); + SETTINGS_FACTORIES.add(new MapPreference.Factory()); + SETTINGS_FACTORIES.add(new ProjectionPreference.Factory()); + SETTINGS_FACTORIES.add(new MapPaintPreference.Factory()); + SETTINGS_FACTORIES.add(new TaggingPresetPreference.Factory()); + SETTINGS_FACTORIES.add(new BackupPreference.Factory()); + SETTINGS_FACTORIES.add(new PluginPreference.Factory()); + SETTINGS_FACTORIES.add(Main.toolbar); + SETTINGS_FACTORIES.add(new AudioPreference.Factory()); + SETTINGS_FACTORIES.add(new ShortcutPreference.Factory()); + SETTINGS_FACTORIES.add(new ValidatorPreference.Factory()); + SETTINGS_FACTORIES.add(new ValidatorTestsPreference.Factory()); + SETTINGS_FACTORIES.add(new ValidatorTagCheckerRulesPreference.Factory()); + SETTINGS_FACTORIES.add(new RemoteControlPreference.Factory()); + SETTINGS_FACTORIES.add(new ImageryPreference.Factory()); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java (revision 12537) @@ -22,5 +22,5 @@ public class LambertProjectionChoice extends ListProjectionChoice { - private static final String[] lambert4zones = { + private static final String[] LAMBERT_4_ZONES = { tr("{0} ({1} to {2} degrees)", 1, "51.30", "48.15"), tr("{0} ({1} to {2} degrees)", 2, "48.15", "45.45"), @@ -33,5 +33,5 @@ */ public LambertProjectionChoice() { - super(tr("Lambert 4 Zones (France)"), /* NO-ICON */ "core:lambert", lambert4zones, tr("Lambert CC Zone")); + super(tr("Lambert 4 Zones (France)"), /* NO-ICON */ "core:lambert", LAMBERT_4_ZONES, tr("Lambert CC Zone")); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java (revision 12537) @@ -16,17 +16,17 @@ public class UTMFranceDOMProjectionChoice extends ListProjectionChoice { - private static final String FortMarigotName = tr("Guadeloupe Fort-Marigot 1949"); - private static final String SainteAnneName = tr("Guadeloupe Ste-Anne 1948"); - private static final String MartiniqueName = tr("Martinique Fort Desaix 1952"); - private static final String Reunion92Name = tr("Reunion RGR92"); - private static final String Guyane92Name = tr("Guyane RGFG95"); - private static final String[] utmGeodesicsNames = {FortMarigotName, SainteAnneName, MartiniqueName, Reunion92Name, Guyane92Name}; + private static final String FORT_MARIGOT_NAME = tr("Guadeloupe Fort-Marigot 1949"); + private static final String SAINTE_ANNE_NAME = tr("Guadeloupe Ste-Anne 1948"); + private static final String MARTINIQUE_NAME = tr("Martinique Fort Desaix 1952"); + private static final String REUNION_92_NAME = tr("Reunion RGR92"); + private static final String GUYANE_92_NAME = tr("Guyane RGFG95"); + private static final String[] UTM_GEODESIC_NAMES = {FORT_MARIGOT_NAME, SAINTE_ANNE_NAME, MARTINIQUE_NAME, REUNION_92_NAME, GUYANE_92_NAME}; - private static final Integer FortMarigotEPSG = 2969; - private static final Integer SainteAnneEPSG = 2970; - private static final Integer MartiniqueEPSG = 2973; - private static final Integer ReunionEPSG = 2975; - private static final Integer GuyaneEPSG = 2972; - private static final Integer[] utmEPSGs = {FortMarigotEPSG, SainteAnneEPSG, MartiniqueEPSG, ReunionEPSG, GuyaneEPSG }; + private static final Integer FORT_MARIGOT_EPSG = 2969; + private static final Integer SAINTE_ANNE_EPSG = 2970; + private static final Integer MARTINIQUE_EPSG = 2973; + private static final Integer REUNION_EPSG = 2975; + private static final Integer GUYANE_EPSG = 2972; + private static final Integer[] UTM_EPSGS = {FORT_MARIGOT_EPSG, SAINTE_ANNE_EPSG, MARTINIQUE_EPSG, REUNION_EPSG, GUYANE_EPSG }; /** @@ -34,5 +34,5 @@ */ public UTMFranceDOMProjectionChoice() { - super(tr("UTM France (DOM)"), /* NO-ICON */ "core:utmfrancedom", utmGeodesicsNames, tr("UTM Geodesic system")); + super(tr("UTM France (DOM)"), /* NO-ICON */ "core:utmfrancedom", UTM_GEODESIC_NAMES, tr("UTM Geodesic system")); } @@ -54,17 +54,17 @@ @Override public String getProjectionName() { - return utmGeodesicsNames[index]; + return UTM_GEODESIC_NAMES[index]; } @Override public String getCurrentCode() { - return "EPSG:" + utmEPSGs[index]; + return "EPSG:" + UTM_EPSGS[index]; } @Override public String[] allCodes() { - String[] res = new String[utmEPSGs.length]; - for (int i = 0; i < utmEPSGs.length; ++i) { - res[i] = "EPSG:" + utmEPSGs[i]; + String[] res = new String[UTM_EPSGS.length]; + for (int i = 0; i < UTM_EPSGS.length; ++i) { + res[i] = "EPSG:" + UTM_EPSGS[i]; } return res; @@ -73,6 +73,6 @@ @Override public Collection getPreferencesFromCode(String code) { - for (int i = 0; i < utmEPSGs.length; i++) { - if (("EPSG:" + utmEPSGs[i]).equals(code)) + for (int i = 0; i < UTM_EPSGS.length; i++) { + if (("EPSG:" + UTM_EPSGS[i]).equals(code)) return Collections.singleton(Integer.toString(i+1)); } Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java (revision 12537) @@ -31,5 +31,5 @@ /** The collection of tagging presets */ - private static final Collection taggingPresets = new ArrayList<>(); + private static final Collection TAGGING_PRESETS = 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() { - taggingPresets.clear(); - taggingPresets.addAll(TaggingPresetReader.readFromPreferences(false, false)); - cachePresets(taggingPresets); + TAGGING_PRESETS.clear(); + TAGGING_PRESETS.addAll(TaggingPresetReader.readFromPreferences(false, false)); + cachePresets(TAGGING_PRESETS); } @@ -59,14 +59,14 @@ public static void initialize() { readFromPreferences(); - for (TaggingPreset tp: taggingPresets) { + for (TaggingPreset tp: TAGGING_PRESETS) { if (!(tp instanceof TaggingPresetSeparator)) { Main.toolbar.register(tp); } } - if (taggingPresets.isEmpty()) { + if (TAGGING_PRESETS.isEmpty()) { Main.main.menu.presetsMenu.setVisible(false); } else { Map submenus = new HashMap<>(); - for (final TaggingPreset p : taggingPresets) { + for (final TaggingPreset p : TAGGING_PRESETS) { 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(taggingPresets); + return Collections.unmodifiableCollection(TAGGING_PRESETS); } @@ -199,6 +199,6 @@ */ public static void addTaggingPresets(Collection presets) { - if (presets != null && taggingPresets.addAll(presets)) { - for (TaggingPresetListener listener : listeners) { + if (presets != null && TAGGING_PRESETS.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/gui/util/FileFilterAllFiles.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/util/FileFilterAllFiles.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/gui/util/FileFilterAllFiles.java (revision 12537) @@ -14,5 +14,5 @@ public class FileFilterAllFiles extends FileFilter { - private static FileFilterAllFiles INSTANCE; + private static FileFilterAllFiles instance; /** @@ -21,8 +21,8 @@ */ public static synchronized FileFilterAllFiles getInstance() { - if (INSTANCE == null) { - INSTANCE = new FileFilterAllFiles(); + if (instance == null) { + instance = new FileFilterAllFiles(); } - return INSTANCE; + return instance; } Index: trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java (revision 12537) @@ -41,9 +41,9 @@ * We therefore read the property at class loading time and remember it's value. */ - private static boolean JVM_WILL_USE_SYSTEM_PROXIES; + private static boolean jvmWillUseSystemProxies; static { String v = System.getProperty("java.net.useSystemProxies"); if (v != null && v.equals(Boolean.TRUE.toString())) { - JVM_WILL_USE_SYSTEM_PROXIES = true; + jvmWillUseSystemProxies = true; } } @@ -59,5 +59,5 @@ */ public static boolean willJvmRetrieveSystemProxies() { - return JVM_WILL_USE_SYSTEM_PROXIES; + return jvmWillUseSystemProxies; } @@ -202,5 +202,5 @@ switch(proxyPolicy) { case USE_SYSTEM_SETTINGS: - if (!JVM_WILL_USE_SYSTEM_PROXIES) { + if (!jvmWillUseSystemProxies) { Main.warn(tr("The JVM is not configured to lookup proxies from the system settings. "+ "The property ''java.net.useSystemProxies'' was missing at startup time. Will not use a proxy.")); Index: trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java (revision 12537) @@ -45,5 +45,5 @@ private final OsmDataLayer layer; private final Projection projection; - private static final boolean skipEmptyNodes = true; + private static final boolean SKIP_EMPTY_NODES = true; /** @@ -165,5 +165,5 @@ if (p.isIncomplete()) { return; - } else if (skipEmptyNodes && p instanceof Node && p.getKeys().isEmpty()) { + } else if (SKIP_EMPTY_NODES && p instanceof Node && p.getKeys().isEmpty()) { return; } Index: trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java (revision 12537) @@ -99,5 +99,5 @@ static final Pattern OUTPUT_FORMAT_STATEMENT = Pattern.compile(".*\\[out:([a-z]{3,})\\].*", Pattern.DOTALL); - static final Map> outputFormatReaders = new ConcurrentHashMap<>(); + static final Map> OUTPUT_FORMAT_READERS = new ConcurrentHashMap<>(); final String overpassServer; @@ -125,5 +125,5 @@ public static final Class registerOverpassOutpoutFormatReader( OverpassOutpoutFormat format, Class readerClass) { - return outputFormatReaders.put(Objects.requireNonNull(format), Objects.requireNonNull(readerClass)); + return OUTPUT_FORMAT_READERS.put(Objects.requireNonNull(format), Objects.requireNonNull(readerClass)); } @@ -232,5 +232,5 @@ Matcher m = OUTPUT_FORMAT_STATEMENT.matcher(overpassQuery); if (m.matches()) { - Class readerClass = outputFormatReaders.get(OverpassOutpoutFormat.from(m.group(1))); + Class readerClass = OUTPUT_FORMAT_READERS.get(OverpassOutpoutFormat.from(m.group(1))); if (readerClass != null) { try { Index: trunk/src/org/openstreetmap/josm/io/XmlWriter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/XmlWriter.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/io/XmlWriter.java (revision 12537) @@ -62,5 +62,5 @@ String encS = null; if (!keepApos || unencoded.charAt(i) != '\'') { - encS = XmlWriter.encoding.get(unencoded.charAt(i)); + encS = ENCODING.get(unencoded.charAt(i)); } if (encS != null) { @@ -80,14 +80,14 @@ * The output writer to save the values to. */ - private static final Map encoding = new HashMap<>(); + private static final Map ENCODING = new HashMap<>(); static { - encoding.put('<', "<"); - encoding.put('>', ">"); - encoding.put('"', """); - encoding.put('\'', "'"); - encoding.put('&', "&"); - encoding.put('\n', " "); - encoding.put('\r', " "); - encoding.put('\t', " "); + ENCODING.put('<', "<"); + ENCODING.put('>', ">"); + ENCODING.put('"', """); + ENCODING.put('\'', "'"); + ENCODING.put('&', "&"); + ENCODING.put('\n', " "); + ENCODING.put('\r', " "); + ENCODING.put('\t', " "); } Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 12537) @@ -51,5 +51,5 @@ private final String sender; - private static final Set trustedSenders = new HashSet<>(); + private static final Set TRUSTED_SENDERS = 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() && !trustedSenders.contains(sender)) { + if (!sender.isEmpty() && !TRUSTED_SENDERS.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()) - trustedSenders.add(sender); + TRUSTED_SENDERS.add(sender); else - trustedSenders.remove(sender); + TRUSTED_SENDERS.remove(sender); } }); @@ -263,5 +263,5 @@ } if (buttonIndex == 2) { - trustedSenders.remove(sender); + TRUSTED_SENDERS.remove(sender); } setVisible(false); @@ -308,5 +308,5 @@ */ public static void addTags(String[][] keyValue, String sender, Collection primitives) { - if (trustedSenders.contains(sender)) { + if (TRUSTED_SENDERS.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 12536) +++ trunk/src/org/openstreetmap/josm/io/session/SessionReader.java (revision 12537) @@ -147,5 +147,5 @@ } - private static final Map> sessionLayerImporters = new HashMap<>(); + private static final Map> SESSION_LAYER_IMPORTERS = new HashMap<>(); private URI sessionFileURI; @@ -174,5 +174,5 @@ */ public static void registerSessionLayerImporter(String layerType, Class importer) { - sessionLayerImporters.put(layerType, importer); + SESSION_LAYER_IMPORTERS.put(layerType, importer); } @@ -183,5 +183,5 @@ */ public static SessionLayerImporter getSessionLayerImporter(String layerType) { - Class importerClass = sessionLayerImporters.get(layerType); + Class importerClass = SESSION_LAYER_IMPORTERS.get(layerType); if (importerClass == null) return null; Index: trunk/src/org/openstreetmap/josm/tools/I18n.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/I18n.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/tools/I18n.java (revision 12537) @@ -97,5 +97,5 @@ /* Localization keys for file chooser (and color chooser). */ - private static final String[] javaInternalMessageKeys = new String[] { + private static final String[] JAVA_INTERNAL_MESSAGE_KEYS = new String[] { /* JFileChooser windows laf */ "FileChooser.detailsViewActionLabelText", @@ -691,5 +691,5 @@ JFileChooser.setDefaultLocale(l); JColorChooser.setDefaultLocale(l); - for (String key : javaInternalMessageKeys) { + for (String key : JAVA_INTERNAL_MESSAGE_KEYS) { String us = UIManager.getString(key, Locale.US); String loc = UIManager.getString(key, l); Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java (revision 12536) +++ trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java (revision 12537) @@ -31,5 +31,5 @@ public class PlatformHookOsx implements PlatformHook, InvocationHandler { - private static final PlatformHookOsx ivhandler = new PlatformHookOsx(); + private static final PlatformHookOsx INVOCATION_HANDLER = new PlatformHookOsx(); private String oSBuildNumber; @@ -59,5 +59,5 @@ Class preferencesHandler = findHandlerClass("PreferencesHandler"); Object proxy = Proxy.newProxyInstance(PlatformHookOsx.class.getClassLoader(), new Class[] { - quitHandler, aboutHandler, openFilesHandler, preferencesHandler}, ivhandler); + quitHandler, aboutHandler, openFilesHandler, preferencesHandler}, INVOCATION_HANDLER); Object appli = eawtApplication.getConstructor((Class[]) null).newInstance((Object[]) null); if (Utils.getJavaVersion() >= 9) {