Changeset 16913 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2020-08-23T15:31:04+02:00 (4 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 59 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java
r16442 r16913 363 363 * Such as a^2 + b^2 = 1, ie (-b, a) is a unit vector of line 364 364 */ 365 private double a, b, c; 365 private double a; 366 private double b; 367 private final double c; 366 368 /** 367 369 * (xM, yM) are coordinates of a point of the line 368 370 */ 369 private double xM, yM; 371 private final double xM; 372 private final double yM; 370 373 371 374 /** -
trunk/src/org/openstreetmap/josm/actions/SaveAction.java
r16630 r16913 35 35 */ 36 36 public final class SaveAction extends SaveActionBase { 37 private static SaveAction instance = new SaveAction();37 private static final SaveAction instance = new SaveAction(); 38 38 39 39 private final PropertyChangeListener updateOnRequireSaveChange = evt -> { -
trunk/src/org/openstreetmap/josm/actions/SaveAsAction.java
r15496 r16913 17 17 */ 18 18 public class SaveAsAction extends SaveActionBase { 19 private static SaveAsAction instance = new SaveAsAction();19 private static final SaveAsAction instance = new SaveAsAction(); 20 20 21 21 /** -
trunk/src/org/openstreetmap/josm/actions/SelectNonBranchingWaySequences.java
r16438 r16913 22 22 * outer endpoints of selected ways 23 23 */ 24 private Set<Node> outerNodes;24 private final Set<Node> outerNodes; 25 25 /** 26 26 * endpoints of selected ways 27 27 */ 28 private Set<Node> nodes;28 private final Set<Node> nodes; 29 29 30 30 /** -
trunk/src/org/openstreetmap/josm/data/APIDataSet.java
r16436 r16913 37 37 public class APIDataSet { 38 38 private List<OsmPrimitive> toAdd; 39 private List<OsmPrimitive> toUpdate;39 private final List<OsmPrimitive> toUpdate; 40 40 private List<OsmPrimitive> toDelete; 41 41 -
trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
r16643 r16913 93 93 private Runnable finishTask; 94 94 private boolean force; 95 private long minimumExpiryTime;95 private final long minimumExpiryTime; 96 96 97 97 /** -
trunk/src/org/openstreetmap/josm/data/gpx/GpxExtensionCollection.java
r16553 r16913 23 23 private static final long serialVersionUID = 1L; 24 24 25 private Stack<GpxExtension> childStack = new Stack<>();25 private final Stack<GpxExtension> childStack = new Stack<>(); 26 26 private IWithAttributes parent; 27 27 -
trunk/src/org/openstreetmap/josm/data/imagery/CachedTileLoaderFactory.java
r16398 r16913 30 30 public static final StringProperty PROP_TILECACHE_DIR = getTileCacheDir(); 31 31 private final ICacheAccess<String, BufferedImageCacheEntry> cache; 32 private Constructor<? extends TileLoader> tileLoaderConstructor;32 private final Constructor<? extends TileLoader> tileLoaderConstructor; 33 33 34 34 /** -
trunk/src/org/openstreetmap/josm/data/osm/AbstractDataSourceChangeEvent.java
r16553 r16913 15 15 public abstract class AbstractDataSourceChangeEvent implements DataSourceChangeEvent { 16 16 17 private DataSet source;18 private Set<DataSource> old;17 private final DataSet source; 18 private final Set<DataSource> old; 19 19 20 20 /** -
trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
r16387 r16913 59 59 * @see #FLAG_DIRECTION_REVERSED 60 60 */ 61 private static volatileMatch reversedDirectionKeys;61 private static final Match reversedDirectionKeys; 62 62 63 63 static { -
trunk/src/org/openstreetmap/josm/data/osm/User.java
r13101 r16913 28 28 * the map of known users 29 29 */ 30 private static Map<Long, User> userMap = new HashMap<>();30 private static final Map<Long, User> userMap = new HashMap<>(); 31 31 32 32 /** -
trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java
r16553 r16913 33 33 public abstract class HistoryOsmPrimitive implements Tagged, Comparable<HistoryOsmPrimitive>, PrimitiveId { 34 34 35 private long id;36 private boolean visible;37 private User user;38 private long changesetId;35 private final long id; 36 private final boolean visible; 37 private final User user; 38 private final long changesetId; 39 39 private Changeset changeset; 40 private Date timestamp;41 private long version;40 private final Date timestamp; 41 private final long version; 42 42 private Map<String, String> tags; 43 43 -
trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java
r16643 r16913 80 80 private final boolean caseSensitive; 81 81 private final boolean regexSearch; 82 private static String rxErrorMsg = marktr("The regex \"{0}\" had a parse error at offset {1}, full error:\n\n{2}");83 private static String rxErrorMsgNoPos = marktr("The regex \"{0}\" had a parse error, full error:\n\n{1}");82 private static final String rxErrorMsg = marktr("The regex \"{0}\" had a parse error at offset {1}, full error:\n\n{2}"); 83 private static final String rxErrorMsgNoPos = marktr("The regex \"{0}\" had a parse error, full error:\n\n{1}"); 84 84 private final PushbackTokenizer tokenizer; 85 private static Map<String, SimpleMatchFactory> simpleMatchFactoryMap = new HashMap<>();86 private static Map<String, UnaryMatchFactory> unaryMatchFactoryMap = new HashMap<>();87 private static Map<String, BinaryMatchFactory> binaryMatchFactoryMap = new HashMap<>();85 private static final Map<String, SimpleMatchFactory> simpleMatchFactoryMap = new HashMap<>(); 86 private static final Map<String, UnaryMatchFactory> unaryMatchFactoryMap = new HashMap<>(); 87 private static final Map<String, BinaryMatchFactory> binaryMatchFactoryMap = new HashMap<>(); 88 88 89 89 static { … … 230 230 231 231 public static class CoreUnaryMatchFactory implements UnaryMatchFactory { 232 private static Collection<String> keywords = Arrays.asList("parent", "child");232 private static final Collection<String> keywords = Arrays.asList("parent", "child"); 233 233 234 234 @Override … … 1167 1167 */ 1168 1168 public static class UserMatch extends Match { 1169 private String user;1169 private final String user; 1170 1170 1171 1171 UserMatch(String user) { … … 1219 1219 */ 1220 1220 private static class RoleMatch extends Match { 1221 private String role;1221 private final String role; 1222 1222 1223 1223 RoleMatch(String role) { -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
r16700 r16913 355 355 356 356 //flag that activate wider highlight mode 357 private boolean useWiderHighlight;357 private final boolean useWiderHighlight; 358 358 359 359 private boolean useStrokes; -
trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java
r15149 r16913 25 25 public static final float NTV2_SOURCE_PRIORITY_DOWNLOAD = 5f; 26 26 27 private static Map<Float, NTV2GridShiftFileSource> sources = new TreeMap<>(Collections.reverseOrder());27 private static final Map<Float, NTV2GridShiftFileSource> sources = new TreeMap<>(Collections.reverseOrder()); 28 28 29 29 /** -
trunk/src/org/openstreetmap/josm/data/validation/tests/SharpAngles.java
r15463 r16913 34 34 private double maxLength = 10.0; // meters 35 35 /** Specific highway types to ignore */ 36 private Collection<String> ignoreHighways = new TreeSet<>(36 private final Collection<String> ignoreHighways = new TreeSet<>( 37 37 Arrays.asList("platform", "rest_area", "services", "via_ferrata")); 38 38 -
trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
r16812 r16913 88 88 private static volatile HashSet<String> additionalPresetsValueData; 89 89 /** often used tags which are not in presets */ 90 private static volatileMultiMap<String, String> oftenUsedTags = new MultiMap<>();90 private static final MultiMap<String, String> oftenUsedTags = new MultiMap<>(); 91 91 private static final Map<TaggingPreset, List<TaggingPresetItem>> presetIndex = new LinkedHashMap<>(); 92 92 -
trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java
r14153 r16913 85 85 private int toggleValue = -1; 86 86 private ConditionalOptionPaneUtil.MessagePanel togglePanel; 87 private Component parent;87 private final Component parent; 88 88 private Component content; 89 89 private final String[] bTexts; … … 94 94 protected JButton defaultButton; 95 95 private transient Icon icon; 96 private boolean modal;96 private final boolean modal; 97 97 private boolean focusOnDefaultButton; 98 98 -
trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java
r15633 r16913 26 26 private transient ShowHideButtonListener listener; 27 27 private boolean hideIfDisabled; 28 private boolean isExpert;28 private final boolean isExpert; 29 29 30 30 /** -
trunk/src/org/openstreetmap/josm/gui/MainApplication.java
r16800 r16913 737 737 Policy.setPolicy(new Policy() { 738 738 // Permissions for plug-ins loaded when josm is started via webstart 739 private PermissionCollection pc;739 private final PermissionCollection pc; 740 740 741 741 { -
trunk/src/org/openstreetmap/josm/gui/MenuScroller.java
r16626 r16913 43 43 private JPopupMenu menu; 44 44 private Component[] menuItems; 45 private MenuScrollItem upItem;46 private MenuScrollItem downItem;45 private final MenuScrollItem upItem; 46 private final MenuScrollItem downItem; 47 47 private final MenuScrollListener menuListener = new MenuScrollListener(); 48 48 private final MouseWheelListener mouseWheelListener = new MouseScrollListener(); -
trunk/src/org/openstreetmap/josm/gui/NotificationManager.java
r16313 r16913 67 67 private final Deque<Notification> queue; 68 68 69 private static IntegerProperty pauseTime = new IntegerProperty("notification-default-pause-time-ms", 300); // milliseconds69 private static final IntegerProperty pauseTime = new IntegerProperty("notification-default-pause-time-ms", 300); // milliseconds 70 70 71 71 private long displayTimeStart; -
trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java
r16553 r16913 25 25 */ 26 26 public abstract class PleaseWaitRunnable implements Runnable, CancelListener { 27 private boolean ignoreException;27 private final boolean ignoreException; 28 28 private final String title; 29 29 -
trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
r16912 r16913 60 60 } 61 61 62 private static CopyOnWriteArrayList<TileSourceProvider> providers = new CopyOnWriteArrayList<>();62 private static final CopyOnWriteArrayList<TileSourceProvider> providers = new CopyOnWriteArrayList<>(); 63 63 static { 64 64 addTileSourceProvider(new DefaultOsmTileSourceProvider()); -
trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java
r14138 r16913 37 37 38 38 /** How often to do the moving (milliseconds) */ 39 private static long timerInterval = 20;39 private static final long timerInterval = 20; 40 40 41 41 /** The maximum speed (pixels per timer interval) */ -
trunk/src/org/openstreetmap/josm/gui/bugreport/DebugTextDisplay.java
r14273 r16913 20 20 private static final String CODE_PATTERN = "{{{%n%s%n}}}"; 21 21 private String text; 22 private JosmTextArea textArea;22 private final JosmTextArea textArea; 23 23 24 24 /** -
trunk/src/org/openstreetmap/josm/gui/correction/CorrectionTableModel.java
r16553 r16913 18 18 19 19 private final transient List<C> corrections; 20 private boolean[] apply;20 private final boolean[] apply; 21 21 private final int applyColumn; 22 22 -
trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
r16888 r16913 150 150 151 151 /** the preferred height if the toggle dialog is expanded */ 152 private int preferredHeight;152 private final int preferredHeight; 153 153 154 154 /** the JDialog displaying the toggle dialog as undocked dialog */ -
trunk/src/org/openstreetmap/josm/gui/dialogs/layer/ActivateLayerAction.java
r16790 r16913 29 29 implements IEnabledStateUpdating, ActiveLayerChangeListener, MultikeyShortcutAction { 30 30 private transient Layer layer; 31 private transient Shortcut multikeyShortcut;31 private final transient Shortcut multikeyShortcut; 32 32 private final LayerListModel model; 33 33 -
trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MergeAction.java
r12643 r16913 25 25 */ 26 26 public final class MergeAction extends AbstractAction implements IEnabledStateUpdating, LayerAction, Layer.MultiLayerAction { 27 private transient Layer layer;28 private transient List<Layer> layers;27 private final transient Layer layer; 28 private final transient List<Layer> layers; 29 29 private final LayerListModel model; 30 30 -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java
r16436 r16913 65 65 private RelationTree childTree; 66 66 /** the tree model */ 67 private transient RelationTreeModel model;67 private final transient RelationTreeModel model; 68 68 69 69 /** the osm data layer this browser is related to */ 70 private transient OsmDataLayer layer;70 private final transient OsmDataLayer layer; 71 71 72 72 /** the editAction used in the bottom panel and for doubleClick */ -
trunk/src/org/openstreetmap/josm/gui/download/DownloadSourceSizingPolicy.java
r14418 r16913 68 68 69 69 private final AbstractProperty<Integer> preference; 70 private IntSupplier minHeight;70 private final IntSupplier minHeight; 71 71 72 72 /** -
trunk/src/org/openstreetmap/josm/gui/io/CustomConfigurator.java
r16643 r16913 379 379 public static class XMLCommandProcessor { 380 380 381 private Preferences mainPrefs;381 private final Preferences mainPrefs; 382 382 private final Map<String, Element> tasksMap = new HashMap<>(); 383 383 private final Map<String, String> environment = new HashMap<>(); -
trunk/src/org/openstreetmap/josm/gui/layer/AbstractCachedTileSourceLayer.java
r16553 r16913 26 26 public abstract class AbstractCachedTileSourceLayer<T extends AbstractTMSTileSource> extends AbstractTileSourceLayer<T> { 27 27 /** loader factory responsible for loading tiles for all layers */ 28 private static Map<String, TileLoaderFactory> loaderFactories = new ConcurrentHashMap<>();28 private static final Map<String, TileLoaderFactory> loaderFactories = new ConcurrentHashMap<>(); 29 29 30 30 private static final String PREFERENCE_PREFIX = "imagery.cache."; -
trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
r16670 r16913 155 155 156 156 /** additional layer menu actions */ 157 private static List<MenuAddition> menuAdditions = new LinkedList<>();157 private static final List<MenuAddition> menuAdditions = new LinkedList<>(); 158 158 159 159 /** minimum zoom level to show to user */ -
trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
r16643 r16913 380 380 */ 381 381 public final DataSet data; 382 private DataSetListenerAdapter dataSetListenerAdapter;382 private final DataSetListenerAdapter dataSetListenerAdapter; 383 383 384 384 /** -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
r16548 r16913 73 73 JumpToMarkerLayer, NavigatableComponent.ZoomChangeListener, ImageDataUpdateListener { 74 74 75 private static List<Action> menuAdditions = new LinkedList<>();75 private static final List<Action> menuAdditions = new LinkedList<>(); 76 76 77 77 private static volatile List<MapMode> supportedMapModes; -
trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java
r16864 r16913 176 176 177 177 // setup color maps used by heat map 178 private static Color[] heatMapLutColorJosmInferno = createColorFromResource("inferno");179 private static Color[] heatMapLutColorJosmViridis = createColorFromResource("viridis");180 private static Color[] heatMapLutColorJosmBrown2Green = createColorFromResource("brown2green");181 private static Color[] heatMapLutColorJosmRed2Blue = createColorFromResource("red2blue");182 183 private static Color[] rtkLibQualityColors = {178 private static final Color[] heatMapLutColorJosmInferno = createColorFromResource("inferno"); 179 private static final Color[] heatMapLutColorJosmViridis = createColorFromResource("viridis"); 180 private static final Color[] heatMapLutColorJosmBrown2Green = createColorFromResource("brown2green"); 181 private static final Color[] heatMapLutColorJosmRed2Blue = createColorFromResource("red2blue"); 182 183 private static final Color[] rtkLibQualityColors = { 184 184 Color.GREEN, // Fixed, solution by carrier‐based relative positioning and the integer ambiguity is properly resolved. 185 185 Color.ORANGE, // Float, solution by carrier‐based relative positioning but the integer ambiguity is not resolved. -
trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
r16838 r16913 82 82 } 83 83 84 private static ElemStyles styles = new ElemStyles();84 private static final ElemStyles styles = new ElemStyles(); 85 85 86 86 /** -
trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java
r16845 r16913 237 237 p.add(more, GBC.std().insets(5, 5, 0, 0)); 238 238 more.addActionListener(new ActionListener() { 239 private JPopupMenu menu = buildPopupMenu();239 private final JPopupMenu menu = buildPopupMenu(); 240 240 @Override 241 241 public void actionPerformed(ActionEvent ev) { -
trunk/src/org/openstreetmap/josm/gui/preferences/imagery/HeadersTable.java
r16553 r16913 81 81 } 82 82 83 private List<String[]> headers;83 private final List<String[]> headers; 84 84 85 85 /** -
trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java
r16410 r16913 37 37 } 38 38 39 private transient PluginPreferencesModel model;39 private final transient PluginPreferencesModel model; 40 40 41 41 /** -
trunk/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java
r12620 r16913 16 16 public class GaussKruegerProjectionChoice extends ListProjectionChoice { 17 17 18 private static String[] zones = {"2", "3", "4", "5"};18 private static final String[] zones = {"2", "3", "4", "5"}; 19 19 20 20 /** -
trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java
r16438 r16913 23 23 public class LambertCC9ZonesProjectionChoice extends ListProjectionChoice { 24 24 25 private static String[] lambert9zones = {25 private static final String[] lambert9zones = { 26 26 tr("{0} ({1} to {2} degrees)", 1, 41, 43), 27 27 tr("{0} ({1} to {2} degrees)", 2, 42, 44), -
trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreference.java
r9665 r16913 29 29 } 30 30 31 private static Set<ProxyPreferenceListener> listeners = new HashSet<>();31 private static final Set<ProxyPreferenceListener> listeners = new HashSet<>(); 32 32 33 33 private ProxyPreferencesPanel pnlProxyPreferences; -
trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java
r15586 r16913 70 70 // A list of keys to present the user. Sadly this really is a list of keys Java knows about, 71 71 // not a list of real physical keys. If someone knows how to get that list? 72 private static Map<Integer, String> keyList = setKeyList();72 private static final Map<Integer, String> keyList = setKeyList(); 73 73 74 74 private final JCheckBox cbAlt = new JCheckBox(); -
trunk/src/org/openstreetmap/josm/gui/tagging/TagModel.java
r9816 r16913 15 15 16 16 /** the list of values */ 17 private List<String> values;17 private final List<String> values; 18 18 19 19 /** -
trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
r16438 r16913 45 45 46 46 private final transient QuadStateDecorator cbModel; 47 private State[] allowed;47 private final State[] allowed; 48 48 private final transient MouseListener mouseAdapter = new MouseAdapter() { 49 49 @Override -
trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java
r16442 r16913 37 37 38 38 /** the id of the primitive whose referrers are to be read */ 39 private long id;39 private final long id; 40 40 /** the type of the primitive */ 41 private OsmPrimitiveType primitiveType;41 private final OsmPrimitiveType primitiveType; 42 42 /** true if this reader should complete incomplete primitives */ 43 43 private boolean readFull; -
trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java
r16056 r16913 28 28 public class OsmServerObjectReader extends OsmServerReader { 29 29 /** the id of the object to download */ 30 private PrimitiveId id;30 private final PrimitiveId id; 31 31 /** true if a full download is required, i.e. a download including the immediate children */ 32 private boolean full;32 private final boolean full; 33 33 /** the specific version number, if required (incompatible with full), or -1 else */ 34 private int version;34 private final int version; 35 35 36 36 /** -
trunk/src/org/openstreetmap/josm/io/audio/JavaSoundPlayer.java
r12620 r16913 28 28 class JavaSoundPlayer implements SoundPlayer { 29 29 30 private static int chunk = 4000; /* bytes */30 private static final int chunk = 4000; /* bytes */ 31 31 32 32 private AudioInputStream audioInputStream; -
trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java
r16559 r16913 133 133 private ImageryInfo mirrorEntry; 134 134 private ImageryBounds bounds; 135 private Map<ImageryBounds, ImageryBounds> boundsInterner = new HashMap<>();135 private final Map<ImageryBounds, ImageryBounds> boundsInterner = new HashMap<>(); 136 136 private Shape shape; 137 137 // language of last element, does only work for simple ENTRY_ATTRIBUTE's -
trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
r16825 r16913 83 83 * can extend this list by using @see addRequestHandler 84 84 */ 85 private static Map<String, Class<? extends RequestHandler>> handlers = new TreeMap<>();85 private static final Map<String, Class<? extends RequestHandler>> handlers = new TreeMap<>(); 86 86 87 87 static { -
trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java
r16865 r16913 58 58 public class SessionWriter { 59 59 60 private static Map<Class<? extends Layer>, Class<? extends SessionLayerExporter>> sessionLayerExporters = new HashMap<>();60 private static final Map<Class<? extends Layer>, Class<? extends SessionLayerExporter>> sessionLayerExporters = new HashMap<>(); 61 61 62 62 private final List<Layer> layers; -
trunk/src/org/openstreetmap/josm/tools/I18n.java
r16873 r16913 94 94 /** Map (english/locale) of plural strings **/ 95 95 private static volatile Map<String, String[]> pstrings; 96 private static Locale originalLocale = Locale.getDefault();97 private static Map<String, PluralMode> languages = new HashMap<>();96 private static final Locale originalLocale = Locale.getDefault(); 97 private static final Map<String, PluralMode> languages = new HashMap<>(); 98 98 // NOTE: check also WikiLanguage handling in LanguageInfo.java when adding new languages 99 99 static { -
trunk/src/org/openstreetmap/josm/tools/ListenableWeakReference.java
r12798 r16913 19 19 private static final ReferenceQueue<Object> GLOBAL_QUEUE = new ReferenceQueue<>(); 20 20 private static Thread thread; 21 private Runnable runOnDereference;21 private final Runnable runOnDereference; 22 22 23 23 /** -
trunk/src/org/openstreetmap/josm/tools/OptionParser.java
r16626 r16913 22 22 public class OptionParser { 23 23 24 private HashMap<String, AvailableOption> availableOptions = new HashMap<>();24 private final HashMap<String, AvailableOption> availableOptions = new HashMap<>(); 25 25 private final String program; 26 26 -
trunk/src/org/openstreetmap/josm/tools/Shortcut.java
r14689 r16913 306 306 307 307 // here we store our shortcuts 308 private static ShortcutCollection shortcuts = new ShortcutCollection();308 private static final ShortcutCollection shortcuts = new ShortcutCollection(); 309 309 310 310 private static class ShortcutCollection extends CopyOnWriteArrayList<Shortcut> { … … 331 331 332 332 // and here our modifier groups 333 private static Map<Integer, Integer> groups = new HashMap<>();333 private static final Map<Integer, Integer> groups = new HashMap<>(); 334 334 335 335 // check if something collides with an existing shortcut … … 387 387 388 388 /* for reassignment */ 389 private static int[] mods = {ALT_CTRL, ALT_SHIFT, CTRL_SHIFT, ALT_CTRL_SHIFT};390 private static int[] keys = {KeyEvent.VK_F1, KeyEvent.VK_F2, KeyEvent.VK_F3, KeyEvent.VK_F4,389 private static final int[] mods = {ALT_CTRL, ALT_SHIFT, CTRL_SHIFT, ALT_CTRL_SHIFT}; 390 private static final int[] keys = {KeyEvent.VK_F1, KeyEvent.VK_F2, KeyEvent.VK_F3, KeyEvent.VK_F4, 391 391 KeyEvent.VK_F5, KeyEvent.VK_F6, KeyEvent.VK_F7, KeyEvent.VK_F8, 392 392 KeyEvent.VK_F9, KeyEvent.VK_F10, KeyEvent.VK_F11, KeyEvent.VK_F12}; -
trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportQueue.java
r12808 r16913 91 91 private class BugReportDisplayRunnable implements Runnable { 92 92 93 private volatileboolean running = true;93 private final boolean running = true; 94 94 95 95 @Override
Note:
See TracChangeset
for help on using the changeset viewer.