Index: src/org/openstreetmap/josm/Main.java =================================================================== --- src/org/openstreetmap/josm/Main.java (revision 6084) +++ src/org/openstreetmap/josm/Main.java (working copy) @@ -98,7 +98,7 @@ * Abstract class holding various static global variables and methods used in large parts of JOSM application. * @since 98 */ -abstract public class Main { +public abstract class Main { /** * Replies true if JOSM currently displays a map view. False, if it doesn't, i.e. if @@ -106,7 +106,7 @@ * * @return true if JOSM currently displays a map view */ - static public boolean isDisplayingMapView() { + public static boolean isDisplayingMapView() { if (map == null) return false; if (map.mapView == null) return false; return true; @@ -132,7 +132,7 @@ * calculations. The executed runnables are guaranteed to be executed separately * and sequential. */ - public final static ExecutorService worker = new ProgressMonitorExecutor(); + public static final ExecutorService worker = new ProgressMonitorExecutor(); /** * Global application preferences @@ -193,12 +193,12 @@ /** * Logging level (3 = debug, 2 = info, 1 = warn, 0 = none). */ - static public int log_level = 2; + public static int log_level = 2; /** * Print a warning message if logging is on. * @param msg The message to print. */ - static public void warn(String msg) { + public static void warn(String msg) { if (log_level < 1) return; System.err.println(tr("WARNING: {0}", msg)); @@ -207,7 +207,7 @@ * Print an informational message if logging is on. * @param msg The message to print. */ - static public void info(String msg) { + public static void info(String msg) { if (log_level < 2) return; System.err.println(tr("INFO: {0}", msg)); @@ -216,7 +216,7 @@ * Print an debug message if logging is on. * @param msg The message to print. */ - static public void debug(String msg) { + public static void debug(String msg) { if (log_level < 3) return; System.err.println(tr("DEBUG: {0}", msg)); @@ -227,7 +227,7 @@ * @param msg The formated message to print. * @param objects The objects to insert into format string. */ - static public void warn(String msg, Object... objects) { + public static void warn(String msg, Object... objects) { warn(MessageFormat.format(msg, objects)); } /** @@ -236,7 +236,7 @@ * @param msg The formated message to print. * @param objects The objects to insert into format string. */ - static public void info(String msg, Object... objects) { + public static void info(String msg, Object... objects) { info(MessageFormat.format(msg, objects)); } /** @@ -245,7 +245,7 @@ * @param msg The formated message to print. * @param objects The objects to insert into format string. */ - static public void debug(String msg, Object... objects) { + public static void debug(String msg, Object... objects) { debug(MessageFormat.format(msg, objects)); } Index: src/org/openstreetmap/josm/actions/AbstractInfoAction.java =================================================================== --- src/org/openstreetmap/josm/actions/AbstractInfoAction.java (revision 6084) +++ src/org/openstreetmap/josm/actions/AbstractInfoAction.java (working copy) @@ -37,7 +37,7 @@ * * @return the base URL, i.e. http://api.openstreetmap.org/browse */ - static public String getBaseBrowseUrl() { + public static String getBaseBrowseUrl() { String baseUrl = Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL); Pattern pattern = Pattern.compile("/api/?$"); String ret = pattern.matcher(baseUrl).replaceAll("/browse"); @@ -56,7 +56,7 @@ * * @return the base URL, i.e. http://www.openstreetmap.org/user */ - static public String getBaseUserUrl() { + public static String getBaseUserUrl() { String baseUrl = Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL); Pattern pattern = Pattern.compile("/api/?$"); String ret = pattern.matcher(baseUrl).replaceAll("/user"); Index: src/org/openstreetmap/josm/actions/AbstractMergeAction.java =================================================================== --- src/org/openstreetmap/josm/actions/AbstractMergeAction.java (revision 6084) +++ src/org/openstreetmap/josm/actions/AbstractMergeAction.java (working copy) @@ -27,7 +27,7 @@ * the list cell renderer used to render layer list entries * */ - static public class LayerListCellRenderer extends DefaultListCellRenderer { + public static class LayerListCellRenderer extends DefaultListCellRenderer { @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, Index: src/org/openstreetmap/josm/actions/CombineWayAction.java =================================================================== --- src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 6084) +++ src/org/openstreetmap/josm/actions/CombineWayAction.java (working copy) @@ -249,7 +249,7 @@ setEnabled(numWays >= 2); } - static public class NodePair { + public static class NodePair { private Node a; private Node b; public NodePair(Node a, Node b) { @@ -341,8 +341,8 @@ } } - static public class NodeGraph { - static public List buildNodePairs(Way way, boolean directed) { + public static class NodeGraph { + public static List buildNodePairs(Way way, boolean directed) { ArrayList pairs = new ArrayList(); for (Pair pair: way.getNodePairs(false /* don't sort */)) { pairs.add(new NodePair(pair)); @@ -353,7 +353,7 @@ return pairs; } - static public List buildNodePairs(List ways, boolean directed) { + public static List buildNodePairs(List ways, boolean directed) { ArrayList pairs = new ArrayList(); for (Way w: ways) { pairs.addAll(buildNodePairs(w, directed)); @@ -361,7 +361,7 @@ return pairs; } - static public List eliminateDuplicateNodePairs(List pairs) { + public static List eliminateDuplicateNodePairs(List pairs) { ArrayList cleaned = new ArrayList(); for(NodePair p: pairs) { if (!cleaned.contains(p) && !cleaned.contains(p.swap())) { @@ -371,7 +371,7 @@ return cleaned; } - static public NodeGraph createDirectedGraphFromNodePairs(List pairs) { + public static NodeGraph createDirectedGraphFromNodePairs(List pairs) { NodeGraph graph = new NodeGraph(); for (NodePair pair: pairs) { graph.add(pair); @@ -379,7 +379,7 @@ return graph; } - static public NodeGraph createDirectedGraphFromWays(Collection ways) { + public static NodeGraph createDirectedGraphFromWays(Collection ways) { NodeGraph graph = new NodeGraph(); for (Way w: ways) { graph.add(buildNodePairs(w, true /* directed */)); @@ -387,7 +387,7 @@ return graph; } - static public NodeGraph createUndirectedGraphFromNodeList(List pairs) { + public static NodeGraph createUndirectedGraphFromNodeList(List pairs) { NodeGraph graph = new NodeGraph(); for (NodePair pair: pairs) { graph.add(pair); @@ -396,7 +396,7 @@ return graph; } - static public NodeGraph createUndirectedGraphFromNodeWays(Collection ways) { + public static NodeGraph createUndirectedGraphFromNodeWays(Collection ways) { NodeGraph graph = new NodeGraph(); for (Way w: ways) { graph.add(buildNodePairs(w, false /* undirected */)); Index: src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java =================================================================== --- src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (revision 6084) +++ src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (working copy) @@ -182,7 +182,7 @@ return rel; } - static public final List DEFAULT_LINEAR_TAGS = Arrays.asList(new String[] {"barrier", "source"}); + public static final List DEFAULT_LINEAR_TAGS = Arrays.asList(new String[] {"barrier", "source"}); /** * This method removes tags/value pairs from inner and outer ways and put them on relation if necessary Index: src/org/openstreetmap/josm/actions/DiskAccessAction.java =================================================================== --- src/org/openstreetmap/josm/actions/DiskAccessAction.java (revision 6084) +++ src/org/openstreetmap/josm/actions/DiskAccessAction.java (working copy) @@ -13,7 +13,7 @@ * Helper class for all actions that access the disk. * @since 78 */ -abstract public class DiskAccessAction extends JosmAction { +public abstract class DiskAccessAction extends JosmAction { /** * Constructs a new {@code DiskAccessAction}. Index: src/org/openstreetmap/josm/actions/DownloadReferrersAction.java =================================================================== --- src/org/openstreetmap/josm/actions/DownloadReferrersAction.java (revision 6084) +++ src/org/openstreetmap/josm/actions/DownloadReferrersAction.java (working copy) @@ -40,7 +40,7 @@ * @param children the collection of child primitives. * @exception IllegalArgumentException thrown if targetLayer is null */ - static public void downloadReferrers(OsmDataLayer targetLayer, Collection children) throws IllegalArgumentException { + public static void downloadReferrers(OsmDataLayer targetLayer, Collection children) throws IllegalArgumentException { if (children == null || children.isEmpty()) return; Main.worker.submit(new DownloadReferrersTask(targetLayer, children)); } @@ -54,7 +54,7 @@ * @param children the collection of primitives, given as map of ids and types * @exception IllegalArgumentException thrown if targetLayer is null */ - static public void downloadReferrers(OsmDataLayer targetLayer, Map children) throws IllegalArgumentException { + public static void downloadReferrers(OsmDataLayer targetLayer, Map children) throws IllegalArgumentException { if (children == null || children.isEmpty()) return; Main.worker.submit(new DownloadReferrersTask(targetLayer, children)); } @@ -71,7 +71,7 @@ * @exception IllegalArgumentException thrown if id <= 0 * @exception IllegalArgumentException thrown if type == null */ - static public void downloadReferrers(OsmDataLayer targetLayer, long id, OsmPrimitiveType type) throws IllegalArgumentException { + public static void downloadReferrers(OsmDataLayer targetLayer, long id, OsmPrimitiveType type) throws IllegalArgumentException { if (id <= 0) throw new IllegalArgumentException(MessageFormat.format("Id > 0 required, got {0}", id)); CheckParameterUtil.ensureParameterNotNull(type, "type"); Index: src/org/openstreetmap/josm/actions/ExpertToggleAction.java =================================================================== --- src/org/openstreetmap/josm/actions/ExpertToggleAction.java (revision 6084) +++ src/org/openstreetmap/josm/actions/ExpertToggleAction.java (working copy) @@ -28,7 +28,7 @@ private static ExpertToggleAction INSTANCE = new ExpertToggleAction(); - private synchronized static void fireExpertModeChanged(boolean isExpert) { + private static synchronized void fireExpertModeChanged(boolean isExpert) { { Iterator> it = listeners.iterator(); while (it.hasNext()) { @@ -64,7 +64,7 @@ addExpertModeChangeListener(listener, false); } - public synchronized static void addExpertModeChangeListener(ExpertModeChangeListener listener, boolean fireWhenAdding) { + public static synchronized void addExpertModeChangeListener(ExpertModeChangeListener listener, boolean fireWhenAdding) { if (listener == null) return; for (WeakReference wr : listeners) { // already registered ? => abort @@ -81,7 +81,7 @@ * * @param listener the listener. Ignored if null. */ - public synchronized static void removeExpertModeChangeListener(ExpertModeChangeListener listener) { + public static synchronized void removeExpertModeChangeListener(ExpertModeChangeListener listener) { if (listener == null) return; Iterator> it = listeners.iterator(); while (it.hasNext()) { @@ -94,7 +94,7 @@ } } - public synchronized static void addVisibilitySwitcher(Component c) { + public static synchronized void addVisibilitySwitcher(Component c) { if (c == null) return; for (WeakReference wr : visibilityToggleListeners) { // already registered ? => abort @@ -104,7 +104,7 @@ c.setVisible(isExpert()); } - public synchronized static void removeVisibilitySwitcher(Component c) { + public static synchronized void removeVisibilitySwitcher(Component c) { if (c == null) return; Iterator> it = visibilityToggleListeners.iterator(); while (it.hasNext()) { Index: src/org/openstreetmap/josm/actions/ExtensionFileFilter.java =================================================================== --- src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (revision 6084) +++ src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (working copy) @@ -87,7 +87,7 @@ private final String description; private final String defaultExtension; - static protected void sort(List filters) { + protected static void sort(List filters) { Collections.sort( filters, new Comparator() { Index: src/org/openstreetmap/josm/actions/JosmAction.java =================================================================== --- src/org/openstreetmap/josm/actions/JosmAction.java (revision 6084) +++ src/org/openstreetmap/josm/actions/JosmAction.java (working copy) @@ -37,7 +37,7 @@ * * @author imi */ -abstract public class JosmAction extends AbstractAction implements Destroyable { +public abstract class JosmAction extends AbstractAction implements Destroyable { protected Shortcut sc; private LayerChangeAdapter layerChangeAdapter; Index: src/org/openstreetmap/josm/actions/OpenFileAction.java =================================================================== --- src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 6084) +++ src/org/openstreetmap/josm/actions/OpenFileAction.java (working copy) @@ -82,17 +82,17 @@ * Open a list of files. The complete list will be passed to batch importers. * @param fileList A list of files */ - static public void openFiles(List fileList) { + public static void openFiles(List fileList) { openFiles(fileList, false); } - static public void openFiles(List fileList, boolean recordHistory) { + public static void openFiles(List fileList, boolean recordHistory) { OpenFileTask task = new OpenFileTask(fileList, null); task.setRecordHistory(recordHistory); Main.worker.submit(task); } - static public class OpenFileTask extends PleaseWaitRunnable { + public static class OpenFileTask extends PleaseWaitRunnable { private List files; private List successfullyOpenedFiles = new ArrayList(); private FileFilter fileFilter; Index: src/org/openstreetmap/josm/actions/OrthogonalizeAction.java =================================================================== --- src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 6084) +++ src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (working copy) @@ -410,9 +410,9 @@ * Class contains everything we need to know about a singe way. */ private static class WayData { - final public Way way; // The assigned way - final public int nSeg; // Number of Segments of the Way - final public int nNode; // Number of Nodes of the Way + public final Way way; // The assigned way + public final int nSeg; // Number of Segments of the Way + public final int nNode; // Number of Nodes of the Way public Direction[] segDirections; // Direction of the segments // segment i goes from node i to node (i+1) public EastNorth segSum; // (Vector-)sum of all horizontal segments plus the sum of all vertical Index: src/org/openstreetmap/josm/actions/SplitWayAction.java =================================================================== --- src/org/openstreetmap/josm/actions/SplitWayAction.java (revision 6084) +++ src/org/openstreetmap/josm/actions/SplitWayAction.java (working copy) @@ -258,7 +258,7 @@ * @param splitPoints the nodes where the way is split. Must not be null. * @return the list of chunks */ - static public List> buildSplitChunks(Way wayToSplit, List splitPoints){ + public static List> buildSplitChunks(Way wayToSplit, List splitPoints){ CheckParameterUtil.ensureParameterNotNull(wayToSplit, "wayToSplit"); CheckParameterUtil.ensureParameterNotNull(splitPoints, "splitPoints"); @@ -534,7 +534,7 @@ * @param selection The list of currently selected primitives * @return the result from the split operation */ - static public SplitWayResult split(OsmDataLayer layer, Way way, List atNodes, Collection selection) { + public static SplitWayResult split(OsmDataLayer layer, Way way, List atNodes, Collection selection) { List> chunks = buildSplitChunks(way, atNodes); if (chunks == null) return null; return splitWay(layer,way, chunks, selection); Index: src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java =================================================================== --- src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java (revision 6084) +++ src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java (working copy) @@ -12,7 +12,7 @@ * Abstract superclass of {@link AudioFasterAction} and {@link AudioSlowerAction}. * @since 563 */ -abstract public class AudioFastSlowAction extends JosmAction { +public abstract class AudioFastSlowAction extends JosmAction { private double multiplier; Index: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java =================================================================== --- src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 6084) +++ src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (working copy) @@ -136,7 +136,7 @@ doActionPerformed(e); } - static public void doActionPerformed(ActionEvent e) { + public static void doActionPerformed(ActionEvent e) { if(!Main.map.mapView.isActiveLayerDrawable()) return; boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; Index: src/org/openstreetmap/josm/actions/mapmode/DrawAction.java =================================================================== --- src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 6084) +++ src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (working copy) @@ -81,8 +81,8 @@ * Mapmode to add nodes, create and extend ways. */ public class DrawAction extends MapMode implements MapViewPaintable, SelectionChangedListener, AWTEventListener { - final private Cursor cursorJoinNode; - final private Cursor cursorJoinWay; + private final Cursor cursorJoinNode; + private final Cursor cursorJoinWay; private Node lastUsedNode = null; private double PHI=Math.toRadians(90); Index: src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java =================================================================== --- src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 6084) +++ src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (working copy) @@ -796,7 +796,7 @@ * @param unitvector A unit vector denoting the direction of the line * @param g the Graphics2D object it will be used on */ - static private Line2D createSemiInfiniteLine(Point2D start, Point2D unitvector, Graphics2D g) { + private static Line2D createSemiInfiniteLine(Point2D start, Point2D unitvector, Graphics2D g) { Rectangle bounds = g.getDeviceConfiguration().getBounds(); try { AffineTransform invtrans = g.getTransform().createInverse(); Index: src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java =================================================================== --- src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java (revision 6084) +++ src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java (working copy) @@ -74,13 +74,13 @@ private Point mousePos = null; private boolean dragging = false; - final private Cursor cursorSelect; - final private Cursor cursorSelectHover; - final private Cursor cursorImprove; - final private Cursor cursorImproveAdd; - final private Cursor cursorImproveDelete; - final private Cursor cursorImproveAddLock; - final private Cursor cursorImproveLock; + private final Cursor cursorSelect; + private final Cursor cursorSelectHover; + private final Cursor cursorImprove; + private final Cursor cursorImproveAdd; + private final Cursor cursorImproveDelete; + private final Cursor cursorImproveAddLock; + private final Cursor cursorImproveLock; private Color guideColor; private Stroke selectTargetWayStroke; Index: src/org/openstreetmap/josm/actions/mapmode/MapMode.java =================================================================== --- src/org/openstreetmap/josm/actions/mapmode/MapMode.java (revision 6084) +++ src/org/openstreetmap/josm/actions/mapmode/MapMode.java (working copy) @@ -23,7 +23,7 @@ * MapModes should register/deregister all necessary listeners on the map's view * control. */ -abstract public class MapMode extends JosmAction implements MouseListener, MouseMotionListener { +public abstract class MapMode extends JosmAction implements MouseListener, MouseMotionListener { protected final Cursor cursor; protected boolean ctrl; protected boolean alt; Index: src/org/openstreetmap/josm/actions/mapmode/ModifiersSpec.java =================================================================== --- src/org/openstreetmap/josm/actions/mapmode/ModifiersSpec.java (revision 6084) +++ src/org/openstreetmap/josm/actions/mapmode/ModifiersSpec.java (working copy) @@ -7,7 +7,7 @@ * @author Ole Jørgen Brønner (olejorgenb) */ public class ModifiersSpec { - static public final int ON = 1, OFF = 0, UNKNOWN = 2; + public static final int ON = 1, OFF = 0, UNKNOWN = 2; public int alt = UNKNOWN; public int shift = UNKNOWN; public int ctrl = UNKNOWN; Index: src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java =================================================================== --- src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java (revision 6084) +++ src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java (working copy) @@ -187,7 +187,7 @@ return commands; } - static private Node copyNode(Node source, boolean copyTags) { + private static Node copyNode(Node source, boolean copyTags) { if (copyTags) return new Node(source, true); else { Index: src/org/openstreetmap/josm/actions/mapmode/SelectAction.java =================================================================== --- src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 6084) +++ src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (working copy) @@ -73,7 +73,7 @@ enum Mode { move, rotate, scale, select } // contains all possible cases the cursor can be in the SelectAction - static private enum SelectActionCursor { + private static enum SelectActionCursor { rect("normal", "selection"), rect_add("normal", "select_add"), rect_rm("normal", "select_remove"), @@ -660,7 +660,7 @@ * thresholds have been exceeded) and is still in progress (i.e. mouse button * still pressed) */ - final private boolean dragInProgress() { + private final boolean dragInProgress() { return didMouseDrag && startingDraggingPos != null; } @@ -820,7 +820,7 @@ * key is pressed. If there is no such node, no action will be done and no error will be * reported. If there is, it will execute the merge and add it to the undo buffer. */ - final private void mergePrims(Point p) { + private final void mergePrims(Point p) { Collection selNodes = getCurrentDataSet().getSelectedNodes(); if (selNodes.isEmpty()) return; @@ -838,7 +838,7 @@ * Tries to find a node to merge to when in move-merge mode for the current mouse * position. Either returns the node or null, if no suitable one is nearby. */ - final private Node findNodeToMergeTo(Point p) { + private final Node findNodeToMergeTo(Point p) { Collection target = mv.getNearestNodes(p, getCurrentDataSet().getSelectedNodes(), OsmPrimitive.isSelectablePredicate); Index: src/org/openstreetmap/josm/actions/search/SearchCompiler.java =================================================================== --- src/org/openstreetmap/josm/actions/search/SearchCompiler.java (revision 6084) +++ src/org/openstreetmap/josm/actions/search/SearchCompiler.java (working copy) @@ -207,9 +207,9 @@ /** * Base class for all search operators. */ - abstract public static class Match { + public abstract static class Match { - abstract public boolean match(OsmPrimitive osm); + public abstract boolean match(OsmPrimitive osm); /** * Tests whether one of the primitives matches. @@ -237,7 +237,7 @@ /** * A unary search operator which may take data parameters. */ - abstract public static class UnaryMatch extends Match { + public abstract static class UnaryMatch extends Match { protected final Match match; @@ -259,7 +259,7 @@ /** * A binary search operator which may take data parameters. */ - abstract public static class BinaryMatch extends Match { + public abstract static class BinaryMatch extends Match { protected final Match lhs; protected final Match rhs; Index: src/org/openstreetmap/josm/command/Command.java =================================================================== --- src/org/openstreetmap/josm/command/Command.java (revision 6084) +++ src/org/openstreetmap/josm/command/Command.java (working copy) @@ -35,7 +35,7 @@ * * @author imi */ -abstract public class Command extends PseudoCommand { +public abstract class Command extends PseudoCommand { private static final class CloneVisitor extends AbstractVisitor { public final Map orig = new LinkedHashMap(); @@ -150,7 +150,7 @@ * @param deleted The deleted primitives * @param added The added primitives */ - abstract public void fillModifiedData(Collection modified, + public abstract void fillModifiedData(Collection modified, Collection deleted, Collection added); Index: src/org/openstreetmap/josm/command/PseudoCommand.java =================================================================== --- src/org/openstreetmap/josm/command/PseudoCommand.java (revision 6084) +++ src/org/openstreetmap/josm/command/PseudoCommand.java (working copy) @@ -12,11 +12,11 @@ * as subcommand of real commands but it is just an empty shell and can not be * executed or undone. */ -abstract public class PseudoCommand { +public abstract class PseudoCommand { /** * Provides a description text representing this command. */ - abstract public String getDescriptionText(); + public abstract String getDescriptionText(); /** * Provides a descriptive icon of this command. @@ -28,7 +28,7 @@ /** * Return the primitives that take part in this command. */ - abstract public Collection getParticipatingPrimitives(); + public abstract Collection getParticipatingPrimitives(); /** * Returns the subcommands of this command. Index: src/org/openstreetmap/josm/command/PurgeCommand.java =================================================================== --- src/org/openstreetmap/josm/command/PurgeCommand.java (revision 6084) +++ src/org/openstreetmap/josm/command/PurgeCommand.java (working copy) @@ -41,7 +41,7 @@ protected final ConflictCollection purgedConflicts = new ConflictCollection(); - final protected DataSet ds; + protected final DataSet ds; /** * This command relies on a number of consistency conditions: Index: src/org/openstreetmap/josm/corrector/CorrectionTableModel.java =================================================================== --- src/org/openstreetmap/josm/corrector/CorrectionTableModel.java (revision 6084) +++ src/org/openstreetmap/josm/corrector/CorrectionTableModel.java (working copy) @@ -24,11 +24,11 @@ } @Override - abstract public int getColumnCount(); + public abstract int getColumnCount(); - abstract protected boolean isBoldCell(int row, int column); - abstract public String getCorrectionColumnName(int colIndex); - abstract public Object getCorrectionValueAt(int rowIndex, int colIndex); + protected abstract boolean isBoldCell(int row, int column); + public abstract String getCorrectionColumnName(int colIndex); + public abstract Object getCorrectionValueAt(int rowIndex, int colIndex); public List getCorrections() { return corrections; Index: src/org/openstreetmap/josm/data/Preferences.java =================================================================== --- src/org/openstreetmap/josm/data/Preferences.java (revision 6084) +++ src/org/openstreetmap/josm/data/Preferences.java (working copy) @@ -140,7 +140,7 @@ * * @param The setting type */ - abstract public static class AbstractSetting implements Setting { + public abstract static class AbstractSetting implements Setting { private final T value; /** * Constructs a new {@code AbstractSetting} with the given value @@ -422,7 +422,7 @@ * @return "" if there is nothing set for the preference key, * the corresponding value otherwise. The result is not null. */ - synchronized public String get(final String key) { + public synchronized String get(final String key) { putDefault(key, null); if (!properties.containsKey(key)) return ""; @@ -437,7 +437,7 @@ * @return the corresponding value if the property has been set before, * def otherwise */ - synchronized public String get(final String key, final String def) { + public synchronized String get(final String key, final String def) { putDefault(key, def); final String prop = properties.get(key); if (prop == null || prop.equals("")) @@ -445,7 +445,7 @@ return prop; } - synchronized public Map getAllPrefix(final String prefix) { + public synchronized Map getAllPrefix(final String prefix) { final Map all = new TreeMap(); for (final Entry e : properties.entrySet()) { if (e.getKey().startsWith(prefix)) { @@ -455,7 +455,7 @@ return all; } - synchronized public List getAllPrefixCollectionKeys(final String prefix) { + public synchronized List getAllPrefixCollectionKeys(final String prefix) { final List all = new LinkedList(); for (final String e : collectionProperties.keySet()) { if (e.startsWith(prefix)) { @@ -465,7 +465,7 @@ return all; } - synchronized private Map getAllPrefixDefault(final String prefix) { + private synchronized Map getAllPrefixDefault(final String prefix) { final Map all = new TreeMap(); for (final Entry e : defaults.entrySet()) { if (e.getKey().startsWith(prefix)) { @@ -475,7 +475,7 @@ return all; } - synchronized public TreeMap getAllColors() { + public synchronized TreeMap getAllColors() { final TreeMap all = new TreeMap(); for (final Entry e : defaults.entrySet()) { if (e.getKey().startsWith("color.") && e.getValue() != null) { @@ -490,11 +490,11 @@ return all; } - synchronized public Map getDefaults() { + public synchronized Map getDefaults() { return defaults; } - synchronized public void putDefault(final String key, final String def) { + public synchronized void putDefault(final String key, final String def) { if(!defaults.containsKey(key) || defaults.get(key) == null) { defaults.put(key, def); } else if(def != null && !defaults.get(key).equals(def)) { @@ -502,17 +502,17 @@ } } - synchronized public boolean getBoolean(final String key) { + public synchronized boolean getBoolean(final String key) { putDefault(key, null); return properties.containsKey(key) ? Boolean.parseBoolean(properties.get(key)) : false; } - synchronized public boolean getBoolean(final String key, final boolean def) { + public synchronized boolean getBoolean(final String key, final boolean def) { putDefault(key, Boolean.toString(def)); return properties.containsKey(key) ? Boolean.parseBoolean(properties.get(key)) : def; } - synchronized public boolean getBoolean(final String key, final String specName, final boolean def) { + public synchronized boolean getBoolean(final String key, final String specName, final boolean def) { putDefault(key, Boolean.toString(def)); String skey = key+"."+specName; if(properties.containsKey(skey)) @@ -727,16 +727,16 @@ * @param def default value * @return a Color object for the configured colour, or the default value if none configured. */ - synchronized public Color getColor(String colName, Color def) { + public synchronized Color getColor(String colName, Color def) { return getColor(colName, null, def); } - synchronized public Color getUIColor(String colName) { + public synchronized Color getUIColor(String colName) { return UIManager.getColor(colName); } /* only for preferences */ - synchronized public String getColorName(String o) { + public synchronized String getColorName(String o) { try { Matcher m = Pattern.compile("mappaint\\.(.+?)\\.(.+)").matcher(o); @@ -766,7 +766,7 @@ * @param def default value * @return a Color object for the configured colour, or the default value if none configured. */ - synchronized public Color getColor(String colName, String specName, Color def) { + public synchronized Color getColor(String colName, String specName, Color def) { String colKey = ColorProperty.getColorKey(colName); if(!colKey.equals(colName)) { colornames.put(colKey, colName); @@ -779,16 +779,16 @@ return colStr.equals("") ? def : ColorHelper.html2color(colStr); } - synchronized public Color getDefaultColor(String colKey) { + public synchronized Color getDefaultColor(String colKey) { String colStr = defaults.get("color."+colKey); return colStr == null || "".equals(colStr) ? null : ColorHelper.html2color(colStr); } - synchronized public boolean putColor(String colKey, Color val) { + public synchronized boolean putColor(String colKey, Color val) { return put("color."+colKey, val != null ? ColorHelper.color2html(val) : null); } - synchronized public int getInteger(String key, int def) { + public synchronized int getInteger(String key, int def) { putDefault(key, Integer.toString(def)); String v = get(key); if(v.isEmpty()) @@ -802,7 +802,7 @@ return def; } - synchronized public int getInteger(String key, String specName, int def) { + public synchronized int getInteger(String key, String specName, int def) { putDefault(key, Integer.toString(def)); String v = get(key+"."+specName); if(v.isEmpty()) @@ -818,7 +818,7 @@ return def; } - synchronized public long getLong(String key, long def) { + public synchronized long getLong(String key, long def) { putDefault(key, Long.toString(def)); String v = get(key); if(null == v) @@ -832,7 +832,7 @@ return def; } - synchronized public double getDouble(String key, double def) { + public synchronized double getDouble(String key, double def) { putDefault(key, Double.toString(def)); String v = get(key); if(null == v) @@ -877,7 +877,7 @@ return Collections.emptyList(); } - synchronized public void removeFromCollection(String key, String value) { + public synchronized void removeFromCollection(String key, String value) { List a = new ArrayList(getCollection(key, Collections.emptyList())); a.remove(value); putCollection(key, a); @@ -942,7 +942,7 @@ return putCollection(key, newCollection); } - synchronized private void putCollectionDefault(String key, List val) { + private synchronized void putCollectionDefault(String key, List val) { collectionDefaults.put(key, val); } @@ -950,7 +950,7 @@ * Used to read a 2-dimensional array of strings from the preference file. * If not a single entry could be found, def is returned. */ - synchronized public Collection> getArray(String key, Collection> def) { + public synchronized Collection> getArray(String key, Collection> def) { if (def != null) { List> defCopy = new ArrayList>(def.size()); for (Collection lst : def) { @@ -1028,7 +1028,7 @@ return true; } - synchronized private void putArrayDefault(String key, List> val) { + private synchronized void putArrayDefault(String key, List> val) { arrayDefaults.put(key, val); } @@ -1108,7 +1108,7 @@ return true; } - synchronized private void putListOfStructsDefault(String key, List> val) { + private synchronized void putListOfStructsDefault(String key, List> val) { listOfStructsDefaults.put(key, val); } @@ -1368,7 +1368,7 @@ /** * The default plugin site */ - private final static String[] DEFAULT_PLUGIN_SITE = { + private static final String[] DEFAULT_PLUGIN_SITE = { "http://josm.openstreetmap.de/plugin%"}; /** Index: src/org/openstreetmap/josm/data/UndoRedoHandler.java =================================================================== --- src/org/openstreetmap/josm/data/UndoRedoHandler.java (revision 6084) +++ src/org/openstreetmap/josm/data/UndoRedoHandler.java (working copy) @@ -54,7 +54,7 @@ /** * Execute the command and add it to the intern command queue. */ - synchronized public void add(final Command c) { + public synchronized void add(final Command c) { addNoRedraw(c); afterAdd(); } @@ -69,7 +69,7 @@ /** * Undoes multiple commands. */ - synchronized public void undo(int num) { + public synchronized void undo(int num) { if (commands.isEmpty()) return; Collection oldSelection = Main.main.getCurrentDataSet().getSelected(); Index: src/org/openstreetmap/josm/data/Version.java =================================================================== --- src/org/openstreetmap/josm/data/Version.java (revision 6084) +++ src/org/openstreetmap/josm/data/Version.java (working copy) @@ -21,7 +21,7 @@ */ public class Version { /** constant to indicate that the current build isn't assigned a JOSM version number */ - static public final int JOSM_UNKNOWN_VERSION = 0; + public static final int JOSM_UNKNOWN_VERSION = 0; /** the unique instance */ private static Version instance; @@ -32,7 +32,7 @@ * @param resource the resource url to load * @return the content of the resource file; null, if an error occurred */ - static public String loadResourceFile(URL resource) { + public static String loadResourceFile(URL resource) { if (resource == null) return null; String s = null; try { @@ -59,7 +59,7 @@ * @return the unique instance of the version information */ - static public Version getInstance() { + public static Version getInstance() { if (instance == null) { instance = new Version(); instance.init(); Index: src/org/openstreetmap/josm/data/coor/CoordinateFormat.java =================================================================== --- src/org/openstreetmap/josm/data/coor/CoordinateFormat.java (revision 6084) +++ src/org/openstreetmap/josm/data/coor/CoordinateFormat.java (working copy) @@ -55,7 +55,7 @@ * * @return the default coordinate format */ - static public CoordinateFormat getDefaultFormat() { + public static CoordinateFormat getDefaultFormat() { return defaultCoordinateFormat; } @@ -64,7 +64,7 @@ * * @param format the default coordinate format */ - static public void setCoordinateFormat(CoordinateFormat format) { + public static void setCoordinateFormat(CoordinateFormat format) { if (format != null) { defaultCoordinateFormat = format; } Index: src/org/openstreetmap/josm/data/coor/LatLon.java =================================================================== --- src/org/openstreetmap/josm/data/coor/LatLon.java (revision 6084) +++ src/org/openstreetmap/josm/data/coor/LatLon.java (working copy) @@ -165,8 +165,8 @@ return y; } - public final static String SOUTH = trc("compass", "S"); - public final static String NORTH = trc("compass", "N"); + public static final String SOUTH = trc("compass", "S"); + public static final String NORTH = trc("compass", "N"); public String latToString(CoordinateFormat d) { switch(d) { case DECIMAL_DEGREES: return cDdFormatter.format(y); @@ -181,8 +181,8 @@ return x; } - public final static String WEST = trc("compass", "W"); - public final static String EAST = trc("compass", "E"); + public static final String WEST = trc("compass", "W"); + public static final String EAST = trc("compass", "E"); public String lonToString(CoordinateFormat d) { switch(d) { case DECIMAL_DEGREES: return cDdFormatter.format(x); Index: src/org/openstreetmap/josm/data/coor/QuadTiling.java =================================================================== --- src/org/openstreetmap/josm/data/coor/QuadTiling.java (revision 6084) +++ src/org/openstreetmap/josm/data/coor/QuadTiling.java (working copy) @@ -8,11 +8,11 @@ public static final int TILES_PER_LEVEL_SHIFT = 2; // Has to be 2. Other parts of QuadBuckets code rely on it public static final int TILES_PER_LEVEL = 1<> total_shift)); } - static public int index(LatLon coor, int level) { + public static int index(LatLon coor, int level) { // The nodes that don't return coordinates will all get // stuck in a single tile. Hopefully there are not too // many of them Index: src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java =================================================================== --- src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java (revision 6084) +++ src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java (working copy) @@ -25,7 +25,7 @@ ArrayList layers = new ArrayList(); static ArrayList defaultLayers = new ArrayList(); - private final static String[] DEFAULT_LAYER_SITES = { + private static final String[] DEFAULT_LAYER_SITES = { "http://josm.openstreetmap.de/maps" }; Index: src/org/openstreetmap/josm/data/oauth/OAuthParameters.java =================================================================== --- src/org/openstreetmap/josm/data/oauth/OAuthParameters.java (revision 6084) +++ src/org/openstreetmap/josm/data/oauth/OAuthParameters.java (working copy) @@ -22,23 +22,23 @@ /** * The default JOSM OAuth consumer key (created by user josmeditor). */ - static public final String DEFAULT_JOSM_CONSUMER_KEY = "F7zPYlVCqE2BUH9Hr4SsWZSOnrKjpug1EgqkbsSb"; + public static final String DEFAULT_JOSM_CONSUMER_KEY = "F7zPYlVCqE2BUH9Hr4SsWZSOnrKjpug1EgqkbsSb"; /** * The default JOSM OAuth consumer secret (created by user josmeditor). */ - static public final String DEFAULT_JOSM_CONSUMER_SECRET = "rIkjpPcBNkMQxrqzcOvOC4RRuYupYr7k8mfP13H5"; + public static final String DEFAULT_JOSM_CONSUMER_SECRET = "rIkjpPcBNkMQxrqzcOvOC4RRuYupYr7k8mfP13H5"; /** * The default OSM OAuth request token URL. */ - static public final String DEFAULT_REQUEST_TOKEN_URL = "http://www.openstreetmap.org/oauth/request_token"; + public static final String DEFAULT_REQUEST_TOKEN_URL = "http://www.openstreetmap.org/oauth/request_token"; /** * The default OSM OAuth access token URL. */ - static public final String DEFAULT_ACCESS_TOKEN_URL = "http://www.openstreetmap.org/oauth/access_token"; + public static final String DEFAULT_ACCESS_TOKEN_URL = "http://www.openstreetmap.org/oauth/access_token"; /** * The default OSM OAuth authorize URL. */ - static public final String DEFAULT_AUTHORISE_URL = "http://www.openstreetmap.org/oauth/authorize"; + public static final String DEFAULT_AUTHORISE_URL = "http://www.openstreetmap.org/oauth/authorize"; /** @@ -47,7 +47,7 @@ * * @return a set of default parameters */ - static public OAuthParameters createDefault() { + public static OAuthParameters createDefault() { return createDefault(null); } @@ -60,7 +60,7 @@ * @return a set of default parameters for the given {@code apiUrl} * @since 5422 */ - static public OAuthParameters createDefault(String apiUrl) { + public static OAuthParameters createDefault(String apiUrl) { OAuthParameters parameters = new OAuthParameters(); parameters.setConsumerKey(DEFAULT_JOSM_CONSUMER_KEY); parameters.setConsumerSecret(DEFAULT_JOSM_CONSUMER_SECRET); @@ -88,7 +88,7 @@ * @param pref the preferences * @return the parameters */ - static public OAuthParameters createFromPreferences(Preferences pref) { + public static OAuthParameters createFromPreferences(Preferences pref) { OAuthParameters parameters = createDefault(pref.get("osm-server.url")); parameters.setConsumerKey(pref.get("oauth.settings.consumer-key", parameters.getConsumerKey())); parameters.setConsumerSecret(pref.get("oauth.settings.consumer-secret", parameters.getConsumerSecret())); Index: src/org/openstreetmap/josm/data/oauth/OAuthToken.java =================================================================== --- src/org/openstreetmap/josm/data/oauth/OAuthToken.java (revision 6084) +++ src/org/openstreetmap/josm/data/oauth/OAuthToken.java (working copy) @@ -13,7 +13,7 @@ * @param consumer the consumer * @return the token */ - static public OAuthToken createToken(OAuthConsumer consumer) { + public static OAuthToken createToken(OAuthConsumer consumer) { return new OAuthToken(consumer.getToken(), consumer.getTokenSecret()); } Index: src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java =================================================================== --- src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (revision 6084) +++ src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (working copy) @@ -666,7 +666,7 @@ /** * What to do, when the tags have changed by one of the tag-changing methods. */ - abstract protected void keysChangedImpl(Map originalKeys); + protected abstract void keysChangedImpl(Map originalKeys); /** * Replies the name of this primitive. The default implementation replies the value Index: src/org/openstreetmap/josm/data/osm/ChangesetCache.java =================================================================== --- src/org/openstreetmap/josm/data/osm/ChangesetCache.java (revision 6084) +++ src/org/openstreetmap/josm/data/osm/ChangesetCache.java (working copy) @@ -33,7 +33,7 @@ */ public class ChangesetCache implements PreferenceChangedListener{ /** the unique instance */ - static private final ChangesetCache instance = new ChangesetCache(); + private static final ChangesetCache instance = new ChangesetCache(); /** * Replies the unique instance of the cache Index: src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java =================================================================== --- src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java (revision 6084) +++ src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java (working copy) @@ -27,8 +27,8 @@ public HistoryOsmPrimitive getPrimitive(); } - final private Map primitives = new HashMap(); - final private Map modificationTypes = new HashMap(); + private final Map primitives = new HashMap(); + private final Map modificationTypes = new HashMap(); /** * Remembers a history primitive with the given modification type Index: src/org/openstreetmap/josm/data/osm/OsmPrimitive.java =================================================================== --- src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 6084) +++ src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (working copy) @@ -38,7 +38,7 @@ * * @author imi */ -abstract public class OsmPrimitive extends AbstractPrimitive implements Comparable, TemplateEngineDataProvider { +public abstract class OsmPrimitive extends AbstractPrimitive implements Comparable, TemplateEngineDataProvider { private static final String SPECIAL_VALUE_ID = "id"; private static final String SPECIAL_VALUE_LOCAL_NAME = "localname"; @@ -117,7 +117,7 @@ * @param type the type to filter for * @return the sub-list of OSM primitives of type type */ - static public List getFilteredList(Collection list, Class type) { + public static List getFilteredList(Collection list, Class type) { if (list == null) return Collections.emptyList(); List ret = new LinkedList(); for(OsmPrimitive p: list) { @@ -139,7 +139,7 @@ * @param type the type to filter for * @return the sub-set of OSM primitives of type type */ - static public LinkedHashSet getFilteredSet(Collection set, Class type) { + public static LinkedHashSet getFilteredSet(Collection set, Class type) { LinkedHashSet ret = new LinkedHashSet(); if (set != null) { for(OsmPrimitive p: set) { @@ -158,7 +158,7 @@ * @return the collection of referring primitives for the primitives in primitives; * empty set if primitives is null or if there are no referring primitives */ - static public Set getReferrer(Collection primitives) { + public static Set getReferrer(Collection primitives) { HashSet ret = new HashSet(); if (primitives == null || primitives.isEmpty()) return ret; for (OsmPrimitive p: primitives) { @@ -1026,7 +1026,7 @@ * visitor function. * @param visitor The visitor from which the visit() function must be called. */ - abstract public void accept(Visitor visitor); + public abstract void accept(Visitor visitor); /** * Get and write all attributes from the parameter. Does not fire any listener, so Index: src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java =================================================================== --- src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java (revision 6084) +++ src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java (working copy) @@ -8,8 +8,8 @@ /** Comparator, comparing by type and objects display names */ public class OsmPrimitiveComparator implements Comparator { - final private HashMap cache= new HashMap(); - final private DefaultNameFormatter df = DefaultNameFormatter.getInstance(); + private final HashMap cache= new HashMap(); + private final DefaultNameFormatter df = DefaultNameFormatter.getInstance(); public boolean relationsFirst = false; private String cachedName(OsmPrimitive p) { Index: src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java =================================================================== --- src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java (revision 6084) +++ src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java (working copy) @@ -18,7 +18,7 @@ CLOSEDWAY (marktr(/* ICON(data/) */"closedway"), null, WayData.class), MULTIPOLYGON (marktr(/* ICON(data/) */"multipolygon"), null, RelationData.class); - private final static Collection DATA_VALUES = Arrays.asList(NODE, WAY, RELATION); + private static final Collection DATA_VALUES = Arrays.asList(NODE, WAY, RELATION); private final String apiTypeName; private final Class osmClass; Index: src/org/openstreetmap/josm/data/osm/PrimitiveData.java =================================================================== --- src/org/openstreetmap/josm/data/osm/PrimitiveData.java (revision 6084) +++ src/org/openstreetmap/josm/data/osm/PrimitiveData.java (working copy) @@ -50,7 +50,7 @@ } @SuppressWarnings("unchecked") - static public List getFilteredList(Collection list, OsmPrimitiveType type) { + public static List getFilteredList(Collection list, OsmPrimitiveType type) { List ret = new ArrayList(); for(PrimitiveData p: list) { if (type.getDataClass().isInstance(p)) { Index: src/org/openstreetmap/josm/data/osm/RelationToChildReference.java =================================================================== --- src/org/openstreetmap/josm/data/osm/RelationToChildReference.java (revision 6084) +++ src/org/openstreetmap/josm/data/osm/RelationToChildReference.java (working copy) @@ -13,7 +13,7 @@ * @param child the child primitive * @return a set of all {@link RelationToChildReference}s for a given child primitive */ - static public Set getRelationToChildReferences(OsmPrimitive child) { + public static Set getRelationToChildReferences(OsmPrimitive child) { Set parents = OsmPrimitive.getFilteredSet(child.getReferrers(), Relation.class); Set references = new HashSet(); for (Relation parent: parents) { @@ -33,7 +33,7 @@ * @return a set of all {@link RelationToChildReference}s to the children in the collection of child * primitives */ - static public Set getRelationToChildReferences(Collection children) { + public static Set getRelationToChildReferences(Collection children) { Set references = new HashSet(); for (OsmPrimitive child: children) { references.addAll(getRelationToChildReferences(child)); Index: src/org/openstreetmap/josm/data/osm/User.java =================================================================== --- src/org/openstreetmap/josm/data/osm/User.java (revision 6084) +++ src/org/openstreetmap/josm/data/osm/User.java (working copy) @@ -22,13 +22,13 @@ */ public class User { - static private AtomicLong uidCounter = new AtomicLong(); + private static AtomicLong uidCounter = new AtomicLong(); /** * the map of known users */ private static HashMap userMap = new HashMap(); - private final static User anonymous = createLocalUser(tr("")); + private static final User anonymous = createLocalUser(tr("")); private static long getNextLocalUid() { return uidCounter.decrementAndGet(); Index: src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java =================================================================== --- src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java (revision 6084) +++ src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java (working copy) @@ -41,9 +41,9 @@ /** preference key for the renderer class name. Default: class name for {@link StyledMapRenderer} * */ - static public final String PREF_KEY_RENDERER_CLASS_NAME = "mappaint.renderer-class-name"; + public static final String PREF_KEY_RENDERER_CLASS_NAME = "mappaint.renderer-class-name"; - static public class MapRendererFactoryException extends RuntimeException { + public static class MapRendererFactoryException extends RuntimeException { public MapRendererFactoryException() { } @@ -60,7 +60,7 @@ } } - static public class Descriptor { + public static class Descriptor { private Class renderer; private String displayName; private String description; @@ -84,7 +84,7 @@ } } - static private MapRendererFactory instance; + private static MapRendererFactory instance; /** * Replies the unique instance Index: src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java =================================================================== --- src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java (revision 6084) +++ src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java (working copy) @@ -31,19 +31,19 @@ /** preference key for a collection of roles which indicate that the respective member belongs to an * outer polygon. Default is outer. */ - static public final String PREF_KEY_OUTER_ROLES = "mappaint.multipolygon.outer.roles"; + public static final String PREF_KEY_OUTER_ROLES = "mappaint.multipolygon.outer.roles"; /** preference key for collection of role prefixes which indicate that the respective * member belongs to an outer polygon. Default is empty. */ - static public final String PREF_KEY_OUTER_ROLE_PREFIXES = "mappaint.multipolygon.outer.role-prefixes"; + public static final String PREF_KEY_OUTER_ROLE_PREFIXES = "mappaint.multipolygon.outer.role-prefixes"; /** preference key for a collection of roles which indicate that the respective member belongs to an * inner polygon. Default is inner. */ - static public final String PREF_KEY_INNER_ROLES = "mappaint.multipolygon.inner.roles"; + public static final String PREF_KEY_INNER_ROLES = "mappaint.multipolygon.inner.roles"; /** preference key for collection of role prefixes which indicate that the respective * member belongs to an inner polygon. Default is empty. */ - static public final String PREF_KEY_INNER_ROLE_PREFIXES = "mappaint.multipolygon.inner.role-prefixes"; + public static final String PREF_KEY_INNER_ROLE_PREFIXES = "mappaint.multipolygon.inner.role-prefixes"; /** *

Kind of strategy object which is responsible for deciding whether a given Index: src/org/openstreetmap/josm/data/projection/AbstractProjection.java =================================================================== --- src/org/openstreetmap/josm/data/projection/AbstractProjection.java (revision 6084) +++ src/org/openstreetmap/josm/data/projection/AbstractProjection.java (working copy) @@ -20,7 +20,7 @@ * Subclasses of AbstractProjection must set ellps and proj to a non-null value. * In addition, either datum or nadgrid has to be initialized to some value. */ -abstract public class AbstractProjection implements Projection { +public abstract class AbstractProjection implements Projection { protected Ellipsoid ellps; protected Datum datum; Index: src/org/openstreetmap/josm/data/projection/CustomProjection.java =================================================================== --- src/org/openstreetmap/josm/data/projection/CustomProjection.java (revision 6084) +++ src/org/openstreetmap/josm/data/projection/CustomProjection.java (working copy) @@ -72,7 +72,7 @@ public String key; public boolean hasValue; - public final static Map paramsByKey = new HashMap(); + public static final Map paramsByKey = new HashMap(); static { for (Param p : Param.values()) { paramsByKey.put(p.key, p); Index: src/org/openstreetmap/josm/data/projection/Projections.java =================================================================== --- src/org/openstreetmap/josm/data/projection/Projections.java (revision 6084) +++ src/org/openstreetmap/josm/data/projection/Projections.java (working copy) @@ -53,11 +53,11 @@ * * should be compatible to PROJ.4 */ - final public static Map projs = new HashMap(); - final public static Map ellipsoids = new HashMap(); - final public static Map datums = new HashMap(); - final public static Map nadgrids = new HashMap(); - final public static Map> inits = new HashMap>(); + public static final Map projs = new HashMap(); + public static final Map ellipsoids = new HashMap(); + public static final Map datums = new HashMap(); + public static final Map nadgrids = new HashMap(); + public static final Map> inits = new HashMap>(); static { registerBaseProjection("lonlat", LonLat.class, "core"); @@ -146,9 +146,9 @@ } } - private final static Set allCodes = new HashSet(); - private final static Map allProjectionChoicesByCode = new HashMap(); - private final static Map projectionsByCode_cache = new HashMap(); + private static final Set allCodes = new HashSet(); + private static final Map allProjectionChoicesByCode = new HashMap(); + private static final Map projectionsByCode_cache = new HashMap(); static { for (ProjectionChoice pc : ProjectionPreference.getProjectionChoices()) { Index: src/org/openstreetmap/josm/data/projection/datum/AbstractDatum.java =================================================================== --- src/org/openstreetmap/josm/data/projection/datum/AbstractDatum.java (revision 6084) +++ src/org/openstreetmap/josm/data/projection/datum/AbstractDatum.java (working copy) @@ -3,7 +3,7 @@ import org.openstreetmap.josm.data.projection.Ellipsoid; -abstract public class AbstractDatum implements Datum { +public abstract class AbstractDatum implements Datum { protected String name; protected String proj4Id; Index: src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java =================================================================== --- src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java (revision 6084) +++ src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java (working copy) @@ -11,7 +11,7 @@ */ public class GRS80Datum extends NullDatum { - public final static GRS80Datum INSTANCE = new GRS80Datum(); + public static final GRS80Datum INSTANCE = new GRS80Datum(); private GRS80Datum() { super(tr("GRS80"), Ellipsoid.GRS80); Index: src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java =================================================================== --- src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java (revision 6084) +++ src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java (working copy) @@ -14,8 +14,8 @@ */ public class NTV2GridShiftFileWrapper { - public final static NTV2GridShiftFileWrapper BETA2007 = new NTV2GridShiftFileWrapper("resource://data/BETA2007.gsb"); - public final static NTV2GridShiftFileWrapper ntf_rgf93 = new NTV2GridShiftFileWrapper("resource://data/ntf_r93_b.gsb"); + public static final NTV2GridShiftFileWrapper BETA2007 = new NTV2GridShiftFileWrapper("resource://data/BETA2007.gsb"); + public static final NTV2GridShiftFileWrapper ntf_rgf93 = new NTV2GridShiftFileWrapper("resource://data/ntf_r93_b.gsb"); private NTV2GridShiftFile instance = null; Index: src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java =================================================================== --- src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java (revision 6084) +++ src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java (working copy) @@ -18,7 +18,7 @@ protected Ellipsoid ellps; protected double e; - public static abstract class Parameters { + public abstract static class Parameters { public final double latitudeOrigin; public Parameters(double latitudeOrigin) { this.latitudeOrigin = latitudeOrigin; Index: src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java =================================================================== --- src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java (revision 6084) +++ src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java (working copy) @@ -85,17 +85,17 @@ } } - protected final static int DUPLICATE_NODE = 1; - protected final static int DUPLICATE_NODE_MIXED = 2; - protected final static int DUPLICATE_NODE_OTHER = 3; - protected final static int DUPLICATE_NODE_BUILDING = 10; - protected final static int DUPLICATE_NODE_BOUNDARY = 11; - protected final static int DUPLICATE_NODE_HIGHWAY = 12; - protected final static int DUPLICATE_NODE_LANDUSE = 13; - protected final static int DUPLICATE_NODE_NATURAL = 14; - protected final static int DUPLICATE_NODE_POWER = 15; - protected final static int DUPLICATE_NODE_RAILWAY = 16; - protected final static int DUPLICATE_NODE_WATERWAY = 17; + protected static final int DUPLICATE_NODE = 1; + protected static final int DUPLICATE_NODE_MIXED = 2; + protected static final int DUPLICATE_NODE_OTHER = 3; + protected static final int DUPLICATE_NODE_BUILDING = 10; + protected static final int DUPLICATE_NODE_BOUNDARY = 11; + protected static final int DUPLICATE_NODE_HIGHWAY = 12; + protected static final int DUPLICATE_NODE_LANDUSE = 13; + protected static final int DUPLICATE_NODE_NATURAL = 14; + protected static final int DUPLICATE_NODE_POWER = 15; + protected static final int DUPLICATE_NODE_RAILWAY = 16; + protected static final int DUPLICATE_NODE_WATERWAY = 17; /** The map of potential duplicates. * Index: src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java =================================================================== --- src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java (revision 6084) +++ src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java (working copy) @@ -26,7 +26,7 @@ * */ public class ConditionalOptionPaneUtil { - static public final int DIALOG_DISABLED_OPTION = Integer.MIN_VALUE; + public static final int DIALOG_DISABLED_OPTION = Integer.MIN_VALUE; /** * this is a static utility class only @@ -101,7 +101,7 @@ * * @return the option selected by user. {@link JOptionPane#CLOSED_OPTION} if the dialog was closed. */ - static public int showOptionDialog(String preferenceKey, Component parent, Object message, String title, int optionType, int messageType, Object [] options, Object defaultOption) throws HeadlessException { + public static int showOptionDialog(String preferenceKey, Component parent, Object message, String title, int optionType, int messageType, Object [] options, Object defaultOption) throws HeadlessException { int ret = getDialogReturnValue(preferenceKey); if (!getDialogShowingEnabled(preferenceKey) && ((ret == JOptionPane.YES_OPTION) || (ret == JOptionPane.NO_OPTION))) return ret; @@ -146,7 +146,7 @@ * @see JOptionPane#WARNING_MESSAGE * @see JOptionPane#ERROR_MESSAGE */ - static public boolean showConfirmationDialog(String preferenceKey, Component parent, Object message, String title, int optionType, int messageType, int trueOption) throws HeadlessException { + public static boolean showConfirmationDialog(String preferenceKey, Component parent, Object message, String title, int optionType, int messageType, int trueOption) throws HeadlessException { int ret = getDialogReturnValue(preferenceKey); if (!getDialogShowingEnabled(preferenceKey) && ((ret == JOptionPane.YES_OPTION) || (ret == JOptionPane.NO_OPTION))) return ret == trueOption; @@ -177,7 +177,7 @@ * @see JOptionPane#WARNING_MESSAGE * @see JOptionPane#ERROR_MESSAGE */ - static public void showMessageDialog(String preferenceKey, Component parent, Object message, String title,int messageType) { + public static void showMessageDialog(String preferenceKey, Component parent, Object message, String title,int messageType) { if (!getDialogShowingEnabled(preferenceKey)) return; MessagePanel pnl = new MessagePanel(false, message); Index: src/org/openstreetmap/josm/gui/DefaultNameFormatter.java =================================================================== --- src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 6084) +++ src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (working copy) @@ -46,7 +46,7 @@ */ public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter { - static private DefaultNameFormatter instance; + private static DefaultNameFormatter instance; private static final LinkedList formatHooks = new LinkedList(); @@ -55,7 +55,7 @@ * * @return the unique instance of this formatter */ - static public DefaultNameFormatter getInstance() { + public static DefaultNameFormatter getInstance() { if (instance == null) { instance = new DefaultNameFormatter(); } @@ -90,11 +90,11 @@ /** The default list of tags which are used as naming tags in relations. * A ? prefix indicates a boolean value, for which the key (instead of the value) is used. */ - static public final String[] DEFAULT_NAMING_TAGS_FOR_RELATIONS = {"name", "ref", "restriction", "landuse", "natural", + public static final String[] DEFAULT_NAMING_TAGS_FOR_RELATIONS = {"name", "ref", "restriction", "landuse", "natural", "public_transport", ":LocationCode", "note", "?building"}; /** the current list of tags used as naming tags in relations */ - static private List namingTagsForRelations = null; + private static List namingTagsForRelations = null; /** * Replies the list of naming tags used in relations. The list is given (in this order) by: @@ -105,7 +105,7 @@ * * @return the list of naming tags used in relations */ - static public List getNamingtagsForRelations() { + public static List getNamingtagsForRelations() { if (namingTagsForRelations == null) { namingTagsForRelations = new ArrayList( Main.pref.getCollection("relation.nameOrder", Arrays.asList(DEFAULT_NAMING_TAGS_FOR_RELATIONS)) Index: src/org/openstreetmap/josm/gui/FileDrop.java =================================================================== --- src/org/openstreetmap/josm/gui/FileDrop.java (revision 6084) +++ src/org/openstreetmap/josm/gui/FileDrop.java (working copy) @@ -729,7 +729,7 @@ * * @since 1.1 */ - public final static String MIME_TYPE = "application/x-net.iharder.dnd.TransferableObject"; + public static final String MIME_TYPE = "application/x-net.iharder.dnd.TransferableObject"; /** * The default {@link java.awt.datatransfer.DataFlavor} for @@ -740,7 +740,7 @@ * * @since 1.1 */ - public final static java.awt.datatransfer.DataFlavor DATA_FLAVOR = + public static final java.awt.datatransfer.DataFlavor DATA_FLAVOR = new java.awt.datatransfer.DataFlavor( FileDrop.TransferableObject.class, MIME_TYPE ); private Fetcher fetcher; Index: src/org/openstreetmap/josm/gui/GettingStarted.java =================================================================== --- src/org/openstreetmap/josm/gui/GettingStarted.java (revision 6084) +++ src/org/openstreetmap/josm/gui/GettingStarted.java (working copy) @@ -68,9 +68,9 @@ super("motd.html", CacheCustomContent.INTERVAL_DAILY); } - final private int myVersion = Version.getInstance().getVersion(); - final private String myJava = System.getProperty("java.version"); - final private String myLang = LanguageInfo.getWikiLanguagePrefix(); + private final int myVersion = Version.getInstance().getVersion(); + private final String myJava = System.getProperty("java.version"); + private final String myLang = LanguageInfo.getWikiLanguagePrefix(); /** * This function gets executed whenever the cached files need updating Index: src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java =================================================================== --- src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java (revision 6084) +++ src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java (working copy) @@ -101,7 +101,7 @@ } } - static private class DefaultAction extends AbstractAction { + private static class DefaultAction extends AbstractAction { private JDialog dialog; private JOptionPane pane; private int value; @@ -127,7 +127,7 @@ * to the context sensitive help of the whole dialog * @return the list of buttons */ - static private List createOptionButtons(ButtonSpec[] options, String helpTopic) { + private static List createOptionButtons(ButtonSpec[] options, String helpTopic) { List buttons = new ArrayList(); if (options == null) { JButton b = new JButton(tr("OK")); @@ -162,7 +162,7 @@ * @param helpTopic the help topic * @return the help button */ - static private JButton createHelpButton(final String helpTopic) { + private static JButton createHelpButton(final String helpTopic) { JButton b = new JButton(tr("Help")); b.setIcon(ImageProvider.get("help")); b.setToolTipText(tr("Show help information")); @@ -206,7 +206,7 @@ * @param helpTopic the help topic. Can be null. * @return the index of the selected option or {@link JOptionPane#CLOSED_OPTION} */ - static public int showOptionDialog(Component parentComponent, Object msg, String title, int messageType, Icon icon, final ButtonSpec[] options, final ButtonSpec defaultOption, final String helpTopic) { + public static int showOptionDialog(Component parentComponent, Object msg, String title, int messageType, Icon icon, final ButtonSpec[] options, final ButtonSpec defaultOption, final String helpTopic) { final List buttons = createOptionButtons(options, helpTopic); if (helpTopic != null) { buttons.add(createHelpButton(helpTopic)); @@ -313,7 +313,7 @@ * @return the index of the selected option or {@link JOptionPane#CLOSED_OPTION} * @see #showOptionDialog(Component, Object, String, int, Icon, ButtonSpec[], ButtonSpec, String) */ - static public int showOptionDialog(Component parentComponent, Object msg, String title, int messageType,final String helpTopic) { + public static int showOptionDialog(Component parentComponent, Object msg, String title, int messageType,final String helpTopic) { return showOptionDialog(parentComponent, msg, title, messageType, null,null,null, helpTopic); } @@ -324,7 +324,7 @@ * It can be used, when you need to show a message dialog from a worker thread, * e.g. from PleaseWaitRunnable */ - static public void showMessageDialogInEDT(final Component parentComponent, final Object msg, final String title, final int messageType, final String helpTopic) { + public static void showMessageDialogInEDT(final Component parentComponent, final Object msg, final String title, final int messageType, final String helpTopic) { GuiHelper.runInEDT(new Runnable() { @Override public void run() { Index: src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java =================================================================== --- src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (revision 6084) +++ src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (working copy) @@ -49,14 +49,14 @@ */ public class JosmUserIdentityManager implements PreferenceChangedListener{ - static private JosmUserIdentityManager instance; + private static JosmUserIdentityManager instance; /** * Replies the unique instance of the JOSM user identity manager * * @return the unique instance of the JOSM user identity manager */ - static public JosmUserIdentityManager getInstance() { + public static JosmUserIdentityManager getInstance() { if (instance == null) { instance = new JosmUserIdentityManager(); if (Main.pref.get("osm-server.auth-method").equals("oauth") && OAuthAccessTokenHolder.getInstance().containsAccessToken()) { Index: src/org/openstreetmap/josm/gui/MainApplet.java =================================================================== --- src/org/openstreetmap/josm/gui/MainApplet.java (revision 6084) +++ src/org/openstreetmap/josm/gui/MainApplet.java (working copy) @@ -34,7 +34,7 @@ public class MainApplet extends JApplet { - final static JFrame frame = new JFrame("Java OpenStreetMap Editor"); + static final JFrame frame = new JFrame("Java OpenStreetMap Editor"); public static final class UploadPreferencesAction extends JosmAction { public UploadPreferencesAction() { @@ -56,7 +56,7 @@ } } - private final static String[][] paramInfo = { + private static final String[][] paramInfo = { {"username", tr("string"), tr("Name of the user.")}, {"password", tr("string"), tr("OSM Password.")}, {"geometry", tr("string"), tr("Resize the applet to the given geometry (format: WIDTHxHEIGHT)")}, Index: src/org/openstreetmap/josm/gui/MainMenu.java =================================================================== --- src/org/openstreetmap/josm/gui/MainMenu.java (revision 6084) +++ src/org/openstreetmap/josm/gui/MainMenu.java (working copy) @@ -267,7 +267,7 @@ * usage is make menus not look broken if separators are used to group the menu and some of * these groups are empty. */ - public final static MenuListener menuSeparatorHandler = new MenuListener() { + public static final MenuListener menuSeparatorHandler = new MenuListener() { @Override public void menuCanceled(MenuEvent arg0) {} @Override Index: src/org/openstreetmap/josm/gui/MapScaler.java =================================================================== --- src/org/openstreetmap/josm/gui/MapScaler.java (revision 6084) +++ src/org/openstreetmap/josm/gui/MapScaler.java (working copy) @@ -40,7 +40,7 @@ g.drawString("0", 0, 23); } - static public Color getColor() + public static Color getColor() { return Main.pref.getColor(marktr("scale"), Color.white); } Index: src/org/openstreetmap/josm/gui/MultiSplitLayout.java =================================================================== --- src/org/openstreetmap/josm/gui/MultiSplitLayout.java (revision 6084) +++ src/org/openstreetmap/josm/gui/MultiSplitLayout.java (working copy) @@ -844,7 +844,7 @@ /** * Base class for the nodes that model a MultiSplitLayout. */ - public static abstract class Node { + public abstract static class Node { private Split parent = null; private Rectangle bounds = new Rectangle(); private double weight = 0.0; Index: src/org/openstreetmap/josm/gui/MultiSplitPane.java =================================================================== --- src/org/openstreetmap/josm/gui/MultiSplitPane.java (revision 6084) +++ src/org/openstreetmap/josm/gui/MultiSplitPane.java (working copy) @@ -145,7 +145,7 @@ * @see #getDividerPainter * @see #setDividerPainter */ - public static abstract class DividerPainter { + public abstract static class DividerPainter { /** * Paint a single Divider. * Index: src/org/openstreetmap/josm/gui/SideButton.java =================================================================== --- src/org/openstreetmap/josm/gui/SideButton.java (revision 6084) +++ src/org/openstreetmap/josm/gui/SideButton.java (working copy) @@ -24,7 +24,7 @@ * Button that is usually used in toggle dialogs */ public class SideButton extends JButton implements Destroyable { - private final static int iconHeight = 20; + private static final int iconHeight = 20; private PropertyChangeListener propertyChangeListener; Index: src/org/openstreetmap/josm/gui/SplashScreen.java =================================================================== --- src/org/openstreetmap/josm/gui/SplashScreen.java (revision 6084) +++ src/org/openstreetmap/josm/gui/SplashScreen.java (working copy) @@ -108,7 +108,7 @@ return progressMonitor; } - static private class SplashScreenProgressRenderer extends JPanel implements ProgressRenderer { + private static class SplashScreenProgressRenderer extends JPanel implements ProgressRenderer { private JLabel lblTaskTitle; private JLabel lblCustomText; private JProgressBar progressBar; Index: src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java (revision 6084) +++ src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java (working copy) @@ -50,14 +50,14 @@ */ public class DeleteFromRelationConfirmationDialog extends JDialog implements TableModelListener { /** the unique instance of this dialog */ - static private DeleteFromRelationConfirmationDialog instance; + private static DeleteFromRelationConfirmationDialog instance; /** * Replies the unique instance of this dialog * * @return The unique instance of this dialog */ - static public DeleteFromRelationConfirmationDialog getInstance() { + public static DeleteFromRelationConfirmationDialog getInstance() { if (instance == null) { instance = new DeleteFromRelationConfirmationDialog(); } Index: src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java =================================================================== --- src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 6084) +++ src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (working copy) @@ -215,8 +215,8 @@ * when the user successfully enters a valid tile grid specification. * */ - static private class TileGridInputPanel extends JPanel implements PropertyChangeListener{ - static public final String TILE_BOUNDS_PROP = TileGridInputPanel.class.getName() + ".tileBounds"; + private static class TileGridInputPanel extends JPanel implements PropertyChangeListener{ + public static final String TILE_BOUNDS_PROP = TileGridInputPanel.class.getName() + ".tileBounds"; private JosmTextField tfMaxY; private JosmTextField tfMinY; @@ -438,9 +438,9 @@ * A panel for entering the address of a single OSM tile at a given zoom level. * */ - static private class TileAddressInputPanel extends JPanel { + private static class TileAddressInputPanel extends JPanel { - static public final String TILE_BOUNDS_PROP = TileAddressInputPanel.class.getName() + ".tileBounds"; + public static final String TILE_BOUNDS_PROP = TileAddressInputPanel.class.getName() + ".tileBounds"; private JosmTextField tfTileAddress; private TileAddressValidator valTileAddress; @@ -527,7 +527,7 @@ /** * Validates a tile address */ - static private class TileAddressValidator extends AbstractTextComponentValidator { + private static class TileAddressValidator extends AbstractTextComponentValidator { private TileBounds tileBounds = null; @@ -586,7 +586,7 @@ * Validates the x- or y-coordinate of a tile at a given zoom level. * */ - static private class TileCoordinateValidator extends AbstractTextComponentValidator { + private static class TileCoordinateValidator extends AbstractTextComponentValidator { private int zoomLevel; private int tileIndex; @@ -634,7 +634,7 @@ * Represents a rectangular area of tiles at a given zoom level. * */ - static private class TileBounds { + private static class TileBounds { public Point min; public Point max; public int zoomLevel; @@ -664,7 +664,7 @@ /** * The map view used in this bounding box chooser */ - static private class TileBoundsMapView extends JMapViewer { + private static class TileBoundsMapView extends JMapViewer { private Point min; private Point max; Index: src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (revision 6084) +++ src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (working copy) @@ -55,16 +55,16 @@ /** name of the property indicating whether all conflicts are resolved, * {@link #isResolvedCompletely()} */ - static public final String RESOLVED_COMPLETELY_PROP = ConflictResolver.class.getName() + ".resolvedCompletely"; + public static final String RESOLVED_COMPLETELY_PROP = ConflictResolver.class.getName() + ".resolvedCompletely"; /** * name of the property for the {@link OsmPrimitive} in the role "my" */ - static public final String MY_PRIMITIVE_PROP = ConflictResolver.class.getName() + ".myPrimitive"; + public static final String MY_PRIMITIVE_PROP = ConflictResolver.class.getName() + ".myPrimitive"; /** * name of the property for the {@link OsmPrimitive} in the role "my" */ - static public final String THEIR_PRIMITIVE_PROP = ConflictResolver.class.getName() + ".theirPrimitive"; + public static final String THEIR_PRIMITIVE_PROP = ConflictResolver.class.getName() + ".theirPrimitive"; private JTabbedPane tabbedPane = null; private TagMerger tagMerger; Index: src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 6084) +++ src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (working copy) @@ -89,9 +89,9 @@ private JLabel lblFrozenState; - abstract protected JScrollPane buildMyElementsTable(); - abstract protected JScrollPane buildMergedElementsTable(); - abstract protected JScrollPane buildTheirElementsTable(); + protected abstract JScrollPane buildMyElementsTable(); + protected abstract JScrollPane buildMergedElementsTable(); + protected abstract JScrollPane buildTheirElementsTable(); protected JScrollPane embeddInScrollPane(JTable table) { JScrollPane pane = new JScrollPane(table); @@ -813,7 +813,7 @@ } } - static public interface FreezeActionProperties { + public static interface FreezeActionProperties { String PROP_SELECTED = FreezeActionProperties.class.getName() + ".selected"; } Index: src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java (revision 6084) +++ src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java (working copy) @@ -38,8 +38,8 @@ */ public class PropertiesMergeModel extends Observable { - static public final String RESOLVED_COMPLETELY_PROP = PropertiesMergeModel.class.getName() + ".resolvedCompletely"; - static public final String DELETE_PRIMITIVE_PROP = PropertiesMergeModel.class.getName() + ".deletePrimitive"; + public static final String RESOLVED_COMPLETELY_PROP = PropertiesMergeModel.class.getName() + ".resolvedCompletely"; + public static final String DELETE_PRIMITIVE_PROP = PropertiesMergeModel.class.getName() + ".deletePrimitive"; private OsmPrimitive my; Index: src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java (revision 6084) +++ src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java (working copy) @@ -29,7 +29,7 @@ * */ public class TagMergeModel extends DefaultTableModel { - static public final String PROP_NUM_UNDECIDED_TAGS = TagMergeModel.class.getName() + ".numUndecidedTags"; + public static final String PROP_NUM_UNDECIDED_TAGS = TagMergeModel.class.getName() + ".numUndecidedTags"; /** the list of tag merge items */ private final List tagMergeItems; Index: src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (revision 6084) +++ src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (working copy) @@ -86,7 +86,7 @@ public class CombinePrimitiveResolverDialog extends JDialog { /** the unique instance of the dialog */ - static private CombinePrimitiveResolverDialog instance; + private static CombinePrimitiveResolverDialog instance; /** * Replies the unique instance of the dialog Index: src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java (revision 6084) +++ src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java (working copy) @@ -145,7 +145,7 @@ * The cell renderer used in the combo box * */ - static private class EditorCellRenderer extends JLabel implements ListCellRenderer { + private static class EditorCellRenderer extends JLabel implements ListCellRenderer { public EditorCellRenderer() { setOpaque(true); Index: src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (revision 6084) +++ src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (working copy) @@ -42,7 +42,7 @@ import org.openstreetmap.josm.tools.WindowGeometry; public class PasteTagsConflictResolverDialog extends JDialog implements PropertyChangeListener { - static private final Map PANE_TITLES; + private static final Map PANE_TITLES; static { PANE_TITLES = new HashMap(); PANE_TITLES.put(OsmPrimitiveType.NODE, tr("Tags from nodes")); @@ -352,7 +352,7 @@ } } - static public class StatisticsInfo { + public static class StatisticsInfo { public int numTags; public Map sourceInfo; public Map targetInfo; @@ -363,7 +363,7 @@ } } - static private class StatisticsTableColumnModel extends DefaultTableColumnModel { + private static class StatisticsTableColumnModel extends DefaultTableColumnModel { public StatisticsTableColumnModel() { TableCellRenderer renderer = new StatisticsInfoRenderer(); TableColumn col = null; @@ -391,7 +391,7 @@ } } - static private class StatisticsTableModel extends DefaultTableModel { + private static class StatisticsTableModel extends DefaultTableModel { private static final String[] HEADERS = new String[] {tr("Paste ..."), tr("From ..."), tr("To ...") }; private List data; @@ -430,7 +430,7 @@ } } - static private class StatisticsInfoRenderer extends JLabel implements TableCellRenderer { + private static class StatisticsInfoRenderer extends JLabel implements TableCellRenderer { protected void reset() { setIcon(null); setText(""); @@ -497,7 +497,7 @@ } } - static private class StatisticsInfoTable extends JPanel { + private static class StatisticsInfoTable extends JPanel { private JTable infoTable; Index: src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java (revision 6084) +++ src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java (working copy) @@ -22,7 +22,7 @@ */ UNDECIDED; - static public void prepareLabel(RelationMemberConflictDecisionType decision, JLabel label) { + public static void prepareLabel(RelationMemberConflictDecisionType decision, JLabel label) { switch(decision) { case REMOVE: label.setText(tr("Remove")); Index: src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java (revision 6084) +++ src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java (working copy) @@ -27,7 +27,7 @@ */ public class RelationMemberConflictResolverModel extends DefaultTableModel { /** the property name for the number conflicts managed by this model */ - static public final String NUM_CONFLICTS_PROP = RelationMemberConflictResolverModel.class.getName() + ".numConflicts"; + public static final String NUM_CONFLICTS_PROP = RelationMemberConflictResolverModel.class.getName() + ".numConflicts"; /** the list of conflict decisions */ private List decisions; Index: src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (revision 6084) +++ src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (working copy) @@ -18,7 +18,7 @@ import org.openstreetmap.josm.tools.CheckParameterUtil; public class TagConflictResolverModel extends DefaultTableModel { - static public final String NUM_CONFLICTS_PROP = TagConflictResolverModel.class.getName() + ".numConflicts"; + public static final String NUM_CONFLICTS_PROP = TagConflictResolverModel.class.getName() + ".numConflicts"; private TagCollection tags; private List displayedKeys; Index: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 6084) +++ src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (working copy) @@ -71,7 +71,7 @@ * @since 1221 * @see #paintConflicts */ - static public Color getColor() { + public static Color getColor() { return Main.pref.getColor(marktr("conflict"), Color.gray); } Index: src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java (revision 6084) +++ src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java (working copy) @@ -19,14 +19,14 @@ public class DialogsPanel extends JPanel { protected List allDialogs = new ArrayList(); protected MultiSplitPane mSpltPane = new MultiSplitPane(); - final protected int DIVIDER_SIZE = 5; + protected final int DIVIDER_SIZE = 5; /** * Panels that are added to the multisplitpane. */ private List panels = new ArrayList(); - final private JSplitPane parent; + private final JSplitPane parent; public DialogsPanel(JSplitPane parent) { this.parent = parent; } Index: src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 6084) +++ src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (working copy) @@ -79,14 +79,14 @@ */ public class LayerListDialog extends ToggleDialog { /** the unique instance of the dialog */ - static private LayerListDialog instance; + private static LayerListDialog instance; /** * Creates the instance of the dialog. It's connected to the map frame mapFrame * * @param mapFrame the map frame */ - static public void createInstance(MapFrame mapFrame) { + public static void createInstance(MapFrame mapFrame) { if (instance != null) throw new IllegalStateException("Dialog was already created"); instance = new LayerListDialog(mapFrame); @@ -99,7 +99,7 @@ * @throws IllegalStateException thrown, if the dialog is not created yet * @see #createInstance(MapFrame) */ - static public LayerListDialog getInstance() throws IllegalStateException { + public static LayerListDialog getInstance() throws IllegalStateException { if (instance == null) throw new IllegalStateException("Dialog not created yet. Invoke createInstance() first"); return instance; Index: src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java (revision 6084) +++ src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java (working copy) @@ -27,7 +27,7 @@ */ public class LayerListPopup extends JPopupMenu { - public final static class InfoAction extends AbstractAction { + public static final class InfoAction extends AbstractAction { private final Layer layer; public InfoAction(Layer layer) { super(tr("Info"), ImageProvider.get("info")); Index: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 6084) +++ src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (working copy) @@ -403,7 +403,7 @@ * JOSM selection. * */ - static private class SelectionListModel extends AbstractListModel implements EditLayerChangeListener, SelectionChangedListener, DataSetListener{ + private static class SelectionListModel extends AbstractListModel implements EditLayerChangeListener, SelectionChangedListener, DataSetListener{ private static final int SELECTION_HISTORY_SIZE = 10; @@ -651,7 +651,7 @@ * @author Jan Peter Stotz */ protected static class SearchMenuItem extends JMenuItem implements ActionListener { - final protected SearchSetting s; + protected final SearchSetting s; public SearchMenuItem(SearchSetting s) { super(s.toString()); @@ -670,7 +670,7 @@ * */ protected static class SearchPopupMenu extends JPopupMenu { - static public void launch(Component parent) { + public static void launch(Component parent) { if (org.openstreetmap.josm.actions.search.SearchAction.getSearchHistory().isEmpty()) return; JPopupMenu menu = new SearchPopupMenu(); @@ -691,7 +691,7 @@ * @author Jan Peter Stotz */ protected static class SelectionMenuItem extends JMenuItem implements ActionListener { - final private DefaultNameFormatter df = DefaultNameFormatter.getInstance(); + private final DefaultNameFormatter df = DefaultNameFormatter.getInstance(); protected Collection sel; public SelectionMenuItem(Collection sel) { @@ -750,7 +750,7 @@ * The popup menu for the JOSM selection history entries */ protected static class SelectionHistoryPopup extends JPopupMenu { - static public void launch(Component parent, Collection> history) { + public static void launch(Component parent, Collection> history) { if (history == null || history.isEmpty()) return; JPopupMenu menu = new SelectionHistoryPopup(history); Rectangle r = parent.getBounds(); @@ -765,7 +765,7 @@ } /** Quicker comparator, comparing just by type and ID's */ - static private class OsmPrimitiveQuickComparator implements Comparator { + private static class OsmPrimitiveQuickComparator implements Comparator { private int compareId(OsmPrimitive a, OsmPrimitive b) { long id_a=a.getUniqueId(); Index: src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 6084) +++ src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (working copy) @@ -97,7 +97,7 @@ /** The action to toggle this dialog */ protected final ToggleDialogAction toggleAction; protected String preferencePrefix; - final protected String name; + protected final String name; /** DialogsPanel that manages all ToggleDialogs */ protected DialogsPanel dialogsPanel; @@ -450,8 +450,8 @@ * */ protected class TitleBar extends JPanel { - final private JLabel lblTitle; - final private JComponent lblTitle_weak; + private final JLabel lblTitle; + private final JComponent lblTitle_weak; public TitleBar(String toggleDialogName, String iconName) { setLayout(new GridBagLayout()); Index: src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java (revision 6084) +++ src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java (working copy) @@ -27,7 +27,7 @@ public class ChangesetCacheManagerModel extends AbstractTableModel implements ChangesetCacheListener{ /** the name of the property for the currently selected changeset in the detail view */ - public final static String CHANGESET_IN_DETAIL_VIEW_PROP = ChangesetCacheManagerModel.class.getName() + ".changesetInDetailView"; + public static final String CHANGESET_IN_DETAIL_VIEW_PROP = ChangesetCacheManagerModel.class.getName() + ".changesetInDetailView"; private final ArrayList data = new ArrayList(); private DefaultListSelectionModel selectionModel; Index: src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java (revision 6084) +++ src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java (working copy) @@ -427,7 +427,7 @@ } } - static private class HeaderPanel extends JPanel { + private static class HeaderPanel extends JPanel { private JMultilineLabel lblMessage; private Changeset current; Index: src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java (revision 6084) +++ src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java (working copy) @@ -138,7 +138,7 @@ * with their {@link ChangesetModificationType}. * */ - static private class ChangesetContentEntry implements ChangesetDataSetEntry{ + private static class ChangesetContentEntry implements ChangesetDataSetEntry{ private final ChangesetModificationType modificationType; private final HistoryOsmPrimitive primitive; Index: src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java (revision 6084) +++ src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java (working copy) @@ -43,7 +43,7 @@ * @param changesets the collection of changesets. Assumes an empty collection if null. * @return the download task */ - static public ChangesetHeaderDownloadTask buildTaskForChangesets(Collection changesets) { + public static ChangesetHeaderDownloadTask buildTaskForChangesets(Collection changesets) { return buildTaskForChangesets(Main.parent, changesets); } @@ -58,7 +58,7 @@ * @return the download task * @throws IllegalArgumentException thrown if parent is null */ - static public ChangesetHeaderDownloadTask buildTaskForChangesets(Component parent, Collection changesets) { + public static ChangesetHeaderDownloadTask buildTaskForChangesets(Component parent, Collection changesets) { CheckParameterUtil.ensureParameterNotNull(parent, "parent"); if (changesets == null) { changesets = Collections.emptyList(); Index: src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 6084) +++ src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (working copy) @@ -278,7 +278,7 @@ * This is the panel for selecting whether the changeset query should be restricted to * open or closed changesets */ - static private class OpenAndCloseStateRestrictionPanel extends JPanel { + private static class OpenAndCloseStateRestrictionPanel extends JPanel { private JRadioButton rbOpenOnly; private JRadioButton rbClosedOnly; @@ -371,7 +371,7 @@ * user * */ - static private class UserRestrictionPanel extends JPanel { + private static class UserRestrictionPanel extends JPanel { private ButtonGroup bgUserRestrictions; private JRadioButton rbRestrictToMyself; private JRadioButton rbRestrictToUid; @@ -633,7 +633,7 @@ /** * This is the panel to apply a time restriction to the changeset query */ - static private class TimeRestrictionPanel extends JPanel { + private static class TimeRestrictionPanel extends JPanel { private JRadioButton rbClosedAfter; private JRadioButton rbClosedAfterAndCreatedBefore; @@ -926,7 +926,7 @@ } } - static private class BBoxRestrictionPanel extends BoundingBoxSelectionPanel { + private static class BBoxRestrictionPanel extends BoundingBoxSelectionPanel { public BBoxRestrictionPanel() { setBorder(BorderFactory.createCompoundBorder( BorderFactory.createEmptyBorder(3,3,3,3), @@ -966,8 +966,8 @@ * Validator for user ids entered in in a {@link JTextComponent}. * */ - static private class UidInputFieldValidator extends AbstractTextComponentValidator { - static public UidInputFieldValidator decorate(JTextComponent tc) { + private static class UidInputFieldValidator extends AbstractTextComponentValidator { + public static UidInputFieldValidator decorate(JTextComponent tc) { return new UidInputFieldValidator(tc); } @@ -1013,8 +1013,8 @@ } } - static private class UserNameInputValidator extends AbstractTextComponentValidator { - static public UserNameInputValidator decorate(JTextComponent tc) { + private static class UserNameInputValidator extends AbstractTextComponentValidator { + public static UserNameInputValidator decorate(JTextComponent tc) { return new UserNameInputValidator(tc); } @@ -1044,8 +1044,8 @@ * * Dates can be entered in one of four standard formats defined for the current locale. */ - static private class DateValidator extends AbstractTextComponentValidator { - static public DateValidator decorate(JTextComponent tc) { + private static class DateValidator extends AbstractTextComponentValidator { + public static DateValidator decorate(JTextComponent tc) { return new DateValidator(tc); } @@ -1107,8 +1107,8 @@ * * Time values can be entered in one of four standard formats defined for the current locale. */ - static private class TimeValidator extends AbstractTextComponentValidator { - static public TimeValidator decorate(JTextComponent tc) { + private static class TimeValidator extends AbstractTextComponentValidator { + public static TimeValidator decorate(JTextComponent tc) { return new TimeValidator(tc); } Index: src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java (revision 6084) +++ src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java (working copy) @@ -17,11 +17,11 @@ * */ public abstract class MemberTableCellRenderer extends JLabel implements TableCellRenderer { - public final static Color BGCOLOR_EMPTY_ROW = new Color(234, 234, 234); - public final static Color BGCOLOR_IN_JOSM_SELECTION = new Color(235,255,177); + public static final Color BGCOLOR_EMPTY_ROW = new Color(234, 234, 234); + public static final Color BGCOLOR_IN_JOSM_SELECTION = new Color(235,255,177); - public final static Color BGCOLOR_NOT_IN_OPPOSITE = new Color(255, 197, 197); - public final static Color BGCOLOR_DOUBLE_ENTRY = new Color(254,226,214); + public static final Color BGCOLOR_NOT_IN_OPPOSITE = new Color(255, 197, 197); + public static final Color BGCOLOR_DOUBLE_ENTRY = new Color(254,226,214); /** * constructor @@ -65,7 +65,7 @@ } @Override - abstract public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, + public abstract Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column); /** Index: src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java (revision 6084) +++ src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java (working copy) @@ -16,11 +16,11 @@ public class MemberTableLinkedCellRenderer extends MemberTableCellRenderer { - final static Image arrowUp = ImageProvider.get("dialogs/relation", "arrowup").getImage(); - final static Image arrowDown = ImageProvider.get("dialogs/relation", "arrowdown").getImage(); - final static Image corners = ImageProvider.get("dialogs/relation", "roundedcorners").getImage(); - final static Image roundabout_right = ImageProvider.get("dialogs/relation", "roundabout_right_tiny").getImage(); - final static Image roundabout_left = ImageProvider.get("dialogs/relation", "roundabout_left_tiny").getImage(); + static final Image arrowUp = ImageProvider.get("dialogs/relation", "arrowup").getImage(); + static final Image arrowDown = ImageProvider.get("dialogs/relation", "arrowdown").getImage(); + static final Image corners = ImageProvider.get("dialogs/relation", "roundedcorners").getImage(); + static final Image roundabout_right = ImageProvider.get("dialogs/relation", "roundabout_right_tiny").getImage(); + static final Image roundabout_left = ImageProvider.get("dialogs/relation", "roundabout_left_tiny").getImage(); private WayConnectionType value = new WayConnectionType(); @Override Index: src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java (revision 6084) +++ src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java (working copy) @@ -27,7 +27,7 @@ * * @return the singleton {@link RelationDialogManager} */ - static public RelationDialogManager getRelationDialogManager() { + public static RelationDialogManager getRelationDialogManager() { if (RelationDialogManager.relationDialogManager == null) { RelationDialogManager.relationDialogManager = new RelationDialogManager(); MapView.addLayerChangeListener(RelationDialogManager.relationDialogManager); @@ -40,7 +40,7 @@ * is open for a specific relation managed by a specific {@link OsmDataLayer} * */ - static private class DialogContext { + private static class DialogContext { public final Relation relation; public final OsmDataLayer layer; Index: src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (revision 6084) +++ src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (working copy) @@ -22,12 +22,12 @@ * @see #setRelation(Relation) * @see #getRelation() */ - static public final String RELATION_PROP = RelationEditor.class.getName() + ".relation"; + public static final String RELATION_PROP = RelationEditor.class.getName() + ".relation"; /** the property name for the current relation snapshot * @see #getRelationSnapshot() */ - static public final String RELATION_SNAPSHOT_PROP = RelationEditor.class.getName() + ".relationSnapshot"; + public static final String RELATION_SNAPSHOT_PROP = RelationEditor.class.getName() + ".relationSnapshot"; /** the list of registered relation editor classes */ private static ArrayList> editors = new ArrayList>(); @@ -206,7 +206,7 @@ /* ----------------------------------------------------------------------- */ /* property change support */ /* ----------------------------------------------------------------------- */ - final private PropertyChangeSupport support = new PropertyChangeSupport(this); + private final PropertyChangeSupport support = new PropertyChangeSupport(this); @Override public void addPropertyChangeListener(PropertyChangeListener listener) { Index: src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRenderer.java (revision 6084) +++ src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRenderer.java (working copy) @@ -19,7 +19,7 @@ * */ public class RelationTreeCellRenderer extends JLabel implements TreeCellRenderer { - public final static Color BGCOLOR_SELECTED = new Color(143,170,255); + public static final Color BGCOLOR_SELECTED = new Color(143,170,255); /** the relation icon */ private ImageIcon icon; Index: src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java (revision 6084) +++ src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java (working copy) @@ -18,8 +18,8 @@ * */ public class SelectionTableCellRenderer extends JLabel implements TableCellRenderer { - public final static Color BGCOLOR_DOUBLE_ENTRY = new Color(254,226,214); - public final static Color BGCOLOR_SINGLE_ENTRY = new Color(235,255,177); + public static final Color BGCOLOR_DOUBLE_ENTRY = new Color(254,226,214); + public static final Color BGCOLOR_SINGLE_ENTRY = new Color(235,255,177); /** * reference to the member table model; required, in order to check whether a Index: src/org/openstreetmap/josm/gui/download/BookmarkSelection.java =================================================================== --- src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (revision 6084) +++ src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (working copy) @@ -48,7 +48,7 @@ /** displays information about the current download area */ private JMultilineLabel lblCurrentDownloadArea; - final private JosmTextArea bboxDisplay = new JosmTextArea(); + private final JosmTextArea bboxDisplay = new JosmTextArea(); /** the add action */ private AddAction actAdd; Index: src/org/openstreetmap/josm/gui/download/DownloadDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 6084) +++ src/org/openstreetmap/josm/gui/download/DownloadDialog.java (working copy) @@ -51,14 +51,14 @@ */ public class DownloadDialog extends JDialog { /** the unique instance of the download dialog */ - static private DownloadDialog instance; + private static DownloadDialog instance; /** * Replies the unique instance of the download dialog * * @return the unique instance of the download dialog */ - static public DownloadDialog getInstance() { + public static DownloadDialog getInstance() { if (instance == null) { instance = new DownloadDialog(Main.parent); } Index: src/org/openstreetmap/josm/gui/download/PlaceSelection.java =================================================================== --- src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 6084) +++ src/org/openstreetmap/josm/gui/download/PlaceSelection.java (working copy) @@ -70,7 +70,7 @@ private NamedResultTableColumnModel columnmodel; private JTable tblSearchResults; private DownloadDialog parent; - private final static Server[] servers = new Server[]{ + private static final Server[] servers = new Server[]{ new Server("Nominatim","http://nominatim.openstreetmap.org/search?format=xml&q=",tr("Class Type"),tr("Bounds")), //new Server("Namefinder","http://gazetteer.openstreetmap.org/namefinder/search.xml?find=",tr("Near"),trc("placeselection", "Zoom")) }; @@ -172,7 +172,7 @@ /** * Data storage for search results. */ - static private class SearchResult { + private static class SearchResult { public String name; public String info; public String nearestPlace; Index: src/org/openstreetmap/josm/gui/help/HelpBrowser.java =================================================================== --- src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 6084) +++ src/org/openstreetmap/josm/gui/help/HelpBrowser.java (working copy) @@ -68,7 +68,7 @@ * * @return the unique instance of the help browser */ - static public HelpBrowser getInstance() { + public static HelpBrowser getInstance() { if (instance == null) { instance = new HelpBrowser(); } @@ -99,7 +99,7 @@ * * @param helpTopic the help topic */ - static public void launchBrowser(String helpTopic) { + public static void launchBrowser(String helpTopic) { HelpBrowser browser = getInstance(); browser.openHelpTopic(helpTopic); browser.setVisible(true); Index: src/org/openstreetmap/josm/gui/help/HelpUtil.java =================================================================== --- src/org/openstreetmap/josm/gui/help/HelpUtil.java (revision 6084) +++ src/org/openstreetmap/josm/gui/help/HelpUtil.java (working copy) @@ -22,7 +22,7 @@ * * @return the base wiki URL */ - static public String getWikiBaseUrl() { + public static String getWikiBaseUrl() { return Main.pref.get("help.baseurl", "http://josm.openstreetmap.de"); } @@ -31,7 +31,7 @@ * * @return the base wiki URL for help pages */ - static public String getWikiBaseHelpUrl() { + public static String getWikiBaseHelpUrl() { return getWikiBaseUrl() + "/wiki"; } @@ -42,7 +42,7 @@ * @return the url * @see #buildAbsoluteHelpTopic */ - static public String getHelpTopicUrl(String absoluteHelpTopic) { + public static String getHelpTopicUrl(String absoluteHelpTopic) { if(absoluteHelpTopic == null) return null; String ret = getWikiBaseHelpUrl(); @@ -58,7 +58,7 @@ * @param absoluteHelpTopic the absolute help topic * @return the URL to the edit page */ - static public String getHelpTopicEditUrl(String absoluteHelpTopic) { + public static String getHelpTopicEditUrl(String absoluteHelpTopic) { String topicUrl = getHelpTopicUrl(absoluteHelpTopic); topicUrl = topicUrl.replaceAll("#[^#]*$", ""); // remove optional fragment return topicUrl + "?action=edit"; @@ -71,7 +71,7 @@ * @param url the url * @return the relative help topic in the URL, i.e. "/Action/New" */ - static public String extractRelativeHelpTopic(String url) { + public static String extractRelativeHelpTopic(String url) { String topic = extractAbsoluteHelpTopic(url); if (topic == null) return null; @@ -89,7 +89,7 @@ * @param url the url * @return the absolute help topic in the URL, i.e. "/De:Help/Action/New" */ - static public String extractAbsoluteHelpTopic(String url) { + public static String extractAbsoluteHelpTopic(String url) { if (!url.startsWith(getWikiBaseHelpUrl())) return null; url = url.substring(getWikiBaseHelpUrl().length()); String prefix = getHelpTopicPrefix(LocaleType.ENGLISH); @@ -114,7 +114,7 @@ * @return the help topic prefix * @since 5915 */ - static private String getHelpTopicPrefix(LocaleType type) { + private static String getHelpTopicPrefix(LocaleType type) { String ret = LanguageInfo.getWikiLanguagePrefix(type); if(ret == null) return ret; @@ -133,7 +133,7 @@ * @return the absolute, localized help topic * @since 5915 */ - static public String buildAbsoluteHelpTopic(String topic, LocaleType type) { + public static String buildAbsoluteHelpTopic(String topic, LocaleType type) { String prefix = getHelpTopicPrefix(type); if (prefix == null || topic == null || topic.trim().length() == 0 || topic.trim().equals("/")) return prefix; @@ -146,7 +146,7 @@ * * @return the help topic. null, if no context specific help topic is found */ - static public String getContextSpecificHelpTopic(Object context) { + public static String getContextSpecificHelpTopic(Object context) { if (context == null) return null; if (context instanceof Helpful) @@ -178,7 +178,7 @@ * * @return instance of help action */ - static private Action getHelpAction() { + private static Action getHelpAction() { try { return Main.main.menu.help; } catch(NullPointerException e) { @@ -196,7 +196,7 @@ * @param component the component the component * @param relativeHelpTopic the help topic. Set to the default help topic if null. */ - static public void setHelpContext(JComponent component, String relativeHelpTopic) { + public static void setHelpContext(JComponent component, String relativeHelpTopic) { if (relativeHelpTopic == null) { relativeHelpTopic = "/"; } @@ -219,7 +219,7 @@ * * @param helpTopic */ - static public String ht(String helpTopic) { + public static String ht(String helpTopic) { // this is just a marker method return helpTopic; } Index: src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java =================================================================== --- src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (revision 6084) +++ src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (working copy) @@ -28,7 +28,7 @@ public class CoordinateInfoViewer extends JPanel { /** background color used when the coordinates are different */ - public final static Color BGCOLOR_DIFFERENCE = new Color(255,197,197); + public static final Color BGCOLOR_DIFFERENCE = new Color(255,197,197); /** the model */ private HistoryBrowserModel model; Index: src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java =================================================================== --- src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (revision 6084) +++ src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (working copy) @@ -25,8 +25,8 @@ import org.openstreetmap.josm.tools.WindowGeometry; public class HistoryBrowserDialogManager implements MapView.LayerChangeListener { - static private HistoryBrowserDialogManager instance; - static public HistoryBrowserDialogManager getInstance() { + private static HistoryBrowserDialogManager instance; + public static HistoryBrowserDialogManager getInstance() { if (instance == null) { instance = new HistoryBrowserDialogManager(); } Index: src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java (revision 6084) +++ src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java (working copy) @@ -16,7 +16,7 @@ public class NodeListTableCellRenderer extends JLabel implements TableCellRenderer { - public final static Color BGCOLOR_SELECTED = new Color(143,170,255); + public static final Color BGCOLOR_SELECTED = new Color(143,170,255); private ImageIcon nodeIcon; Index: src/org/openstreetmap/josm/gui/history/NodeListViewer.java =================================================================== --- src/org/openstreetmap/josm/gui/history/NodeListViewer.java (revision 6084) +++ src/org/openstreetmap/josm/gui/history/NodeListViewer.java (working copy) @@ -284,7 +284,7 @@ } } - static private PrimitiveId primitiveIdAtRow(TableModel model, int row) { + private static PrimitiveId primitiveIdAtRow(TableModel model, int row) { DiffTableModel castedModel = (DiffTableModel) model; Long id = (Long)castedModel.getValueAt(row, 0).value; if(id == null) return null; Index: src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java (revision 6084) +++ src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java (working copy) @@ -24,10 +24,10 @@ */ public class RelationMemberListTableCellRenderer extends JLabel implements TableCellRenderer { - public final static Color BGCOLOR_EMPTY_ROW = new Color(234,234,234); - public final static Color BGCOLOR_NOT_IN_OPPOSITE = new Color(255,197,197); - public final static Color BGCOLOR_IN_OPPOSITE = new Color(255,234,213); - public final static Color BGCOLOR_SELECTED = new Color(143,170,255); + public static final Color BGCOLOR_EMPTY_ROW = new Color(234,234,234); + public static final Color BGCOLOR_NOT_IN_OPPOSITE = new Color(255,197,197); + public static final Color BGCOLOR_IN_OPPOSITE = new Color(255,234,213); + public static final Color BGCOLOR_SELECTED = new Color(143,170,255); private HashMap icons; Index: src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java =================================================================== --- src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java (revision 6084) +++ src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java (working copy) @@ -17,7 +17,7 @@ * */ public class TagTableCellRenderer extends JLabel implements TableCellRenderer { - public final static Color BGCOLOR_DIFFERENCE = new Color(255,197,197); + public static final Color BGCOLOR_DIFFERENCE = new Color(255,197,197); public TagTableCellRenderer() { setOpaque(true); Index: src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (revision 6084) +++ src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (working copy) @@ -47,8 +47,8 @@ * */ public class ChangesetManagementPanel extends JPanel implements ListDataListener{ - public final static String SELECTED_CHANGESET_PROP = ChangesetManagementPanel.class.getName() + ".selectedChangeset"; - public final static String CLOSE_CHANGESET_AFTER_UPLOAD = ChangesetManagementPanel.class.getName() + ".closeChangesetAfterUpload"; + public static final String SELECTED_CHANGESET_PROP = ChangesetManagementPanel.class.getName() + ".selectedChangeset"; + public static final String CLOSE_CHANGESET_AFTER_UPLOAD = ChangesetManagementPanel.class.getName() + ".closeChangesetAfterUpload"; private ButtonGroup bgUseNewOrExisting; private JRadioButton rbUseNew; Index: src/org/openstreetmap/josm/gui/io/CredentialDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/io/CredentialDialog.java (revision 6084) +++ src/org/openstreetmap/josm/gui/io/CredentialDialog.java (working copy) @@ -42,7 +42,7 @@ public class CredentialDialog extends JDialog { - static public CredentialDialog getOsmApiCredentialDialog(String username, String password, String host, String saveUsernameAndPasswordCheckboxText) { + public static CredentialDialog getOsmApiCredentialDialog(String username, String password, String host, String saveUsernameAndPasswordCheckboxText) { CredentialDialog dialog = new CredentialDialog(saveUsernameAndPasswordCheckboxText); if (Utils.equal(OsmApi.getOsmApi().getHost(), host)) { dialog.prepareForOsmApiCredentials(username, password); @@ -53,7 +53,7 @@ return dialog; } - static public CredentialDialog getHttpProxyCredentialDialog(String username, String password, String host, String saveUsernameAndPasswordCheckboxText) { + public static CredentialDialog getHttpProxyCredentialDialog(String username, String password, String host, String saveUsernameAndPasswordCheckboxText) { CredentialDialog dialog = new CredentialDialog(saveUsernameAndPasswordCheckboxText); dialog.prepareForProxyCredentials(username, password); dialog.pack(); @@ -308,7 +308,7 @@ } } - static private class SelectAllOnFocusHandler extends FocusAdapter { + private static class SelectAllOnFocusHandler extends FocusAdapter { @Override public void focusGained(FocusEvent e) { if (e.getSource() instanceof JTextField) { @@ -325,7 +325,7 @@ * If current text field is not empty, but the next one is (or just contains a sequence of spaces), focuses the next text field. * If both text fields contain characters, submits the form by calling owner's {@link OKAction}. */ - static private class TFKeyListener implements KeyListener{ + private static class TFKeyListener implements KeyListener{ protected CredentialDialog owner; // owner Dependency Injection to call OKAction protected JTextField currentTF; protected JTextField nextTF; Index: src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java =================================================================== --- src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java (revision 6084) +++ src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java (working copy) @@ -31,16 +31,16 @@ import org.openstreetmap.josm.gui.widgets.JosmTextField; class LayerNameAndFilePathTableCell extends JPanel implements TableCellRenderer, TableCellEditor { - private final static Color colorError = new Color(255,197,197); - private final static String separator = System.getProperty("file.separator"); - private final static String ellipsis = "…" + separator; + private static final Color colorError = new Color(255,197,197); + private static final String separator = System.getProperty("file.separator"); + private static final String ellipsis = "…" + separator; private final JLabel lblLayerName = new JLabel(); private final JLabel lblFilename = new JLabel(""); private final JosmTextField tfFilename = new JosmTextField(); private final JButton btnFileChooser = new JButton(new LaunchFileChooserAction()); - private final static GBC defaultCellStyle = GBC.eol().fill(GBC.HORIZONTAL).insets(2, 0, 2, 0); + private static final GBC defaultCellStyle = GBC.eol().fill(GBC.HORIZONTAL).insets(2, 0, 2, 0); private CopyOnWriteArrayList listeners; private File value; Index: src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 6084) +++ src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (working copy) @@ -51,7 +51,7 @@ import org.openstreetmap.josm.tools.WindowGeometry; public class SaveLayersDialog extends JDialog implements TableModelListener { - static public enum UserAction { + public static enum UserAction { /** * save/upload layers was successful, proceed with operation */ Index: src/org/openstreetmap/josm/gui/io/SaveLayersModel.java =================================================================== --- src/org/openstreetmap/josm/gui/io/SaveLayersModel.java (revision 6084) +++ src/org/openstreetmap/josm/gui/io/SaveLayersModel.java (working copy) @@ -14,7 +14,7 @@ import org.openstreetmap.josm.gui.layer.OsmDataLayer; public class SaveLayersModel extends DefaultTableModel { - static final public String MODE_PROP = SaveLayerInfo.class.getName() + ".mode"; + public static final String MODE_PROP = SaveLayerInfo.class.getName() + ".mode"; public enum Mode { EDITING_DATA, UPLOADING_AND_SAVING Index: src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java =================================================================== --- src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java (revision 6084) +++ src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java (working copy) @@ -22,7 +22,7 @@ private final JPanel pnlEmpty = new JPanel(); private final JLabel needsUpload = new JLabel(tr("should be uploaded")); private final JLabel needsSave = new JLabel(tr("should be saved")); - private final static GBC defaultCellStyle = GBC.eol().fill(GBC.HORIZONTAL).insets(2, 0, 2, 0); + private static final GBC defaultCellStyle = GBC.eol().fill(GBC.HORIZONTAL).insets(2, 0, 2, 0); public RecommendedActionsTableCell() { pnlEmpty.setPreferredSize(new Dimension(1, 19)); Index: src/org/openstreetmap/josm/gui/io/UploadDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 6084) +++ src/org/openstreetmap/josm/gui/io/UploadDialog.java (working copy) @@ -59,19 +59,19 @@ */ public class UploadDialog extends JDialog implements PropertyChangeListener, PreferenceChangedListener{ /** the unique instance of the upload dialog */ - static private UploadDialog uploadDialog; + private static UploadDialog uploadDialog; /** * List of custom components that can be added by plugins at JOSM startup. */ - static private final Collection customComponents = new ArrayList(); + private static final Collection customComponents = new ArrayList(); /** * Replies the unique instance of the upload dialog * * @return the unique instance of the upload dialog */ - static public UploadDialog getUploadDialog() { + public static UploadDialog getUploadDialog() { if (uploadDialog == null) { uploadDialog = new UploadDialog(); } Index: src/org/openstreetmap/josm/gui/io/UploadStrategy.java =================================================================== --- src/org/openstreetmap/josm/gui/io/UploadStrategy.java (revision 6084) +++ src/org/openstreetmap/josm/gui/io/UploadStrategy.java (working copy) @@ -49,7 +49,7 @@ /** * the default upload strategy */ - public final static UploadStrategy DEFAULT_UPLOAD_STRATEGY = SINGLE_REQUEST_STRATEGY; + public static final UploadStrategy DEFAULT_UPLOAD_STRATEGY = SINGLE_REQUEST_STRATEGY; /** * Replies the upload strategy currently configured in the preferences. Index: src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (revision 6084) +++ src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (working copy) @@ -45,7 +45,7 @@ /** * The property for the upload strategy */ - public final static String UPLOAD_STRATEGY_SPECIFICATION_PROP = + public static final String UPLOAD_STRATEGY_SPECIFICATION_PROP = UploadStrategySelectionPanel.class.getName() + ".uploadStrategySpecification"; private static final Color BG_COLOR_ERROR = new Color(255,224,224); Index: src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java =================================================================== --- src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java (revision 6084) +++ src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java (working copy) @@ -14,7 +14,7 @@ */ public class UploadStrategySpecification { /** indicates that the chunk size isn't specified */ - static public final int UNSPECIFIED_CHUNK_SIZE = -1; + public static final int UNSPECIFIED_CHUNK_SIZE = -1; private UploadStrategy strategy; private int chunkSize; Index: src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java (revision 6084) +++ src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java (working copy) @@ -24,7 +24,7 @@ * */ public class UploadedObjectsSummaryPanel extends JPanel { - static public final String NUM_OBJECTS_TO_UPLOAD_PROP = UploadedObjectsSummaryPanel.class.getName() + ".numObjectsToUpload"; + public static final String NUM_OBJECTS_TO_UPLOAD_PROP = UploadedObjectsSummaryPanel.class.getName() + ".numObjectsToUpload"; /** the list with the added primitives */ private PrimitiveList lstAdd; Index: src/org/openstreetmap/josm/gui/layer/GpxLayer.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 6084) +++ src/org/openstreetmap/josm/gui/layer/GpxLayer.java (working copy) @@ -247,7 +247,7 @@ } /* for preferences */ - static public Color getGenericColor() { + public static Color getGenericColor() { return Main.pref.getColor(marktr("gps point"), Color.gray); } @@ -355,14 +355,14 @@ computeCacheInSync = false; } - private final static Color[] colors = new Color[256]; + private static final Color[] colors = new Color[256]; static { for (int i = 0; i < colors.length; i++) { colors[i] = Color.getHSBColor(i / 300.0f, 1, 1); } } - private final static Color[] colors_cyclic = new Color[256]; + private static final Color[] colors_cyclic = new Color[256]; static { for (int i = 0; i < colors_cyclic.length; i++) { // red yellow green blue red @@ -397,10 +397,10 @@ } // lookup array to draw arrows without doing any math - private final static int ll0 = 9; - private final static int sl4 = 5; - private final static int sl9 = 3; - private final static int[][] dir = { { +sl4, +ll0, +ll0, +sl4 }, { -sl9, +ll0, +sl9, +ll0 }, { -ll0, +sl4, -sl4, +ll0 }, + private static final int ll0 = 9; + private static final int sl4 = 5; + private static final int sl9 = 3; + private static final int[][] dir = { { +sl4, +ll0, +ll0, +sl4 }, { -sl9, +ll0, +sl9, +ll0 }, { -ll0, +sl4, -sl4, +ll0 }, { -ll0, -sl9, -ll0, +sl9 }, { -sl4, -ll0, -ll0, -sl4 }, { +sl9, -ll0, -sl9, -ll0 }, { +ll0, -sl4, +sl4, -ll0 }, { +ll0, +sl9, +ll0, -sl9 }, { +sl4, +ll0, +ll0, +sl4 }, { -sl9, +ll0, +sl9, +ll0 }, { -ll0, +sl4, -sl4, +ll0 }, { -ll0, -sl9, -ll0, +sl9 } }; @@ -821,7 +821,7 @@ /** ensures the trackVisibility array has the correct length without losing data. * additional entries are initialized to true; */ - final private void ensureTrackVisibilityLength() { + private final void ensureTrackVisibilityLength() { final int l = data.tracks.size(); if(l == trackVisibility.length) return; Index: src/org/openstreetmap/josm/gui/layer/Layer.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/Layer.java (revision 6084) +++ src/org/openstreetmap/josm/gui/layer/Layer.java (working copy) @@ -47,7 +47,7 @@ * * @author imi */ -abstract public class Layer implements Destroyable, MapViewPaintable, ProjectionChangeListener { +public abstract class Layer implements Destroyable, MapViewPaintable, ProjectionChangeListener { public interface LayerAction { boolean supportLayers(List layers); @@ -79,11 +79,11 @@ } } - static public final String VISIBLE_PROP = Layer.class.getName() + ".visible"; - static public final String OPACITY_PROP = Layer.class.getName() + ".opacity"; - static public final String NAME_PROP = Layer.class.getName() + ".name"; + public static final String VISIBLE_PROP = Layer.class.getName() + ".visible"; + public static final String OPACITY_PROP = Layer.class.getName() + ".opacity"; + public static final String NAME_PROP = Layer.class.getName() + ".name"; - static public final int ICON_SIZE = 16; + public static final int ICON_SIZE = 16; /** keeps track of property change listeners */ protected PropertyChangeSupport propertyChangeSupport; @@ -141,12 +141,12 @@ * @param mv The object that can translate GeoPoints to screen coordinates. */ @Override - abstract public void paint(Graphics2D g, MapView mv, Bounds box); + public abstract void paint(Graphics2D g, MapView mv, Bounds box); /** * Return a representative small image for this layer. The image must not * be larger than 64 pixel in any dimension. */ - abstract public Icon getIcon(); + public abstract Icon getIcon(); /** * Return a Color for this layer. Return null when no color specified. @@ -161,7 +161,7 @@ /** * @return A small tooltip hint about some statistics for this layer. */ - abstract public String getToolTipText(); + public abstract String getToolTipText(); /** * Merges the given layer into this layer. Throws if the layer types are @@ -170,17 +170,17 @@ * the other layer is not usable anymore and passing to one others * mergeFrom should be one of the last things to do with a layer. */ - abstract public void mergeFrom(Layer from); + public abstract void mergeFrom(Layer from); /** * @param other The other layer that is tested to be mergable with this. * @return Whether the other layer can be merged into this layer. */ - abstract public boolean isMergable(Layer other); + public abstract boolean isMergable(Layer other); - abstract public void visitBoundingBox(BoundingXYVisitor v); + public abstract void visitBoundingBox(BoundingXYVisitor v); - abstract public Object getInfoComponent(); + public abstract Object getInfoComponent(); /** * Returns list of actions. Action can implement LayerAction interface when it needs to be represented by other @@ -190,7 +190,7 @@ * Use SeparatorLayerAction.INSTANCE instead of new JSeparator * */ - abstract public Action[] getMenuEntries(); + public abstract Action[] getMenuEntries(); /** * Called, when the layer is removed from the mapview and is going to be Index: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 6084) +++ src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (working copy) @@ -90,8 +90,8 @@ * @author imi */ public class OsmDataLayer extends Layer implements Listener, SelectionChangedListener { - static public final String REQUIRES_SAVE_TO_DISK_PROP = OsmDataLayer.class.getName() + ".requiresSaveToDisk"; - static public final String REQUIRES_UPLOAD_TO_SERVER_PROP = OsmDataLayer.class.getName() + ".requiresUploadToServer"; + public static final String REQUIRES_SAVE_TO_DISK_PROP = OsmDataLayer.class.getName() + ".requiresSaveToDisk"; + public static final String REQUIRES_UPLOAD_TO_SERVER_PROP = OsmDataLayer.class.getName() + ".requiresUploadToServer"; private boolean requiresSaveToFile = false; private boolean requiresUploadToServer = false; @@ -117,19 +117,19 @@ } /** the global counter for created data layers */ - static private int dataLayerCounter = 0; + private static int dataLayerCounter = 0; /** * Replies a new unique name for a data layer * * @return a new unique name for a data layer */ - static public String createNewName() { + public static String createNewName() { dataLayerCounter++; return tr("Data Layer {0}", dataLayerCounter); } - public final static class DataCountVisitor extends AbstractVisitor { + public static final class DataCountVisitor extends AbstractVisitor { public int nodes; public int ways; public int relations; Index: src/org/openstreetmap/josm/gui/layer/TMSLayer.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 6084) +++ src/org/openstreetmap/josm/gui/layer/TMSLayer.java (working copy) @@ -468,7 +468,7 @@ * Function to set the maximum number of workers for tile loading to the value defined * in preferences. */ - static public void setMaxWorkers() { + public static void setMaxWorkers() { JobDispatcher.setMaxWorkers(PROP_TMS_JOBS.get()); JobDispatcher.getInstance().setLIFO(true); } Index: src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 6084) +++ src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (working copy) @@ -662,10 +662,10 @@ syncDialog.setContentPane(outerPanel); syncDialog.pack(); syncDialog.addWindowListener(new WindowAdapter() { - final static int CANCEL = -1; - final static int DONE = 0; - final static int AGAIN = 1; - final static int NOTHING = 2; + static final int CANCEL = -1; + static final int DONE = 0; + static final int AGAIN = 1; + static final int NOTHING = 2; private int checkAndSave() { if (syncDialog.isVisible()) // nothing happened: JOSM was minimized or similar Index: src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java (revision 6084) +++ src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java (working copy) @@ -16,7 +16,7 @@ * Stores info about each image */ -final public class ImageEntry implements Comparable, Cloneable { +public final class ImageEntry implements Comparable, Cloneable { private File file; private Integer exifOrientation; private LatLon exifCoor; Index: src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java (revision 6084) +++ src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java (working copy) @@ -13,7 +13,7 @@ class JpegFileFilter extends javax.swing.filechooser.FileFilter implements java.io.FileFilter { - static final private JpegFileFilter instance = new JpegFileFilter(); + private static final JpegFileFilter instance = new JpegFileFilter(); public static JpegFileFilter getInstance() { return instance; } Index: src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (revision 6084) +++ src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (working copy) @@ -82,7 +82,7 @@ // so per layer settings is useless. Anyway it's possible to specify marker layer pattern in Einstein preferences and maybe somebody // will make gui for it so I'm keeping it here - private final static Map cache = new HashMap(); + private static final Map cache = new HashMap(); // Legacy code - convert label from int to template engine expression private static final IntegerProperty PROP_LABEL = new IntegerProperty("draw.rawgps.layer.wpt", 0 ); Index: src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (revision 6084) +++ src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (working copy) @@ -180,7 +180,7 @@ } /* for preferences */ - static public Color getGenericColor() + public static Color getGenericColor() { return Main.pref.getColor(marktr("gps marker"), Color.gray); } Index: src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java =================================================================== --- src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (revision 6084) +++ src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (working copy) @@ -39,7 +39,7 @@ private double animationInterval = 0.0; // seconds // private Rectangle audioTracer = null; // private Icon audioTracerIcon = null; - static private PlayHeadMarker playHead = null; + private static PlayHeadMarker playHead = null; private MapMode oldMode = null; private LatLon oldCoor; private boolean enabled; Index: src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java =================================================================== --- src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java (revision 6084) +++ src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java (working copy) @@ -173,8 +173,8 @@ * FIXME: the cache isn't updated if the user changes the preference during a JOSM * session. There should be preference listener updating this cache. */ - static private Color DEFAULT_TEXT_COLOR = null; - static private void initDefaultParameters() { + private static Color DEFAULT_TEXT_COLOR = null; + private static void initDefaultParameters() { if (DEFAULT_TEXT_COLOR != null) return; DEFAULT_TEXT_COLOR = PaintColors.TEXT.get(); } Index: src/org/openstreetmap/josm/gui/mappaint/Cascade.java =================================================================== --- src/org/openstreetmap/josm/gui/mappaint/Cascade.java (revision 6084) +++ src/org/openstreetmap/josm/gui/mappaint/Cascade.java (working copy) @@ -22,7 +22,7 @@ protected Map prop = new HashMap(); - private final static Pattern HEX_COLOR_PATTERN = Pattern.compile("#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})"); + private static final Pattern HEX_COLOR_PATTERN = Pattern.compile("#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})"); public T get(String key, T def, Class klass) { return get(key, def, klass, false); Index: src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java =================================================================== --- src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java (revision 6084) +++ src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java (working copy) @@ -13,7 +13,7 @@ import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer; import org.openstreetmap.josm.gui.mappaint.mapcss.Instruction.RelativeFloat; -abstract public class ElemStyle implements StyleKeys { +public abstract class ElemStyle implements StyleKeys { public float major_z_index; public float z_index; @@ -87,15 +87,15 @@ * FIXME: cached preference values are not updated if the user changes them during * a JOSM session. Should have a listener listening to preference changes. */ - static private String DEFAULT_FONT_NAME = null; - static private Float DEFAULT_FONT_SIZE = null; - static private void initDefaultFontParameters() { + private static String DEFAULT_FONT_NAME = null; + private static Float DEFAULT_FONT_SIZE = null; + private static void initDefaultFontParameters() { if (DEFAULT_FONT_NAME != null) return; // already initialized - skip initialization DEFAULT_FONT_NAME = Main.pref.get("mappaint.font", "Helvetica"); DEFAULT_FONT_SIZE = (float) Main.pref.getInteger("mappaint.fontsize", 8); } - static private class FontDescriptor { + private static class FontDescriptor { public String name; public int style; public int size; @@ -137,8 +137,8 @@ } } - static private final Map FONT_MAP = new HashMap(); - static private Font getCachedFont(FontDescriptor fd) { + private static final Map FONT_MAP = new HashMap(); + private static Font getCachedFont(FontDescriptor fd) { Font f = FONT_MAP.get(fd); if (f != null) return f; f = new Font(fd.name, fd.style, fd.size); @@ -146,7 +146,7 @@ return f; } - static private Font getCachedFont(String name, int style, int size){ + private static Font getCachedFont(String name, int style, int size){ return getCachedFont(new FontDescriptor(name, style, size)); } Index: src/org/openstreetmap/josm/gui/mappaint/Keyword.java =================================================================== --- src/org/openstreetmap/josm/gui/mappaint/Keyword.java (revision 6084) +++ src/org/openstreetmap/josm/gui/mappaint/Keyword.java (working copy) @@ -27,10 +27,10 @@ return val.hashCode(); } - public final static Keyword AUTO = new Keyword("auto"); - public final static Keyword BOTTOM = new Keyword("bottom"); - public final static Keyword CENTER = new Keyword("center"); - public final static Keyword DEFAULT = new Keyword("default"); - public final static Keyword RIGHT = new Keyword("right"); - public final static Keyword THINNEST = new Keyword("thinnest"); + public static final Keyword AUTO = new Keyword("auto"); + public static final Keyword BOTTOM = new Keyword("bottom"); + public static final Keyword CENTER = new Keyword("center"); + public static final Keyword DEFAULT = new Keyword("default"); + public static final Keyword RIGHT = new Keyword("right"); + public static final Keyword THINNEST = new Keyword("thinnest"); } Index: src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java =================================================================== --- src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java (revision 6084) +++ src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java (working copy) @@ -43,9 +43,9 @@ * @return the text value to be rendered or null, if primitive is null or * if no suitable value could be composed */ - abstract public String compose(OsmPrimitive primitive); + public abstract String compose(OsmPrimitive primitive); - static public class StaticLabelCompositionStrategy extends LabelCompositionStrategy { + public static class StaticLabelCompositionStrategy extends LabelCompositionStrategy { private String defaultLabel; public StaticLabelCompositionStrategy(String defaultLabel){ @@ -92,7 +92,7 @@ } } - static public class TagLookupCompositionStrategy extends LabelCompositionStrategy { + public static class TagLookupCompositionStrategy extends LabelCompositionStrategy { private String defaultLabelTag; public TagLookupCompositionStrategy(String defaultLabelTag){ @@ -147,12 +147,12 @@ } } - static public class DeriveLabelFromNameTagsCompositionStrategy extends LabelCompositionStrategy { + public static class DeriveLabelFromNameTagsCompositionStrategy extends LabelCompositionStrategy { /** * The list of default name tags from which a label candidate is derived. */ - static public final String[] DEFAULT_NAME_TAGS = { + public static final String[] DEFAULT_NAME_TAGS = { "name:" + LanguageInfo.getJOSMLocaleCode(), "name", "int_name", Index: src/org/openstreetmap/josm/gui/mappaint/StyleCache.java =================================================================== --- src/org/openstreetmap/josm/gui/mappaint/StyleCache.java (revision 6084) +++ src/org/openstreetmap/josm/gui/mappaint/StyleCache.java (working copy) @@ -24,9 +24,9 @@ /* styles for each scale range */ ArrayList data; - private final static Storage internPool = new Storage(); // TODO: clean up the intern pool from time to time (after purge or layer removal) + private static final Storage internPool = new Storage(); // TODO: clean up the intern pool from time to time (after purge or layer removal) - public final static StyleCache EMPTY_STYLECACHE = (new StyleCache()).intern(); + public static final StyleCache EMPTY_STYLECACHE = (new StyleCache()).intern(); private StyleCache() { bd = new ArrayList(); Index: src/org/openstreetmap/josm/gui/mappaint/StyleSource.java =================================================================== --- src/org/openstreetmap/josm/gui/mappaint/StyleSource.java (revision 6084) +++ src/org/openstreetmap/josm/gui/mappaint/StyleSource.java (working copy) @@ -19,7 +19,7 @@ import org.openstreetmap.josm.gui.preferences.SourceEntry; import org.openstreetmap.josm.tools.ImageProvider; -abstract public class StyleSource extends SourceEntry { +public abstract class StyleSource extends SourceEntry { private List errors = new ArrayList(); public File zipIcons; @@ -42,11 +42,11 @@ super(entry.url, entry.name, entry.title, entry.active); } - abstract public void apply(MultiCascade mc, OsmPrimitive osm, double scale, OsmPrimitive multipolyOuterWay, boolean pretendWayIsClosed); + public abstract void apply(MultiCascade mc, OsmPrimitive osm, double scale, OsmPrimitive multipolyOuterWay, boolean pretendWayIsClosed); - abstract public void loadStyleSource(); + public abstract void loadStyleSource(); - abstract public InputStream getSourceInputStream() throws IOException; + public abstract InputStream getSourceInputStream() throws IOException; public void logError(Throwable e) { errors.add(e); @@ -83,7 +83,7 @@ return imageIcon; } - final public ImageIcon getIcon() { + public final ImageIcon getIcon() { if (getErrors().isEmpty()) return getSourceIcon(); else Index: src/org/openstreetmap/josm/gui/mappaint/TextElement.java =================================================================== --- src/org/openstreetmap/josm/gui/mappaint/TextElement.java (revision 6084) +++ src/org/openstreetmap/josm/gui/mappaint/TextElement.java (working copy) @@ -19,7 +19,7 @@ * */ public class TextElement implements StyleKeys { - static public final LabelCompositionStrategy AUTO_LABEL_COMPOSITION_STRATEGY = new DeriveLabelFromNameTagsCompositionStrategy(); + public static final LabelCompositionStrategy AUTO_LABEL_COMPOSITION_STRATEGY = new DeriveLabelFromNameTagsCompositionStrategy(); /** the strategy for building the actual label value for a given a {@link OsmPrimitive}. * Check for null before accessing. Index: src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java =================================================================== --- src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java (revision 6084) +++ src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java (working copy) @@ -6,7 +6,7 @@ import java.util.Map; public class CSSColors { - private final static Map CSS_COLORS = new HashMap(); + private static final Map CSS_COLORS = new HashMap(); static { Object[][] CSSCOLORS_INIT = new Object[][] { {"aliceblue", 0xf0f8ff}, Index: src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java =================================================================== --- src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java (revision 6084) +++ src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java (working copy) @@ -16,9 +16,9 @@ import org.openstreetmap.josm.gui.mappaint.Environment; import org.openstreetmap.josm.tools.Utils; -abstract public class Condition { +public abstract class Condition { - abstract public boolean applies(Environment e); + public abstract boolean applies(Environment e); public static Condition create(String k, String v, Op op, Context context) { switch (context) { @@ -130,7 +130,7 @@ LINK } - public final static EnumSet COMPARISON_OPERATERS = + public static final EnumSet COMPARISON_OPERATERS = EnumSet.of(Op.GREATER_OR_EQUAL, Op.GREATER, Op.LESS_OR_EQUAL, Op.LESS); /** Index: src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java =================================================================== --- src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (revision 6084) +++ src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (working copy) @@ -391,7 +391,7 @@ */ public static class NullExpression implements Expression { - final public static NullExpression INSTANCE = new NullExpression(); + public static final NullExpression INSTANCE = new NullExpression(); @Override public Object evaluate(Environment env) { Index: src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java =================================================================== --- src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java (revision 6084) +++ src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java (working copy) @@ -10,7 +10,7 @@ import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference; import org.openstreetmap.josm.gui.mappaint.StyleKeys; -abstract public class Instruction implements StyleKeys { +public abstract class Instruction implements StyleKeys { public abstract void execute(Environment env); Index: src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java =================================================================== --- src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (revision 6084) +++ src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (working copy) @@ -29,7 +29,7 @@ import org.openstreetmap.josm.tools.Utils; public class MapCSSStyleSource extends StyleSource { - final public List rules; + public final List rules; private Color backgroundColorOverride; private String css = null; Index: src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java =================================================================== --- src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (revision 6084) +++ src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (working copy) @@ -200,7 +200,7 @@ * Super class of {@link GeneralSelector} and {@link LinkSelector} * @since 5841 */ - public static abstract class AbstractSelector implements Selector { + public abstract static class AbstractSelector implements Selector { protected final List conds; @@ -330,7 +330,7 @@ return new Range(lower, upper); } - final static double R = 6378135; + static final double R = 6378135; public static double level2scale(int lvl) { if (lvl < 0) Index: src/org/openstreetmap/josm/gui/mappaint/xml/Prototype.java =================================================================== --- src/org/openstreetmap/josm/gui/mappaint/xml/Prototype.java (revision 6084) +++ src/org/openstreetmap/josm/gui/mappaint/xml/Prototype.java (working copy) @@ -7,7 +7,7 @@ import org.openstreetmap.josm.data.osm.OsmUtils; import org.openstreetmap.josm.gui.mappaint.Range; -abstract public class Prototype { +public abstract class Prototype { // zoom range to display the feature public Range range; Index: src/org/openstreetmap/josm/gui/oauth/AbstractAuthorizationUI.java =================================================================== --- src/org/openstreetmap/josm/gui/oauth/AbstractAuthorizationUI.java (revision 6084) +++ src/org/openstreetmap/josm/gui/oauth/AbstractAuthorizationUI.java (working copy) @@ -16,7 +16,7 @@ /** * The property name for the Access Token property */ - static public final String ACCESS_TOKEN_PROP = AbstractAuthorizationUI.class.getName() + ".accessToken"; + public static final String ACCESS_TOKEN_PROP = AbstractAuthorizationUI.class.getName() + ".accessToken"; private String apiUrl; private final AdvancedOAuthPropertiesPanel pnlAdvancedProperties; Index: src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java =================================================================== --- src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java (revision 6084) +++ src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java (working copy) @@ -20,7 +20,7 @@ setSelectedItem(AuthorizationProcedure.FULLY_AUTOMATIC); } - static private class AuthorisationProcedureCellRenderer extends JLabel implements ListCellRenderer { + private static class AuthorisationProcedureCellRenderer extends JLabel implements ListCellRenderer { public AuthorisationProcedureCellRenderer() { setOpaque(true); } Index: src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java =================================================================== --- src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java (revision 6084) +++ src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java (working copy) @@ -402,7 +402,7 @@ } - static private class UserNameValidator extends AbstractTextComponentValidator { + private static class UserNameValidator extends AbstractTextComponentValidator { public UserNameValidator(JTextComponent tc) { super(tc); } @@ -422,7 +422,7 @@ } } - static private class PasswordValidator extends AbstractTextComponentValidator { + private static class PasswordValidator extends AbstractTextComponentValidator { public PasswordValidator(JTextComponent tc) { super(tc); Index: src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java (revision 6084) +++ src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java (working copy) @@ -78,7 +78,7 @@ add(new JPanel(), gc); } - static private class UserNameValidator extends AbstractTextComponentValidator { + private static class UserNameValidator extends AbstractTextComponentValidator { public UserNameValidator(JTextComponent tc) { super(tc); Index: src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java =================================================================== --- src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java (revision 6084) +++ src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java (working copy) @@ -174,7 +174,7 @@ return cbSaveToPreferences.isSelected(); } - static private class AccessTokenKeyValidator extends AbstractTextComponentValidator { + private static class AccessTokenKeyValidator extends AbstractTextComponentValidator { public AccessTokenKeyValidator(JTextComponent tc) throws IllegalArgumentException { super(tc); @@ -195,7 +195,7 @@ } } - static private class AccessTokenSecretValidator extends AbstractTextComponentValidator { + private static class AccessTokenSecretValidator extends AbstractTextComponentValidator { public AccessTokenSecretValidator(JTextComponent tc) throws IllegalArgumentException { super(tc); } Index: src/org/openstreetmap/josm/gui/preferences/PluginPreference.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (revision 6084) +++ src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (working copy) @@ -463,7 +463,7 @@ } } - static private class PluginConfigurationSitesPanel extends JPanel { + private static class PluginConfigurationSitesPanel extends JPanel { private DefaultListModel model; Index: src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 6084) +++ src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (working copy) @@ -133,7 +133,7 @@ // all created tabs private final List tabs = new ArrayList(); - private final static Collection settingsFactory = new LinkedList(); + private static final Collection settingsFactory = new LinkedList(); private final List settings = new ArrayList(); // distinct list of tabs that have been initialized (we do not initialize tabs until they are displayed to speed up dialog startup) Index: src/org/openstreetmap/josm/gui/preferences/SourceEditor.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 6084) +++ src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (working copy) @@ -93,7 +93,7 @@ public abstract class SourceEditor extends JPanel { - final protected boolean isMapPaint; + protected final boolean isMapPaint; protected final JTable tblActiveSources; protected final ActiveSourcesModel activeSourcesModel; @@ -356,28 +356,28 @@ /** * Load the list of source entries that the user has configured. */ - abstract public Collection getInitialSourcesList(); + public abstract Collection getInitialSourcesList(); /** * Load the list of configured icon paths. */ - abstract public Collection getInitialIconPathsList(); + public abstract Collection getInitialIconPathsList(); /** * Get the default list of entries (used when resetting the list). */ - abstract public Collection getDefault(); + public abstract Collection getDefault(); /** * Save the settings after user clicked "Ok". * @return true if restart is required */ - abstract public boolean finish(); + public abstract boolean finish(); /** * Provide the GUI strings. (There are differences for MapPaint and Preset) */ - abstract protected String getStr(I18nString ident); + protected abstract String getStr(I18nString ident); /** * Identifiers for strings that need to be provided. @@ -1497,7 +1497,7 @@ } } - abstract public static class SourcePrefHelper { + public abstract static class SourcePrefHelper { private final String prefOld; private final String pref; @@ -1507,11 +1507,11 @@ this.prefOld = prefOld; } - abstract public Collection getDefault(); + public abstract Collection getDefault(); - abstract public Map serialize(SourceEntry entry); + public abstract Map serialize(SourceEntry entry); - abstract public SourceEntry deserialize(Map entryStr); + public abstract SourceEntry deserialize(Map entryStr); public List get() { Index: src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java (revision 6084) +++ src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java (working copy) @@ -103,7 +103,7 @@ } } - static private class LanguageCellRenderer extends DefaultListCellRenderer { + private static class LanguageCellRenderer extends DefaultListCellRenderer { private ListCellRenderer dispatch; public LanguageCellRenderer(ListCellRenderer dispatch) { this.dispatch = dispatch; Index: src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java (revision 6084) +++ src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java (working copy) @@ -85,7 +85,7 @@ static class MapPaintSourceEditor extends SourceEditor { - final private String iconpref = "mappaint.icon.sources"; + private final String iconpref = "mappaint.icon.sources"; public MapPaintSourceEditor() { super(true, "http://josm.openstreetmap.de/styles", styleSourceProviders); @@ -185,7 +185,7 @@ public static class MapPaintPrefHelper extends SourceEditor.SourcePrefHelper { - public final static MapPaintPrefHelper INSTANCE = new MapPaintPrefHelper(); + public static final MapPaintPrefHelper INSTANCE = new MapPaintPrefHelper(); public MapPaintPrefHelper() { super("mappaint.style.entries", "mappaint.style.sources-list"); Index: src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (revision 6084) +++ src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (working copy) @@ -186,7 +186,7 @@ static class TaggingPresetSourceEditor extends SourceEditor { - final private String iconpref = "taggingpreset.icon.sources"; + private final String iconpref = "taggingpreset.icon.sources"; public TaggingPresetSourceEditor() { super(false, "http://josm.openstreetmap.de/presets", presetSourceProviders); @@ -315,7 +315,7 @@ public static class PresetPrefHelper extends SourceEditor.SourcePrefHelper { - public final static PresetPrefHelper INSTANCE = new PresetPrefHelper(); + public static final PresetPrefHelper INSTANCE = new PresetPrefHelper(); public PresetPrefHelper() { super("taggingpreset.entries", "taggingpreset.sources-list"); Index: src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java (revision 6084) +++ src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java (working copy) @@ -5,7 +5,7 @@ import org.openstreetmap.josm.data.projection.Projection; import org.openstreetmap.josm.data.projection.Projections; -abstract public class AbstractProjectionChoice implements ProjectionChoice { +public abstract class AbstractProjectionChoice implements ProjectionChoice { protected String name; protected String id; @@ -50,9 +50,9 @@ return name; } - abstract public String getCurrentCode(); + public abstract String getCurrentCode(); - abstract public String getProjectionName(); + public abstract String getProjectionName(); @Override public Projection getProjection() { Index: src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java (revision 6084) +++ src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java (working copy) @@ -15,7 +15,7 @@ /** * A projection choice, that offers a list of projections in a combo-box. */ -abstract public class ListProjectionChoice extends AbstractProjectionChoice { +public abstract class ListProjectionChoice extends AbstractProjectionChoice { protected int index; // 0-based index protected int defaultIndex; @@ -45,12 +45,12 @@ /** * Convert 0-based index to preference value. */ - abstract protected String indexToZone(int index); + protected abstract String indexToZone(int index); /** * Convert preference value to 0-based index. */ - abstract protected int zoneToIndex(String zone); + protected abstract int zoneToIndex(String zone); @Override public void setPreferences(Collection args) { Index: src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java (revision 6084) +++ src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java (working copy) @@ -285,7 +285,7 @@ * This is required twice in the code, creating it here keeps both occurrences * in sync */ - static private GBC projSubPrefPanelGBC = GBC.std().fill(GBC.BOTH).weight(1.0, 1.0); + private static GBC projSubPrefPanelGBC = GBC.std().fill(GBC.BOTH).weight(1.0, 1.0); @Override public void addGui(PreferenceTabbedPane gui) { @@ -377,11 +377,11 @@ return false; } - static public void setProjection() { + public static void setProjection() { setProjection(PROP_PROJECTION.get(), PROP_SUB_PROJECTION.get()); } - static public void setProjection(String id, Collection pref) { + public static void setProjection(String id, Collection pref) { ProjectionChoice pc = projectionChoicesById.get(id); if (pc == null) { Index: src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java (revision 6084) +++ src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java (working copy) @@ -25,7 +25,7 @@ private Hemisphere hemisphere; - private final static List cbEntries = new ArrayList(); + private static final List cbEntries = new ArrayList(); static { for (int i = 1; i <= 60; i++) { cbEntries.add(Integer.toString(i)); Index: src/org/openstreetmap/josm/gui/preferences/projection/UTM_France_DOM_ProjectionChoice.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/projection/UTM_France_DOM_ProjectionChoice.java (revision 6084) +++ src/org/openstreetmap/josm/gui/preferences/projection/UTM_France_DOM_ProjectionChoice.java (working copy) @@ -8,19 +8,19 @@ public class UTM_France_DOM_ProjectionChoice extends ListProjectionChoice { - private final static String FortMarigotName = tr("Guadeloupe Fort-Marigot 1949"); - private final static String SainteAnneName = tr("Guadeloupe Ste-Anne 1948"); - private final static String MartiniqueName = tr("Martinique Fort Desaix 1952"); - private final static String Reunion92Name = tr("Reunion RGR92"); - private final static String Guyane92Name = tr("Guyane RGFG95"); - private final static String[] utmGeodesicsNames = { FortMarigotName, SainteAnneName, MartiniqueName, Reunion92Name, Guyane92Name}; + 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 final static Integer FortMarigotEPSG = 2969; - private final static Integer SainteAnneEPSG = 2970; - private final static Integer MartiniqueEPSG = 2973; - private final static Integer ReunionEPSG = 2975; - private final static Integer GuyaneEPSG = 2972; - private final static Integer[] utmEPSGs = { FortMarigotEPSG, SainteAnneEPSG, MartiniqueEPSG, ReunionEPSG, GuyaneEPSG }; + 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 }; public UTM_France_DOM_ProjectionChoice() { super(tr("UTM France (DOM)"), "core:utmfrancedom", utmGeodesicsNames, tr("UTM Geodesic system")); Index: src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java (revision 6084) +++ src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java (working copy) @@ -35,7 +35,7 @@ import org.openstreetmap.josm.gui.widgets.JosmTextField; public class OsmApiUrlInputPanel extends JPanel { - static public final String API_URL_PROP = OsmApiUrlInputPanel.class.getName() + ".apiUrl"; + public static final String API_URL_PROP = OsmApiUrlInputPanel.class.getName() + ".apiUrl"; private JLabel lblValid; private JLabel lblApiUrl; @@ -228,7 +228,7 @@ btnTest.setEnabled(enabled); } - static private class ApiUrlValidator extends AbstractTextComponentValidator { + private static class ApiUrlValidator extends AbstractTextComponentValidator { public ApiUrlValidator(JTextComponent tc) throws IllegalArgumentException { super(tc); } Index: src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java (revision 6084) +++ src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java (working copy) @@ -52,7 +52,7 @@ return policyName; } - static public ProxyPolicy fromName(String policyName) { + public static ProxyPolicy fromName(String policyName) { if (policyName == null) return null; policyName = policyName.trim().toLowerCase(); for(ProxyPolicy pp: values()) { Index: src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java =================================================================== --- src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java (revision 6084) +++ src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java (working copy) @@ -30,7 +30,7 @@ */ @SuppressWarnings("serial") public class TagEditorModel extends AbstractTableModel { - static public final String PROP_DIRTY = TagEditorModel.class.getName() + ".dirty"; + public static final String PROP_DIRTY = TagEditorModel.class.getName() + ".dirty"; /** the list holding the tags */ protected final ArrayList tags =new ArrayList(); Index: src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java =================================================================== --- src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (revision 6084) +++ src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (working copy) @@ -73,7 +73,7 @@ public String name; public String name_context; public String locale_name; - public final static String OPTIONAL_TOOLTIP_TEXT = "Optional tooltip text"; + public static final String OPTIONAL_TOOLTIP_TEXT = "Optional tooltip text"; /** * The types as preparsed collection. Index: src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java =================================================================== --- src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (revision 6084) +++ src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (working copy) @@ -406,7 +406,7 @@ } - public static abstract class KeyedItem extends TaggingPresetItem { + public abstract static class KeyedItem extends TaggingPresetItem { public String key; public String text; @@ -736,7 +736,7 @@ } } - public static abstract class ComboMultiSelect extends KeyedItem { + public abstract static class ComboMultiSelect extends KeyedItem { public String locale_text; public String values; @@ -1199,7 +1199,7 @@ return builder.toString(); } } - static public EnumSet getType(String types) throws SAXException { + public static EnumSet getType(String types) throws SAXException { if (typeCache.containsKey(types)) return typeCache.get(types); EnumSet result = EnumSet.noneOf(TaggingPresetType.class); Index: src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java =================================================================== --- src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java (revision 6084) +++ src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java (working copy) @@ -33,8 +33,8 @@ * */ public abstract class AbstractTextComponentValidator implements ActionListener, FocusListener, DocumentListener, PropertyChangeListener{ - static final private Border ERROR_BORDER = BorderFactory.createLineBorder(Color.RED, 1); - static final private Color ERROR_BACKGROUND = new Color(255,224,224); + private static final Border ERROR_BORDER = BorderFactory.createLineBorder(Color.RED, 1); + private static final Color ERROR_BACKGROUND = new Color(255,224,224); private JTextComponent tc; /** remembers whether the content of the text component is currently valid or not; null means, Index: src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java =================================================================== --- src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java (revision 6084) +++ src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java (working copy) @@ -121,7 +121,7 @@ tfLatLon[3].setText(area.getMax().lonToString(CoordinateFormat.DECIMAL_DEGREES)); } - static private class LatitudeValidator extends AbstractTextComponentValidator { + private static class LatitudeValidator extends AbstractTextComponentValidator { public static void decorate(JTextComponent tc) { new LatitudeValidator(tc); @@ -161,7 +161,7 @@ } } - static private class LongitudeValidator extends AbstractTextComponentValidator{ + private static class LongitudeValidator extends AbstractTextComponentValidator{ public static void decorate(JTextComponent tc) { new LongitudeValidator(tc); Index: src/org/openstreetmap/josm/gui/widgets/VerticallyScrollablePanel.java =================================================================== --- src/org/openstreetmap/josm/gui/widgets/VerticallyScrollablePanel.java (revision 6084) +++ src/org/openstreetmap/josm/gui/widgets/VerticallyScrollablePanel.java (working copy) @@ -11,7 +11,7 @@ public class VerticallyScrollablePanel extends JPanel implements Scrollable { - static public JScrollPane embed(VerticallyScrollablePanel panel) { + public static JScrollPane embed(VerticallyScrollablePanel panel) { JScrollPane sp = new JScrollPane(panel); sp.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); sp.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); Index: src/org/openstreetmap/josm/io/CacheCustomContent.java =================================================================== --- src/org/openstreetmap/josm/io/CacheCustomContent.java (revision 6084) +++ src/org/openstreetmap/josm/io/CacheCustomContent.java (working copy) @@ -26,12 +26,12 @@ /** * Common intervals */ - final static public int INTERVAL_ALWAYS = -1; - final static public int INTERVAL_HOURLY = 60*60; - final static public int INTERVAL_DAILY = INTERVAL_HOURLY * 24; - final static public int INTERVAL_WEEKLY = INTERVAL_DAILY * 7; - final static public int INTERVAL_MONTHLY = INTERVAL_WEEKLY * 4; - final static public int INTERVAL_NEVER = Integer.MAX_VALUE; + public static final int INTERVAL_ALWAYS = -1; + public static final int INTERVAL_HOURLY = 60*60; + public static final int INTERVAL_DAILY = INTERVAL_HOURLY * 24; + public static final int INTERVAL_WEEKLY = INTERVAL_DAILY * 7; + public static final int INTERVAL_MONTHLY = INTERVAL_WEEKLY * 4; + public static final int INTERVAL_NEVER = Integer.MAX_VALUE; /** * Where the data will be stored @@ -41,17 +41,17 @@ /** * The ident that identifies the stored file. Includes file-ending. */ - final private String ident; + private final String ident; /** * The (file-)path where the data will be stored */ - final private File path; + private final File path; /** * How often to update the cached version */ - final private int updateInterval; + private final int updateInterval; /** * This function will be executed when an update is required. It has to be implemented by the Index: src/org/openstreetmap/josm/io/CacheFiles.java =================================================================== --- src/org/openstreetmap/josm/io/CacheFiles.java (revision 6084) +++ src/org/openstreetmap/josm/io/CacheFiles.java (working copy) @@ -28,14 +28,14 @@ /** * Common expirey dates */ - final static public int EXPIRE_NEVER = -1; - final static public int EXPIRE_DAILY = 60 * 60 * 24; - final static public int EXPIRE_WEEKLY = EXPIRE_DAILY * 7; - final static public int EXPIRE_MONTHLY = EXPIRE_WEEKLY * 4; + public static final int EXPIRE_NEVER = -1; + public static final int EXPIRE_DAILY = 60 * 60 * 24; + public static final int EXPIRE_WEEKLY = EXPIRE_DAILY * 7; + public static final int EXPIRE_MONTHLY = EXPIRE_WEEKLY * 4; - final private File dir; - final private String ident; - final private boolean enabled; + private final File dir; + private final String ident; + private final boolean enabled; private long expire; // in seconds private long maxsize; // in megabytes @@ -267,9 +267,9 @@ writes = 0; } - final static public int CLEAN_ALL = 0; - final static public int CLEAN_SMALL_FILES = 1; - final static public int CLEAN_BY_DATE = 2; + public static final int CLEAN_ALL = 0; + public static final int CLEAN_SMALL_FILES = 1; + public static final int CLEAN_BY_DATE = 2; /** * Performs a non-default, specified clean up * @param type any of the CLEAN_XX constants. Index: src/org/openstreetmap/josm/io/ChangesetClosedException.java =================================================================== --- src/org/openstreetmap/josm/io/ChangesetClosedException.java (revision 6084) +++ src/org/openstreetmap/josm/io/ChangesetClosedException.java (working copy) @@ -28,7 +28,7 @@ /** the error header pattern for in case of HTTP response 409 indicating * that a changeset was closed */ - final static public String ERROR_HEADER_PATTERN = "The changeset (\\d+) was closed at (.*)"; + public static final String ERROR_HEADER_PATTERN = "The changeset (\\d+) was closed at (.*)"; public static enum Source { /** @@ -54,7 +54,7 @@ * @param errorHeader the error header * @return true if errorHeader matches with {@link #ERROR_HEADER_PATTERN} */ - static public boolean errorHeaderMatchesPattern(String errorHeader) { + public static boolean errorHeaderMatchesPattern(String errorHeader) { if (errorHeader == null) return false; Pattern p = Pattern.compile(ERROR_HEADER_PATTERN); Index: src/org/openstreetmap/josm/io/ChangesetQuery.java =================================================================== --- src/org/openstreetmap/josm/io/ChangesetQuery.java (revision 6084) +++ src/org/openstreetmap/josm/io/ChangesetQuery.java (working copy) @@ -28,7 +28,7 @@ * @throws ChangesetQueryUrlException thrown if query doesn't consist of valid query parameters * */ - static public ChangesetQuery buildFromUrlQuery(String query) throws ChangesetQueryUrlException{ + public static ChangesetQuery buildFromUrlQuery(String query) throws ChangesetQueryUrlException{ return new ChangesetQueryUrlParser().parse(query); } Index: src/org/openstreetmap/josm/io/DiffResultProcessor.java =================================================================== --- src/org/openstreetmap/josm/io/DiffResultProcessor.java (revision 6084) +++ src/org/openstreetmap/josm/io/DiffResultProcessor.java (working copy) @@ -31,7 +31,7 @@ public class DiffResultProcessor { - static private class DiffResultEntry { + private static class DiffResultEntry { public long new_id; public int new_version; } Index: src/org/openstreetmap/josm/io/GpxExporter.java =================================================================== --- src/org/openstreetmap/josm/io/GpxExporter.java (revision 6084) +++ src/org/openstreetmap/josm/io/GpxExporter.java (working copy) @@ -38,7 +38,7 @@ import org.openstreetmap.josm.tools.Utils; public class GpxExporter extends FileExporter implements GpxConstants { - private final static String warningGpl = "" + private static final String warningGpl = "" + tr("Note: GPL is not compatible with the OSM license. Do not upload GPL licensed tracks.") + ""; /** Index: src/org/openstreetmap/josm/io/GpxWriter.java =================================================================== --- src/org/openstreetmap/josm/io/GpxWriter.java (revision 6084) +++ src/org/openstreetmap/josm/io/GpxWriter.java (working copy) @@ -40,9 +40,9 @@ private GpxData data; private String indent = ""; - private final static int WAY_POINT = 0; - private final static int ROUTE_POINT = 1; - private final static int TRACK_POINT = 2; + private static final int WAY_POINT = 0; + private static final int ROUTE_POINT = 1; + private static final int TRACK_POINT = 2; public void write(GpxData data) { this.data = data; Index: src/org/openstreetmap/josm/io/MirroredInputStream.java =================================================================== --- src/org/openstreetmap/josm/io/MirroredInputStream.java (revision 6084) +++ src/org/openstreetmap/josm/io/MirroredInputStream.java (working copy) @@ -32,7 +32,7 @@ InputStream fs = null; File file = null; - public final static long DEFAULT_MAXTIME = -1l; + public static final long DEFAULT_MAXTIME = -1l; public MirroredInputStream(String name) throws IOException { this(name, null, DEFAULT_MAXTIME); @@ -137,11 +137,11 @@ return file; } - static public void cleanup(String name) + public static void cleanup(String name) { cleanup(name, null); } - static public void cleanup(String name, String destDir) + public static void cleanup(String name, String destDir) { URL url; try { Index: src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java =================================================================== --- src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (revision 6084) +++ src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (working copy) @@ -62,7 +62,7 @@ * which should be safe according to the * WWW FAQ. */ - static private int MAX_IDS_PER_REQUEST = 200; + private static int MAX_IDS_PER_REQUEST = 200; private Set nodes; private Set ways; Index: src/org/openstreetmap/josm/io/NmeaReader.java =================================================================== --- src/org/openstreetmap/josm/io/NmeaReader.java (revision 6084) +++ src/org/openstreetmap/josm/io/NmeaReader.java (working copy) @@ -135,9 +135,9 @@ // private final static SimpleDateFormat GGATIMEFMT = // new SimpleDateFormat("HHmmss.SSS"); - private final static SimpleDateFormat RMCTIMEFMT = + private static final SimpleDateFormat RMCTIMEFMT = new SimpleDateFormat("ddMMyyHHmmss.SSS"); - private final static SimpleDateFormat RMCTIMEFMTSTD = + private static final SimpleDateFormat RMCTIMEFMTSTD = new SimpleDateFormat("ddMMyyHHmmss"); private Date readTime(String p) Index: src/org/openstreetmap/josm/io/OsmApi.java =================================================================== --- src/org/openstreetmap/josm/io/OsmApi.java (revision 6084) +++ src/org/openstreetmap/josm/io/OsmApi.java (working copy) @@ -57,7 +57,7 @@ /** * Maximum number of retries to send a request in case of HTTP 500 errors or timeouts */ - static public final int DEFAULT_MAX_NUM_RETRIES = 5; + public static final int DEFAULT_MAX_NUM_RETRIES = 5; /** * Maximum number of concurrent download threads, imposed by @@ -65,13 +65,13 @@ * OSM API usage policy. * @since 5386 */ - static public final int MAX_DOWNLOAD_THREADS = 2; + public static final int MAX_DOWNLOAD_THREADS = 2; /** * Default URL of the standard OSM API. * @since 5422 */ - static public final String DEFAULT_API_URL = "http://api.openstreetmap.org/api"; + public static final String DEFAULT_API_URL = "http://api.openstreetmap.org/api"; // The collection of instantiated OSM APIs private static HashMap instances = new HashMap(); @@ -84,7 +84,7 @@ * @throws IllegalArgumentException thrown, if serverUrl is null * */ - static public OsmApi getOsmApi(String serverUrl) { + public static OsmApi getOsmApi(String serverUrl) { OsmApi api = instances.get(serverUrl); if (api == null) { api = new OsmApi(serverUrl); @@ -100,7 +100,7 @@ * @throws IllegalStateException thrown, if the preference osm-server.url is not set * */ - static public OsmApi getOsmApi() { + public static OsmApi getOsmApi() { String serverUrl = Main.pref.get("osm-server.url", DEFAULT_API_URL); if (serverUrl == null) throw new IllegalStateException(tr("Preference ''{0}'' missing. Cannot initialize OsmApi.", "osm-server.url")); Index: src/org/openstreetmap/josm/io/OsmApiPrimitiveGoneException.java =================================================================== --- src/org/openstreetmap/josm/io/OsmApiPrimitiveGoneException.java (revision 6084) +++ src/org/openstreetmap/josm/io/OsmApiPrimitiveGoneException.java (working copy) @@ -16,7 +16,7 @@ /** * The regexp pattern for the error header replied by the OSM API */ - static public final String ERROR_HEADER_PATTERN = "The (\\S+) with the id (\\d+) has already been deleted"; + public static final String ERROR_HEADER_PATTERN = "The (\\S+) with the id (\\d+) has already been deleted"; /** the type of the primitive which is gone on the server */ private OsmPrimitiveType type; /** the id of the primitive */ Index: src/org/openstreetmap/josm/io/OsmChangeBuilder.java =================================================================== --- src/org/openstreetmap/josm/io/OsmChangeBuilder.java (revision 6084) +++ src/org/openstreetmap/josm/io/OsmChangeBuilder.java (working copy) @@ -17,7 +17,7 @@ * */ public class OsmChangeBuilder { - static public final String DEFAULT_API_VERSION = "0.6"; + public static final String DEFAULT_API_VERSION = "0.6"; private String currentMode; private PrintWriter writer; Index: src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java =================================================================== --- src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java (revision 6084) +++ src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java (working copy) @@ -24,11 +24,11 @@ public class OsmServerUserInfoReader extends OsmServerReader { - static protected String getAttribute(Node node, String name) { + protected static String getAttribute(Node node, String name) { return node.getAttributes().getNamedItem(name).getNodeValue(); } - static public UserInfo buildFromXML(Document document) throws OsmDataParsingException{ + public static UserInfo buildFromXML(Document document) throws OsmDataParsingException{ try { XPathFactory factory = XPathFactory.newInstance(); XPath xpath = factory.newXPath(); Index: src/org/openstreetmap/josm/io/XmlWriter.java =================================================================== --- src/org/openstreetmap/josm/io/XmlWriter.java (revision 6084) +++ src/org/openstreetmap/josm/io/XmlWriter.java (working copy) @@ -64,7 +64,7 @@ /** * The output writer to save the values to. */ - final private static HashMap encoding = new HashMap(); + private static final HashMap encoding = new HashMap(); static { encoding.put('<', "<"); encoding.put('>', ">"); Index: src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java =================================================================== --- src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java (revision 6084) +++ src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java (working copy) @@ -9,7 +9,7 @@ import org.openstreetmap.josm.gui.io.CredentialDialog; import org.openstreetmap.josm.gui.util.GuiHelper; -abstract public class AbstractCredentialsAgent implements CredentialsAgent { +public abstract class AbstractCredentialsAgent implements CredentialsAgent { protected Map memoryCredentialsCache = new HashMap(); Index: src/org/openstreetmap/josm/io/auth/CredentialsManager.java =================================================================== --- src/org/openstreetmap/josm/io/auth/CredentialsManager.java (revision 6084) +++ src/org/openstreetmap/josm/io/auth/CredentialsManager.java (working copy) @@ -25,7 +25,7 @@ * * @return the single credential agent used in JOSM */ - static public CredentialsManager getInstance() { + public static CredentialsManager getInstance() { if (instance == null) { CredentialsAgent delegate; if (agentFactory == null) { Index: src/org/openstreetmap/josm/io/imagery/Grabber.java =================================================================== --- src/org/openstreetmap/josm/io/imagery/Grabber.java (revision 6084) +++ src/org/openstreetmap/josm/io/imagery/Grabber.java (working copy) @@ -7,7 +7,7 @@ import org.openstreetmap.josm.gui.MapView; import org.openstreetmap.josm.gui.layer.WMSLayer; -abstract public class Grabber implements Runnable { +public abstract class Grabber implements Runnable { protected final MapView mv; protected final WMSLayer layer; private final boolean localOnly; @@ -79,7 +79,7 @@ return (int)(Math.random() * ((max+1)-min) ) + min; } - abstract public boolean loadFromCache(WMSRequest request); + public abstract boolean loadFromCache(WMSRequest request); public void cancel() { canceled = true; Index: src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java =================================================================== --- src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java (revision 6084) +++ src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java (working copy) @@ -90,7 +90,7 @@ * * @return the message */ - abstract public String getPermissionMessage(); + public abstract String getPermissionMessage(); /** * Get a PermissionPref object containing the name of a special permission @@ -102,9 +102,9 @@ * * @return the preference name and error message or null */ - abstract public PermissionPrefWithDefault getPermissionPref(); + public abstract PermissionPrefWithDefault getPermissionPref(); - abstract public String[] getMandatoryParams(); + public abstract String[] getMandatoryParams(); /** * Check permissions in preferences and display error message @@ -112,7 +112,7 @@ * * @throws RequestHandlerForbiddenException */ - final public void checkPermission() throws RequestHandlerForbiddenException + public final void checkPermission() throws RequestHandlerForbiddenException { /* * If the subclass defines a specific preference and if this is set Index: src/org/openstreetmap/josm/plugins/PluginHandler.java =================================================================== --- src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 6084) +++ src/org/openstreetmap/josm/plugins/PluginHandler.java (working copy) @@ -72,7 +72,7 @@ /** * deprecated plugins that are removed on start */ - public final static Collection DEPRECATED_PLUGINS; + public static final Collection DEPRECATED_PLUGINS; static { String IN_CORE = tr("integrated into main program"); @@ -150,7 +150,7 @@ } } - final public static String [] UNMAINTAINED_PLUGINS = new String[] {"gpsbabelgui", "Intersect_way"}; + public static final String [] UNMAINTAINED_PLUGINS = new String[] {"gpsbabelgui", "Intersect_way"}; /** * Default time-based update interval, in days (pluginmanager.time-based-update.interval) @@ -160,7 +160,7 @@ /** * All installed and loaded plugins (resp. their main classes) */ - public final static Collection pluginList = new LinkedList(); + public static final Collection pluginList = new LinkedList(); /** * Add here all ClassLoader whose resource should be searched. @@ -1234,7 +1234,7 @@ return pluginTab; } - static private class UpdatePluginsMessagePanel extends JPanel { + private static class UpdatePluginsMessagePanel extends JPanel { private JMultilineLabel lblMessage; private JCheckBox cbDontShowAgain; Index: src/org/openstreetmap/josm/tools/AudioUtil.java =================================================================== --- src/org/openstreetmap/josm/tools/AudioUtil.java (revision 6084) +++ src/org/openstreetmap/josm/tools/AudioUtil.java (working copy) @@ -23,7 +23,7 @@ * @param wavFile the recording file (WAV format) * @return the calibrated length of recording in seconds. */ - static public double getCalibratedDuration(File wavFile) { + public static double getCalibratedDuration(File wavFile) { try { AudioInputStream audioInputStream = AudioSystem.getAudioInputStream( new URL("file:".concat(wavFile.getAbsolutePath()))); Index: src/org/openstreetmap/josm/tools/CopyList.java =================================================================== --- src/org/openstreetmap/josm/tools/CopyList.java (revision 6084) +++ src/org/openstreetmap/josm/tools/CopyList.java (working copy) @@ -55,17 +55,20 @@ } // read-only access: - public @Override E get(int index) { + @Override + public E get(int index) { rangeCheck(index); return array[index]; } - public @Override int size() { + @Override + public int size() { return size; } // modification: - public @Override E set(int index, E element) { + @Override + public E set(int index, E element) { rangeCheck(index); changeCheck(); @@ -75,7 +78,8 @@ } // full resizable semantics: - public @Override void add(int index, E element) { + @Override + public void add(int index, E element) { // range check ensureCapacity(size+1); changeCheck(); @@ -85,7 +89,8 @@ size++; } - public @Override E remove(int index) { + @Override + public E remove(int index) { rangeCheck(index); changeCheck(); @@ -101,14 +106,16 @@ } // speed optimizations: - public @Override boolean add(E element) { + @Override + public boolean add(E element) { ensureCapacity(size+1); changeCheck(); array[size++] = element; return true; } - public @Override void clear() { + @Override + public void clear() { modCount++; // clean up the array @@ -124,7 +131,8 @@ * * @return a clone of this CopyList instance */ - public @Override Object clone() { + @Override + public Object clone() { return new CopyList(array, size); } Index: src/org/openstreetmap/josm/tools/Diff.java =================================================================== --- src/org/openstreetmap/josm/tools/Diff.java (revision 6084) +++ src/org/openstreetmap/josm/tools/Diff.java (working copy) @@ -475,7 +475,7 @@ } /** Standard ScriptBuilders. */ - public final static ScriptBuilder + public static final ScriptBuilder forwardScript = new ForwardScript(), reverseScript = new ReverseScript(); Index: src/org/openstreetmap/josm/tools/ImageProvider.java =================================================================== --- src/org/openstreetmap/josm/tools/ImageProvider.java (revision 6084) +++ src/org/openstreetmap/josm/tools/ImageProvider.java (working copy) @@ -107,7 +107,7 @@ */ private static Map cache = new HashMap(); - private final static ExecutorService imageFetcher = Executors.newSingleThreadExecutor(); + private static final ExecutorService imageFetcher = Executors.newSingleThreadExecutor(); public interface ImageCallback { void finished(ImageIcon result); @@ -766,7 +766,7 @@ } /** 90 degrees in radians units */ - final static double DEGREE_90 = 90.0 * Math.PI / 180.0; + static final double DEGREE_90 = 90.0 * Math.PI / 180.0; /** * Creates a rotated version of the input image. Index: src/org/openstreetmap/josm/tools/LanguageInfo.java =================================================================== --- src/org/openstreetmap/josm/tools/LanguageInfo.java (revision 6084) +++ src/org/openstreetmap/josm/tools/LanguageInfo.java (working copy) @@ -29,7 +29,7 @@ * base language is identical to default or english * @since 5915 */ - static public String getWikiLanguagePrefix(LocaleType type) { + public static String getWikiLanguagePrefix(LocaleType type) { if(type == LocaleType.ENGLISH) return ""; @@ -54,7 +54,7 @@ * @see Locale#getDefault() * @see #getWikiLanguagePrefix(LocaleType) */ - static public String getWikiLanguagePrefix() { + public static String getWikiLanguagePrefix() { return getWikiLanguagePrefix(LocaleType.DEFAULT); } @@ -64,7 +64,7 @@ * @return the JOSM locale code for the default locale * @see #getJOSMLocaleCode(Locale) */ - static public String getJOSMLocaleCode() { + public static String getJOSMLocaleCode() { return getJOSMLocaleCode(Locale.getDefault()); } @@ -78,7 +78,7 @@ * @param locale the locale. Replies "en" if null. * @return the JOSM code for the given locale */ - static public String getJOSMLocaleCode(Locale locale) { + public static String getJOSMLocaleCode(Locale locale) { if (locale == null) return "en"; String full = locale.toString(); if (full.equals("iw_IL")) @@ -100,7 +100,7 @@ * @param localeName the locale code. * @return the resulting locale */ - static public Locale getLocale(String localeName) { + public static Locale getLocale(String localeName) { if (localeName.equals("he")) { localeName = "iw_IL"; } @@ -117,11 +117,11 @@ return l; } - static public String getLanguageCodeXML() + public static String getLanguageCodeXML() { return getJOSMLocaleCode()+"."; } - static public String getLanguageCodeManifest() + public static String getLanguageCodeManifest() { return getJOSMLocaleCode()+"_"; } Index: src/org/openstreetmap/josm/tools/OsmUrlToBounds.java =================================================================== --- src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (revision 6084) +++ src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (working copy) @@ -189,7 +189,7 @@ * @param b bounds of the area * @return matching zoom level for area */ - static public int getZoom(Bounds b) { + public static int getZoom(Bounds b) { // convert to mercator (for calculation of zoom only) double latMin = Math.log(Math.tan(Math.PI/4.0+b.getMin().lat()/180.0*Math.PI/2.0))*180.0/Math.PI; double latMax = Math.log(Math.tan(Math.PI/4.0+b.getMax().lat()/180.0*Math.PI/2.0))*180.0/Math.PI; @@ -211,7 +211,7 @@ * @param b bounds of the area * @return link to display that area in OSM map */ - static public String getURL(Bounds b) { + public static String getURL(Bounds b) { return getURL(b.getCenter(), getZoom(b)); } @@ -222,7 +222,7 @@ * @param zoom zoom depth of display * @return link to display that area in OSM map */ - static public String getURL(LatLon pos, int zoom) { + public static String getURL(LatLon pos, int zoom) { // Truncate lat and lon to something more sensible int decimals = (int) Math.pow(10, (zoom / 3)); double lat = (Math.round(pos.lat() * decimals)); Index: src/org/openstreetmap/josm/tools/Shortcut.java =================================================================== --- src/org/openstreetmap/josm/tools/Shortcut.java (revision 6084) +++ src/org/openstreetmap/josm/tools/Shortcut.java (working copy) @@ -439,7 +439,7 @@ * * @return the platform specific key stroke for the 'Copy' command */ - static public KeyStroke getCopyKeyStroke() { + public static KeyStroke getCopyKeyStroke() { Shortcut sc = shortcuts.get("system:copy"); if (sc == null) return null; return sc.getKeyStroke(); @@ -452,7 +452,7 @@ * * @return the platform specific key stroke for the 'Paste' command */ - static public KeyStroke getPasteKeyStroke() { + public static KeyStroke getPasteKeyStroke() { Shortcut sc = shortcuts.get("system:paste"); if (sc == null) return null; return sc.getKeyStroke(); @@ -465,7 +465,7 @@ * * @return the platform specific key stroke for the 'Cut' command */ - static public KeyStroke getCutKeyStroke() { + public static KeyStroke getCutKeyStroke() { Shortcut sc = shortcuts.get("system:cut"); if (sc == null) return null; return sc.getKeyStroke(); Index: src/org/openstreetmap/josm/tools/Utils.java =================================================================== --- src/org/openstreetmap/josm/tools/Utils.java (revision 6084) +++ src/org/openstreetmap/josm/tools/Utils.java (working copy) @@ -320,7 +320,7 @@ } } - private final static double EPSILION = 1e-11; + private static final double EPSILION = 1e-11; public static boolean equalsEpsilon(double a, double b) { return Math.abs(a - b) <= EPSILION; @@ -549,7 +549,7 @@ * Upper/lower case does not matter. * @return The corresponding color. */ - static public Color hexToColor(String s) { + public static Color hexToColor(String s) { String clr = s.substring(1); if (clr.length() == 3) { clr = new String(new char[] { Index: src/org/openstreetmap/josm/tools/WindowGeometry.java =================================================================== --- src/org/openstreetmap/josm/tools/WindowGeometry.java (revision 6084) +++ src/org/openstreetmap/josm/tools/WindowGeometry.java (working copy) @@ -30,7 +30,7 @@ * @param extent the size * @return the geometry object */ - static public WindowGeometry centerOnScreen(Dimension extent) { + public static WindowGeometry centerOnScreen(Dimension extent) { return centerOnScreen(extent, "gui.geometry"); } @@ -43,7 +43,7 @@ * for whole virtual screen * @return the geometry object */ - static public WindowGeometry centerOnScreen(Dimension extent, String preferenceKey) { + public static WindowGeometry centerOnScreen(Dimension extent, String preferenceKey) { Rectangle size = preferenceKey != null ? getScreenInfo(preferenceKey) : getFullScreenInfo(); Point topLeft = new Point( @@ -61,7 +61,7 @@ * @param extent the size * @return the geometry object */ - static public WindowGeometry centerInWindow(Component reference, Dimension extent) { + public static WindowGeometry centerInWindow(Component reference, Dimension extent) { Window parentWindow = null; while(reference != null && ! (reference instanceof Window) ) { reference = reference.getParent(); @@ -81,7 +81,7 @@ /** * Exception thrown by the WindowGeometry class if something goes wrong */ - static public class WindowGeometryException extends Exception { + public static class WindowGeometryException extends Exception { public WindowGeometryException(String message, Throwable cause) { super(message, cause); } @@ -177,7 +177,7 @@ this.extent = other.extent; } - static public WindowGeometry mainWindow(String preferenceKey, String arg, boolean maximize) { + public static WindowGeometry mainWindow(String preferenceKey, String arg, boolean maximize) { Rectangle screenDimension = getScreenInfo("gui.geometry"); if (arg != null) { final Matcher m = Pattern.compile("(\\d+)x(\\d+)(([+-])(\\d+)([+-])(\\d+))?").matcher(arg);