Index: trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (revision 6889) @@ -39,5 +39,5 @@ * @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/?$"); @@ -58,5 +58,5 @@ * @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/?$"); Index: trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java (revision 6889) @@ -28,5 +28,5 @@ * */ - static public class LayerListCellRenderer extends DefaultListCellRenderer { + public static class LayerListCellRenderer extends DefaultListCellRenderer { @Override Index: trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 6889) @@ -4,5 +4,4 @@ import static org.openstreetmap.josm.gui.help.HelpUtil.ht; import static org.openstreetmap.josm.tools.I18n.tr; -import static org.openstreetmap.josm.tools.I18n.trc; import static org.openstreetmap.josm.tools.I18n.trn; @@ -258,5 +257,5 @@ * A pair of nodes. */ - static public class NodePair { + public static class NodePair { private final Node a; private final Node b; @@ -376,6 +375,6 @@ } - static public class NodeGraph { - static public List buildNodePairs(Way way, boolean directed) { + public static class NodeGraph { + public static List buildNodePairs(Way way, boolean directed) { List pairs = new ArrayList(); for (Pair pair: way.getNodePairs(false /* don't sort */)) { @@ -388,5 +387,5 @@ } - static public List buildNodePairs(List ways, boolean directed) { + public static List buildNodePairs(List ways, boolean directed) { List pairs = new ArrayList(); for (Way w: ways) { @@ -396,5 +395,5 @@ } - static public List eliminateDuplicateNodePairs(List pairs) { + public static List eliminateDuplicateNodePairs(List pairs) { List cleaned = new ArrayList(); for(NodePair p: pairs) { @@ -406,5 +405,5 @@ } - static public NodeGraph createDirectedGraphFromNodePairs(List pairs) { + public static NodeGraph createDirectedGraphFromNodePairs(List pairs) { NodeGraph graph = new NodeGraph(); for (NodePair pair: pairs) { @@ -414,5 +413,5 @@ } - static public NodeGraph createDirectedGraphFromWays(Collection ways) { + public static NodeGraph createDirectedGraphFromWays(Collection ways) { NodeGraph graph = new NodeGraph(); for (Way w: ways) { @@ -422,5 +421,5 @@ } - static public NodeGraph createUndirectedGraphFromNodeList(List pairs) { + public static NodeGraph createUndirectedGraphFromNodeList(List pairs) { NodeGraph graph = new NodeGraph(); for (NodePair pair: pairs) { Index: trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java (revision 6889) @@ -14,5 +14,5 @@ * @since 78 */ -abstract public class DiskAccessAction extends JosmAction { +public abstract class DiskAccessAction extends JosmAction { /** Index: trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java (revision 6889) @@ -28,5 +28,5 @@ private static final ExpertToggleAction INSTANCE = new ExpertToggleAction(); - private synchronized static void fireExpertModeChanged(boolean isExpert) { + private static synchronized void fireExpertModeChanged(boolean isExpert) { { Iterator> it = listeners.iterator(); @@ -64,5 +64,5 @@ } - 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) { @@ -81,5 +81,5 @@ * @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(); @@ -94,5 +94,5 @@ } - public synchronized static void addVisibilitySwitcher(Component c) { + public static synchronized void addVisibilitySwitcher(Component c) { if (c == null) return; for (WeakReference wr : visibilityToggleListeners) { @@ -104,5 +104,5 @@ } - public synchronized static void removeVisibilitySwitcher(Component c) { + public static synchronized void removeVisibilitySwitcher(Component c) { if (c == null) return; Iterator> it = visibilityToggleListeners.iterator(); Index: trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (revision 6889) @@ -95,5 +95,5 @@ private final String defaultExtension; - static protected void sort(List filters) { + protected static void sort(List filters) { Collections.sort( filters, Index: trunk/src/org/openstreetmap/josm/actions/JosmAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/JosmAction.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/actions/JosmAction.java (revision 6889) @@ -38,5 +38,5 @@ * @author imi */ -abstract public class JosmAction extends AbstractAction implements Destroyable { +public abstract class JosmAction extends AbstractAction implements Destroyable { protected Shortcut sc; Index: trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 6889) @@ -83,9 +83,9 @@ * @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); @@ -93,5 +93,5 @@ } - static public class OpenFileTask extends PleaseWaitRunnable { + public static class OpenFileTask extends PleaseWaitRunnable { private List files; private List successfullyOpenedFiles = new ArrayList(); Index: trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 6889) @@ -405,11 +405,11 @@ */ 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 - // segments turned by 90 degrees + // segments turned by 90 degrees public double heading; // heading of segSum == approximate heading of the way public WayData(Way pWay) { Index: trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (revision 6889) @@ -259,5 +259,5 @@ * @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"); @@ -532,5 +532,5 @@ * @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; Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 6889) @@ -120,5 +120,6 @@ } - @Override public void exitMode() { + @Override + public void exitMode() { super.exitMode(); Main.map.mapView.removeMouseListener(this); @@ -132,10 +133,11 @@ } - @Override public void actionPerformed(ActionEvent e) { + @Override + public void actionPerformed(ActionEvent e) { super.actionPerformed(e); doActionPerformed(e); } - static public void doActionPerformed(ActionEvent e) { + public static void doActionPerformed(ActionEvent e) { if(!Main.map.mapView.isActiveLayerDrawable()) return; Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 6889) @@ -82,6 +82,6 @@ */ 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; Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 6889) @@ -823,5 +823,5 @@ * @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 { Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java (revision 6889) @@ -74,11 +74,11 @@ 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; Index: trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java (revision 6889) @@ -24,5 +24,5 @@ * 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; Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ModifiersSpec.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/ModifiersSpec.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/ModifiersSpec.java (revision 6889) @@ -8,5 +8,5 @@ */ 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; Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java (revision 6889) @@ -188,5 +188,5 @@ } - static private Node copyNode(Node source, boolean copyTags) { + private static Node copyNode(Node source, boolean copyTags) { if (copyTags) return new Node(source, true); Index: trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 6889) @@ -75,5 +75,5 @@ // 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"), @@ -666,8 +666,7 @@ * still pressed) */ - final private boolean dragInProgress() { + private final boolean dragInProgress() { return didMouseDrag && startingDraggingPos != null; } - /** @@ -832,5 +831,5 @@ * 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()) @@ -850,5 +849,5 @@ * 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(), Index: trunk/src/org/openstreetmap/josm/data/Preferences.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 6889) @@ -154,5 +154,5 @@ * @param The setting type */ - abstract public static class AbstractSetting implements Setting { + public abstract static class AbstractSetting implements Setting { protected final T value; /** @@ -1307,5 +1307,5 @@ * The default plugin site */ - private final static String[] DEFAULT_PLUGIN_SITE = {Main.JOSM_WEBSITE+"/plugin%"}; + private static final String[] DEFAULT_PLUGIN_SITE = {Main.JOSM_WEBSITE+"/plugin%"}; /** Index: trunk/src/org/openstreetmap/josm/data/Version.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/Version.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/data/Version.java (revision 6889) @@ -23,5 +23,5 @@ 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 */ @@ -34,5 +34,5 @@ * @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; @@ -60,6 +60,5 @@ * @return the unique instance of the version information */ - - static public Version getInstance() { + public static Version getInstance() { if (instance == null) { instance = new Version(); Index: trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (revision 6889) @@ -675,5 +675,5 @@ * 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); /** Index: trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java (revision 6889) @@ -34,5 +34,5 @@ public final class ChangesetCache implements PreferenceChangedListener{ /** the unique instance */ - static private final ChangesetCache instance = new ChangesetCache(); + private static final ChangesetCache instance = new ChangesetCache(); /** Index: trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java (revision 6889) @@ -28,6 +28,6 @@ } - final private Map primitives = new HashMap(); - final private Map modificationTypes = new HashMap(); + private final Map primitives = new HashMap(); + private final Map modificationTypes = new HashMap(); /** Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 6889) @@ -40,5 +40,5 @@ * @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"; @@ -119,5 +119,5 @@ * @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(); @@ -141,5 +141,5 @@ * @return the sub-set of OSM primitives of type type */ - static public Set getFilteredSet(Collection set, Class type) { + public static Set getFilteredSet(Collection set, Class type) { Set ret = new LinkedHashSet(); if (set != null) { @@ -160,5 +160,5 @@ * 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; @@ -1077,5 +1077,5 @@ * @param visitor The visitor from which the visit() function must be called. */ - abstract public void accept(Visitor visitor); + public abstract void accept(Visitor visitor); /** Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java (revision 6889) @@ -10,6 +10,6 @@ /** Comparator, comparing by type and objects display names */ public class OsmPrimitiveComparator implements Comparator { - final private Map cache= new HashMap(); - final private DefaultNameFormatter df = DefaultNameFormatter.getInstance(); + private final Map cache= new HashMap(); + private final DefaultNameFormatter df = DefaultNameFormatter.getInstance(); public boolean relationsFirst = false; @@ -26,6 +26,5 @@ String an = cachedName(a); String bn = cachedName(b); - // make sure display names starting with digits are the end of the - // list + // make sure display names starting with digits are the end of the list if (Character.isDigit(an.charAt(0)) && Character.isDigit(bn.charAt(0))) return an.compareTo(bn); Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java (revision 6889) @@ -19,5 +19,5 @@ 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; Index: trunk/src/org/openstreetmap/josm/data/osm/PrimitiveData.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/PrimitiveData.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/data/osm/PrimitiveData.java (revision 6889) @@ -17,4 +17,7 @@ public abstract class PrimitiveData extends AbstractPrimitive { + /** + * Constructs a new {@code PrimitiveData}. + */ public PrimitiveData() { id = OsmPrimitive.generateUniqueId(); @@ -51,5 +54,5 @@ @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) { Index: trunk/src/org/openstreetmap/josm/data/osm/RelationToChildReference.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/RelationToChildReference.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/data/osm/RelationToChildReference.java (revision 6889) @@ -14,5 +14,5 @@ * @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(); @@ -34,5 +34,5 @@ * primitives */ - static public Set getRelationToChildReferences(Collection children) { + public static Set getRelationToChildReferences(Collection children) { Set references = new HashSet(); for (OsmPrimitive child: children) { Index: trunk/src/org/openstreetmap/josm/data/osm/User.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/User.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/data/osm/User.java (revision 6889) @@ -25,5 +25,5 @@ public final class User { - static private AtomicLong uidCounter = new AtomicLong(); + private static AtomicLong uidCounter = new AtomicLong(); /** @@ -31,5 +31,5 @@ */ private static Map userMap = new HashMap(); - private final static User anonymous = createLocalUser(tr("")); + private static final User anonymous = createLocalUser(tr("")); private static long getNextLocalUid() { Index: trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java (revision 6889) @@ -113,5 +113,5 @@ * @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 (isYesOrNo(ret)) @@ -156,5 +156,5 @@ * @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 (isYesOrNo(ret)) @@ -190,5 +190,5 @@ * @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 (getDialogReturnValue(preferenceKey) == Integer.MAX_VALUE) return; Index: trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 6889) @@ -47,5 +47,5 @@ public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter { - static private DefaultNameFormatter instance; + private static DefaultNameFormatter instance; private static final List formatHooks = new LinkedList(); @@ -56,5 +56,5 @@ * @return the unique instance of this formatter */ - static public DefaultNameFormatter getInstance() { + public static DefaultNameFormatter getInstance() { if (instance == null) { instance = new DefaultNameFormatter(); @@ -91,9 +91,9 @@ * 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; /** @@ -106,5 +106,5 @@ * @return the list of naming tags used in relations */ - static public List getNamingtagsForRelations() { + public static List getNamingtagsForRelations() { if (namingTagsForRelations == null) { namingTagsForRelations = new ArrayList( Index: trunk/src/org/openstreetmap/josm/gui/FileDrop.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/FileDrop.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/FileDrop.java (revision 6889) @@ -514,11 +514,11 @@ * @version 1.2 */ - public static class TransferableObject implements Transferable - { + public static class TransferableObject implements Transferable { + /** * The MIME type for {@link #DATA_FLAVOR} is * application/x-net.iharder.dnd.TransferableObject. */ - public final static String MIME_TYPE = "application/x-net.iharder.dnd.TransferableObject"; + public static final String MIME_TYPE = "application/x-net.iharder.dnd.TransferableObject"; /** @@ -529,5 +529,5 @@ * application/x-net.iharder.dnd.TransferableObject. */ - public final static DataFlavor DATA_FLAVOR = + public static final DataFlavor DATA_FLAVOR = new DataFlavor( FileDrop.TransferableObject.class, MIME_TYPE ); Index: trunk/src/org/openstreetmap/josm/gui/GettingStarted.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 6889) @@ -75,7 +75,7 @@ } - 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(); /** Index: trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java (revision 6889) @@ -106,5 +106,5 @@ } - static private class DefaultAction extends AbstractAction { + private static class DefaultAction extends AbstractAction { private JDialog dialog; private JOptionPane pane; @@ -132,5 +132,5 @@ * @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) { @@ -167,5 +167,5 @@ * @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")); @@ -211,5 +211,5 @@ * @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) { @@ -318,5 +318,5 @@ * @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); } @@ -329,5 +329,5 @@ * 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 Index: trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (revision 6889) @@ -51,5 +51,5 @@ public final class JosmUserIdentityManager implements PreferenceChangedListener{ - static private JosmUserIdentityManager instance; + private static JosmUserIdentityManager instance; /** @@ -58,5 +58,5 @@ * @return the unique instance of the JOSM user identity manager */ - static public JosmUserIdentityManager getInstance() { + public static JosmUserIdentityManager getInstance() { if (instance == null) { instance = new JosmUserIdentityManager(); Index: trunk/src/org/openstreetmap/josm/gui/MainApplet.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MainApplet.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/MainApplet.java (revision 6889) @@ -36,5 +36,5 @@ 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 { @@ -61,5 +61,5 @@ } - private final static String[][] paramInfo = { + private static final String[][] paramInfo = { {"username", tr("string"), tr("Name of the user.")}, {"password", tr("string"), tr("OSM Password.")}, Index: trunk/src/org/openstreetmap/josm/gui/MainMenu.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MainMenu.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/MainMenu.java (revision 6889) @@ -385,5 +385,5 @@ * these groups are empty. */ - public final static MenuListener menuSeparatorHandler = new MenuListener() { + public static final MenuListener menuSeparatorHandler = new MenuListener() { @Override public void menuCanceled(MenuEvent arg0) {} Index: trunk/src/org/openstreetmap/josm/gui/MapScaler.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MapScaler.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/MapScaler.java (revision 6889) @@ -41,5 +41,5 @@ } - static public Color getColor() { + public static Color getColor() { return Main.pref.getColor(marktr("scale"), Color.white); } Index: trunk/src/org/openstreetmap/josm/gui/Notification.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/Notification.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/Notification.java (revision 6889) @@ -30,5 +30,5 @@ public class Notification { - public final static int DEFAULT_CONTENT_WIDTH = 350; + public static final int DEFAULT_CONTENT_WIDTH = 350; // some standard duration values (in milliseconds) @@ -38,18 +38,21 @@ * E.g. "Please select at least one node". */ - public final static int TIME_SHORT = Main.pref.getInteger("notification-time-short-ms", 3000); + public static final int TIME_SHORT = Main.pref.getInteger("notification-time-short-ms", 3000); + /** * Short message of one or two lines (5 s). */ - public final static int TIME_DEFAULT = Main.pref.getInteger("notification-time-default-ms", 5000); + public static final int TIME_DEFAULT = Main.pref.getInteger("notification-time-default-ms", 5000); + /** * Somewhat longer message (10 s). */ - public final static int TIME_LONG = Main.pref.getInteger("notification-time-long-ms", 10000); + public static final int TIME_LONG = Main.pref.getInteger("notification-time-long-ms", 10000); + /** * Long text. * (Make sure is still sensible to show as a notification) */ - public final static int TIME_VERY_LONG = Main.pref.getInteger("notification-time-very_long-ms", 20000); + public static final int TIME_VERY_LONG = Main.pref.getInteger("notification-time-very_long-ms", 20000); private Component content; Index: trunk/src/org/openstreetmap/josm/gui/SideButton.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/SideButton.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/SideButton.java (revision 6889) @@ -25,5 +25,5 @@ */ public class SideButton extends JButton implements Destroyable { - private final static int iconHeight = 20; + private static final int iconHeight = 20; private PropertyChangeListener propertyChangeListener; Index: trunk/src/org/openstreetmap/josm/gui/SplashScreen.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/SplashScreen.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/SplashScreen.java (revision 6889) @@ -111,5 +111,5 @@ } - static private class SplashScreenProgressRenderer extends JPanel implements ProgressRenderer { + private static class SplashScreenProgressRenderer extends JPanel implements ProgressRenderer { private JLabel lblTaskTitle; private JLabel lblCustomText; Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (revision 6889) @@ -87,5 +87,5 @@ /** the unique instance of the dialog */ - static private CombinePrimitiveResolverDialog instance; + private static CombinePrimitiveResolverDialog instance; /** Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (revision 6889) @@ -503,5 +503,5 @@ } - static private class StatisticsInfoTable extends JPanel { + private static class StatisticsInfoTable extends JPanel { private JTable infoTable; Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 6889) @@ -71,5 +71,5 @@ * @see #paintConflicts */ - static public Color getColor() { + public static Color getColor() { return Main.pref.getColor(marktr("conflict"), Color.gray); } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java (revision 6889) @@ -27,5 +27,5 @@ private List panels = new ArrayList(); - final private JSplitPane parent; + private final JSplitPane parent; public DialogsPanel(JSplitPane parent) { this.parent = parent; Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 6889) @@ -80,5 +80,5 @@ public class LayerListDialog extends ToggleDialog { /** the unique instance of the dialog */ - static private LayerListDialog instance; + private static LayerListDialog instance; /** @@ -87,5 +87,5 @@ * @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"); @@ -100,5 +100,5 @@ * @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"); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java (revision 6889) @@ -31,5 +31,5 @@ public class LayerListPopup extends JPopupMenu { - public final static class InfoAction extends AbstractAction { + public static final class InfoAction extends AbstractAction { private final Layer layer; Index: trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 6889) @@ -38,5 +38,4 @@ import org.openstreetmap.josm.actions.relation.EditRelationAction; import org.openstreetmap.josm.actions.relation.SelectInRelationListAction; -import org.openstreetmap.josm.actions.search.SearchAction; import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting; import org.openstreetmap.josm.data.SelectionChangedListener; @@ -408,5 +407,5 @@ * */ - 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; @@ -656,5 +655,5 @@ */ protected static class SearchMenuItem extends JMenuItem implements ActionListener { - final protected SearchSetting s; + protected final SearchSetting s; public SearchMenuItem(SearchSetting s) { @@ -675,5 +674,5 @@ */ 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; @@ -696,5 +695,5 @@ */ protected static class SelectionMenuItem extends JMenuItem implements ActionListener { - final private DefaultNameFormatter df = DefaultNameFormatter.getInstance(); + private final DefaultNameFormatter df = DefaultNameFormatter.getInstance(); protected Collection sel; @@ -755,5 +754,5 @@ */ 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); @@ -770,5 +769,5 @@ /** 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) { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 6889) @@ -115,5 +115,5 @@ protected final ToggleDialogAction toggleAction; protected String preferencePrefix; - final protected String name; + protected final String name; /** DialogsPanel that manages all ToggleDialogs */ Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 6889) @@ -280,5 +280,5 @@ * open or closed changesets */ - static private class OpenAndCloseStateRestrictionPanel extends JPanel { + private static class OpenAndCloseStateRestrictionPanel extends JPanel { private JRadioButton rbOpenOnly; @@ -928,5 +928,5 @@ } - static private class BBoxRestrictionPanel extends BoundingBoxSelectionPanel { + private static class BBoxRestrictionPanel extends BoundingBoxSelectionPanel { public BBoxRestrictionPanel() { setBorder(BorderFactory.createCompoundBorder( Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java (revision 6889) @@ -18,9 +18,9 @@ */ 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); /** @@ -66,5 +66,5 @@ @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: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java (revision 6889) @@ -17,9 +17,9 @@ 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(); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java (revision 6889) @@ -29,5 +29,5 @@ * @return the singleton {@link RelationDialogManager} */ - static public RelationDialogManager getRelationDialogManager() { + public static RelationDialogManager getRelationDialogManager() { if (RelationDialogManager.relationDialogManager == null) { RelationDialogManager.relationDialogManager = new RelationDialogManager(); @@ -42,5 +42,5 @@ * */ - static private class DialogContext { + private static class DialogContext { public final Relation relation; public final OsmDataLayer layer; Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (revision 6889) @@ -24,10 +24,10 @@ * @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 */ @@ -207,5 +207,5 @@ /* property change support */ /* ----------------------------------------------------------------------- */ - final private PropertyChangeSupport support = new PropertyChangeSupport(this); + private final PropertyChangeSupport support = new PropertyChangeSupport(this); @Override Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRenderer.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRenderer.java (revision 6889) @@ -20,5 +20,5 @@ */ 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 */ Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java (revision 6889) @@ -19,6 +19,6 @@ */ 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); /** Index: trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (revision 6889) @@ -48,6 +48,6 @@ */ 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 JRadioButton rbUseNew; Index: trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java (revision 6889) @@ -43,5 +43,5 @@ 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)) { @@ -54,5 +54,5 @@ } - 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); @@ -320,5 +320,5 @@ } - static private class SelectAllOnFocusHandler extends FocusAdapter { + private static class SelectAllOnFocusHandler extends FocusAdapter { @Override public void focusGained(FocusEvent e) { @@ -337,5 +337,5 @@ * 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; Index: trunk/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java (revision 6889) @@ -32,7 +32,7 @@ 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(); @@ -41,9 +41,8 @@ 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; - /** constructor that sets the default on each element **/ @@ -61,5 +60,6 @@ tfFilename.addFocusListener( new FocusAdapter() { - @Override public void focusGained(FocusEvent e) { + @Override + public void focusGained(FocusEvent e) { tfFilename.selectAll(); } Index: trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 6889) @@ -52,5 +52,5 @@ public class SaveLayersDialog extends JDialog implements TableModelListener { - static public enum UserAction { + public static enum UserAction { /** * save/upload layers was successful, proceed with operation @@ -58,6 +58,5 @@ PROCEED, /** - * save/upload of layers was not successful or user canceled - * operation + * save/upload of layers was not successful or user canceled operation */ CANCEL Index: trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java (revision 6889) @@ -15,5 +15,5 @@ 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, @@ -29,4 +29,7 @@ private static final int columnActions = 2; + /** + * Constructs a new {@code SaveLayersModel}. + */ public SaveLayersModel() { mode = Mode.EDITING_DATA; Index: trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java (revision 6889) @@ -23,5 +23,5 @@ 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() { Index: trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 6889) @@ -63,10 +63,10 @@ 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(); /** @@ -75,5 +75,5 @@ * @return the unique instance of the upload dialog */ - static public UploadDialog getUploadDialog() { + public static UploadDialog getUploadDialog() { if (uploadDialog == null) { uploadDialog = new UploadDialog(); Index: trunk/src/org/openstreetmap/josm/gui/io/UploadStrategy.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UploadStrategy.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/io/UploadStrategy.java (revision 6889) @@ -50,5 +50,5 @@ * the default upload strategy */ - public final static UploadStrategy DEFAULT_UPLOAD_STRATEGY = SINGLE_REQUEST_STRATEGY; + public static final UploadStrategy DEFAULT_UPLOAD_STRATEGY = SINGLE_REQUEST_STRATEGY; /** Index: trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (revision 6889) @@ -46,5 +46,5 @@ * 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"; Index: trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java (revision 6889) @@ -15,5 +15,5 @@ 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; Index: trunk/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java (revision 6889) @@ -25,5 +25,5 @@ */ 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 */ Index: trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 6889) @@ -255,5 +255,5 @@ /* for preferences */ - static public Color getGenericColor() { + public static Color getGenericColor() { return Main.pref.getColor(marktr("gps point"), Color.gray); } @@ -363,5 +363,5 @@ } - 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++) { @@ -370,5 +370,5 @@ } - 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++) { @@ -405,8 +405,8 @@ // 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 }, @@ -814,5 +814,5 @@ * additional entries are initialized to true; */ - final private void ensureTrackVisibilityLength() { + private final void ensureTrackVisibilityLength() { final int l = data.tracks.size(); if (l == trackVisibility.length) Index: trunk/src/org/openstreetmap/josm/gui/layer/Layer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/Layer.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/layer/Layer.java (revision 6889) @@ -48,5 +48,5 @@ * @author imi */ -abstract public class Layer implements Destroyable, MapViewPaintable, ProjectionChangeListener { +public abstract class Layer implements Destroyable, MapViewPaintable, ProjectionChangeListener { public interface LayerAction { @@ -59,5 +59,4 @@ } - /** * Special class that can be returned by getMenuEntries when JSeparator needs to be created @@ -80,9 +79,9 @@ } - 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"; - - static public final int ICON_SIZE = 16; + 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"; + + public static final int ICON_SIZE = 16; /** keeps track of property change listeners */ @@ -142,10 +141,11 @@ */ @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(); /** @@ -162,5 +162,5 @@ * @return A small tooltip hint about some statistics for this layer. */ - abstract public String getToolTipText(); + public abstract String getToolTipText(); /** @@ -171,5 +171,5 @@ * 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); /** @@ -177,9 +177,9 @@ * @return Whether the other layer can be merged into this layer. */ - abstract public boolean isMergable(Layer other); - - abstract public void visitBoundingBox(BoundingXYVisitor v); - - abstract public Object getInfoComponent(); + public abstract boolean isMergable(Layer other); + + public abstract void visitBoundingBox(BoundingXYVisitor v); + + public abstract Object getInfoComponent(); /** @@ -200,5 +200,5 @@ * */ - abstract public Action[] getMenuEntries(); + public abstract Action[] getMenuEntries(); /** Index: trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 6889) @@ -91,6 +91,6 @@ */ 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; @@ -122,5 +122,5 @@ /** the global counter for created data layers */ - static private int dataLayerCounter = 0; + private static int dataLayerCounter = 0; /** @@ -129,10 +129,10 @@ * @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; Index: trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 6889) @@ -471,5 +471,5 @@ * in preferences. */ - static public void setMaxWorkers() { + public static void setMaxWorkers() { JobDispatcher.setMaxWorkers(PROP_TMS_JOBS.get()); JobDispatcher.getInstance().setLIFO(true); Index: trunk/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java (revision 6889) @@ -174,6 +174,6 @@ * 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: trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java (revision 6889) @@ -25,5 +25,5 @@ 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) { Index: trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java (revision 6889) @@ -14,5 +14,5 @@ import org.openstreetmap.josm.gui.mappaint.mapcss.Instruction.RelativeFloat; -abstract public class ElemStyle implements StyleKeys { +public abstract class ElemStyle implements StyleKeys { protected static final String[] ICON_KEYS = {"icon-image", "icon-width", "icon-height", "icon-opacity"}; @@ -91,7 +91,7 @@ * 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"); @@ -99,5 +99,5 @@ } - static private class FontDescriptor { + private static class FontDescriptor { public String name; public int style; @@ -141,6 +141,6 @@ } - 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; @@ -150,5 +150,5 @@ } - 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: trunk/src/org/openstreetmap/josm/gui/mappaint/Keyword.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/Keyword.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/Keyword.java (revision 6889) @@ -28,9 +28,9 @@ } - 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: trunk/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java (revision 6889) @@ -43,7 +43,7 @@ * if no suitable value could be composed */ - abstract public String compose(OsmPrimitive primitive); - - static public class StaticLabelCompositionStrategy extends LabelCompositionStrategy { + public abstract String compose(OsmPrimitive primitive); + + public static class StaticLabelCompositionStrategy extends LabelCompositionStrategy { private String defaultLabel; @@ -92,5 +92,5 @@ } - static public class TagLookupCompositionStrategy extends LabelCompositionStrategy { + public static class TagLookupCompositionStrategy extends LabelCompositionStrategy { private String defaultLabelTag; @@ -147,5 +147,5 @@ } - static public class DeriveLabelFromNameTagsCompositionStrategy extends LabelCompositionStrategy { + public static class DeriveLabelFromNameTagsCompositionStrategy extends LabelCompositionStrategy { /** Index: trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java (revision 6889) @@ -25,7 +25,7 @@ private final List data; - private final static 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(); + private static final Storage internPool = new Storage(); // TODO: clean up the intern pool from time to time (after purge or layer removal) + + public static final StyleCache EMPTY_STYLECACHE = (new StyleCache()).intern(); private StyleCache() { Index: trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java (revision 6889) @@ -21,5 +21,5 @@ import org.openstreetmap.josm.tools.Utils; -abstract public class StyleSource extends SourceEntry { +public abstract class StyleSource extends SourceEntry { private List errors = new ArrayList(); @@ -44,7 +44,7 @@ } - 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(); /** @@ -54,5 +54,5 @@ * @see #closeSourceInputStream(InputStream) */ - abstract public InputStream getSourceInputStream() throws IOException; + public abstract InputStream getSourceInputStream() throws IOException; /** @@ -101,5 +101,5 @@ } - final public ImageIcon getIcon() { + public final ImageIcon getIcon() { if (getErrors().isEmpty()) return getSourceIcon(); Index: trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java (revision 6889) @@ -20,5 +20,5 @@ */ 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}. Index: trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java (revision 6889) @@ -175,5 +175,5 @@ } - static private class AccessTokenKeyValidator extends AbstractTextComponentValidator { + private static class AccessTokenKeyValidator extends AbstractTextComponentValidator { public AccessTokenKeyValidator(JTextComponent tc) throws IllegalArgumentException { Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java (revision 6889) @@ -6,5 +6,5 @@ import org.openstreetmap.josm.data.projection.Projections; -abstract public class AbstractProjectionChoice implements ProjectionChoice { +public abstract class AbstractProjectionChoice implements ProjectionChoice { protected String name; @@ -53,7 +53,7 @@ } - abstract public String getCurrentCode(); + public abstract String getCurrentCode(); - abstract public String getProjectionName(); + public abstract String getProjectionName(); @Override Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java (revision 6889) @@ -17,5 +17,5 @@ * 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 @@ -54,10 +54,10 @@ * 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 Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java (revision 6889) @@ -253,12 +253,12 @@ * Combobox with all projections available */ - private JosmComboBox projectionCombo = new JosmComboBox(projectionChoices.toArray()); + private final JosmComboBox projectionCombo = new JosmComboBox(projectionChoices.toArray()); /** * Combobox with all coordinate display possibilities */ - private JosmComboBox coordinatesCombo = new JosmComboBox(CoordinateFormat.values()); - - private JosmComboBox unitsCombo = new JosmComboBox(unitsValuesTr); + private final JosmComboBox coordinatesCombo = new JosmComboBox(CoordinateFormat.values()); + + private final JosmComboBox unitsCombo = new JosmComboBox(unitsValuesTr); /** @@ -281,5 +281,5 @@ * This is the panel holding all projection preferences */ - private JPanel projPanel = new JPanel(new GridBagLayout()); + private final JPanel projPanel = new JPanel(new GridBagLayout()); /** @@ -288,5 +288,5 @@ * in sync */ - static private GBC projSubPrefPanelGBC = GBC.std().fill(GBC.BOTH).weight(1.0, 1.0); + private static final GBC projSubPrefPanelGBC = GBC.std().fill(GBC.BOTH).weight(1.0, 1.0); @Override @@ -380,9 +380,9 @@ } - 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); Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java (revision 6889) @@ -11,17 +11,17 @@ public class UTMFranceDOMProjectionChoice 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 }; /** Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java (revision 6889) @@ -33,5 +33,5 @@ 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++) { Index: trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java (revision 6889) @@ -25,10 +25,10 @@ * 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; /** @@ -40,15 +40,15 @@ * 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; /** Index: trunk/src/org/openstreetmap/josm/io/CacheFiles.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/CacheFiles.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/io/CacheFiles.java (revision 6889) @@ -29,12 +29,12 @@ * 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; - - final private File dir; - final private String ident; - final private boolean enabled; + 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; + + private final File dir; + private final String ident; + private final boolean enabled; private long expire; // in seconds @@ -273,7 +273,8 @@ } - 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 Index: trunk/src/org/openstreetmap/josm/io/ChangesetClosedException.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/ChangesetClosedException.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/io/ChangesetClosedException.java (revision 6889) @@ -31,5 +31,5 @@ * 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 { @@ -57,5 +57,5 @@ * @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; Index: trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java (revision 6889) @@ -36,5 +36,5 @@ * */ - static public ChangesetQuery buildFromUrlQuery(String query) throws ChangesetQueryUrlException{ + public static ChangesetQuery buildFromUrlQuery(String query) throws ChangesetQueryUrlException{ return new ChangesetQueryUrlParser().parse(query); } Index: trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java (revision 6889) @@ -32,5 +32,5 @@ public class DiffResultProcessor { - static private class DiffResultEntry { + private static class DiffResultEntry { public long new_id; public int new_version; Index: trunk/src/org/openstreetmap/josm/io/GpxExporter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/GpxExporter.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/io/GpxExporter.java (revision 6889) @@ -39,5 +39,5 @@ 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: trunk/src/org/openstreetmap/josm/io/GpxWriter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/GpxWriter.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/io/GpxWriter.java (revision 6889) @@ -41,7 +41,7 @@ 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) { Index: trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java (revision 6889) @@ -34,5 +34,5 @@ File file = null; - public final static long DEFAULT_MAXTIME = -1L; + public static final long DEFAULT_MAXTIME = -1L; /** Index: trunk/src/org/openstreetmap/josm/io/NmeaReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/NmeaReader.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/io/NmeaReader.java (revision 6889) @@ -132,13 +132,12 @@ public GpxData data; - // private final static SimpleDateFormat GGATIMEFMT = + // private static final 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) - { + private Date readTime(String p) { Date d = RMCTIMEFMT.parse(p, new ParsePosition(0)); if (d == null) { Index: trunk/src/org/openstreetmap/josm/io/OsmApi.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 6889) @@ -59,5 +59,5 @@ * 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; /** @@ -67,5 +67,5 @@ * @since 5386 */ - static public final int MAX_DOWNLOAD_THREADS = 2; + public static final int MAX_DOWNLOAD_THREADS = 2; /** @@ -73,5 +73,5 @@ * @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 @@ -88,5 +88,5 @@ * */ - static public OsmApi getOsmApi(String serverUrl) { + public static OsmApi getOsmApi(String serverUrl) { OsmApi api = instances.get(serverUrl); if (api == null) { @@ -102,5 +102,5 @@ * @return the OsmApi */ - static public OsmApi getOsmApi() { + public static OsmApi getOsmApi() { String serverUrl = Main.pref.get("osm-server.url", DEFAULT_API_URL); return getOsmApi(serverUrl); Index: trunk/src/org/openstreetmap/josm/io/OsmApiPrimitiveGoneException.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmApiPrimitiveGoneException.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/io/OsmApiPrimitiveGoneException.java (revision 6889) @@ -17,5 +17,5 @@ * 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; Index: trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java (revision 6889) @@ -18,5 +18,5 @@ */ public class OsmChangeBuilder { - static public final String DEFAULT_API_VERSION = "0.6"; + public static final String DEFAULT_API_VERSION = "0.6"; private String currentMode; Index: trunk/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java (revision 6889) @@ -25,5 +25,5 @@ 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(); } @@ -35,5 +35,5 @@ * @throws OsmDataParsingException if parsing goes wrong */ - static public UserInfo buildFromXML(Document document) throws OsmDataParsingException { + public static UserInfo buildFromXML(Document document) throws OsmDataParsingException { try { XPathFactory factory = XPathFactory.newInstance(); Index: trunk/src/org/openstreetmap/josm/tools/AudioUtil.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/AudioUtil.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/tools/AudioUtil.java (revision 6889) @@ -28,5 +28,5 @@ * @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( Index: trunk/src/org/openstreetmap/josm/tools/Diff.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/Diff.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/tools/Diff.java (revision 6889) @@ -491,5 +491,5 @@ /** Standard ScriptBuilders. */ - public final static ScriptBuilder + public static final ScriptBuilder forwardScript = new ForwardScript(), reverseScript = new ReverseScript(); Index: trunk/src/org/openstreetmap/josm/tools/ImageProvider.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (revision 6889) @@ -854,5 +854,5 @@ /** 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; /** Index: trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java (revision 6889) @@ -35,5 +35,5 @@ * @since 5915 */ - static public String getWikiLanguagePrefix(LocaleType type) { + public static String getWikiLanguagePrefix(LocaleType type) { if(type == LocaleType.ENGLISH) return ""; @@ -60,5 +60,5 @@ * @see #getWikiLanguagePrefix(LocaleType) */ - static public String getWikiLanguagePrefix() { + public static String getWikiLanguagePrefix() { return getWikiLanguagePrefix(LocaleType.DEFAULT); } @@ -70,5 +70,5 @@ * @see #getJOSMLocaleCode(Locale) */ - static public String getJOSMLocaleCode() { + public static String getJOSMLocaleCode() { return getJOSMLocaleCode(Locale.getDefault()); } @@ -84,5 +84,5 @@ * @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(); @@ -106,5 +106,5 @@ * @return the resulting locale */ - static public Locale getLocale(String localeName) { + public static Locale getLocale(String localeName) { if (localeName.equals("he")) { localeName = "iw_IL"; @@ -123,9 +123,9 @@ } - static public String getLanguageCodeXML() { + public static String getLanguageCodeXML() { return getJOSMLocaleCode()+"."; } - static public String getLanguageCodeManifest() { + public static String getLanguageCodeManifest() { return getJOSMLocaleCode()+"_"; } Index: trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (revision 6889) @@ -250,5 +250,5 @@ * @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.getMinLat()/180.0*Math.PI/2.0))*180.0/Math.PI; Index: trunk/src/org/openstreetmap/josm/tools/Shortcut.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/Shortcut.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/tools/Shortcut.java (revision 6889) @@ -432,5 +432,5 @@ * @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; @@ -445,5 +445,5 @@ * @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; @@ -458,5 +458,5 @@ * @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; Index: trunk/src/org/openstreetmap/josm/tools/Utils.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 6889) @@ -412,5 +412,5 @@ } - private final static double EPSILON = 1e-11; + private static final double EPSILON = 1e-11; /** Index: trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java (revision 6887) +++ trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java (revision 6889) @@ -31,5 +31,5 @@ * @return the geometry object */ - static public WindowGeometry centerOnScreen(Dimension extent) { + public static WindowGeometry centerOnScreen(Dimension extent) { return centerOnScreen(extent, "gui.geometry"); } @@ -44,5 +44,5 @@ * @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(); @@ -62,5 +62,5 @@ * @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) ) { @@ -82,5 +82,5 @@ * 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); @@ -178,5 +178,5 @@ } - 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) {