Index: trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- trunk/src/org/openstreetmap/josm/Main.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/Main.java (revision 6883)
@@ -106,5 +106,5 @@
* @since 98
*/
-abstract public class Main {
+public abstract class Main {
/**
@@ -126,5 +126,5 @@
* @return true if JOSM currently displays a map view
*/
- static public boolean isDisplayingMapView() {
+ public static boolean isDisplayingMapView() {
if (map == null) return false;
if (map.mapView == null) return false;
@@ -152,5 +152,5 @@
* and sequential.
*/
- public final static ExecutorService worker = new ProgressMonitorExecutor();
+ public static final ExecutorService worker = new ProgressMonitorExecutor();
/**
Index: trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java (revision 6883)
@@ -25,12 +25,12 @@
public class DownloadReferrersAction extends JosmAction {
- /**
- * Constructs a new {@code DownloadReferrersAction}.
- */
+ /**
+ * Constructs a new {@code DownloadReferrersAction}.
+ */
public DownloadReferrersAction() {
super(tr("Download parent ways/relations..."), "download",
- tr("Download objects referring to one of the selected objects"),
+ tr("Download objects referring to one of the selected objects"),
Shortcut.registerShortcut("file:downloadreferrers",
- tr("File: {0}", tr("Download parent ways/relations...")), KeyEvent.VK_D, Shortcut.ALT_CTRL),
+ tr("File: {0}", tr("Download parent ways/relations...")), KeyEvent.VK_D, Shortcut.ALT_CTRL),
true, "downloadreferrers", true);
putValue("help", ht("/Action/DownloadParentWaysAndRelation"));
Index: trunk/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java (revision 6883)
@@ -13,5 +13,5 @@
* @since 563
*/
-abstract public class AudioFastSlowAction extends JosmAction {
+public abstract class AudioFastSlowAction extends JosmAction {
private double multiplier;
Index: trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (revision 6883)
@@ -208,7 +208,7 @@
* Base class for all search operators.
*/
- abstract public static class Match implements Predicate {
-
- abstract public boolean match(OsmPrimitive osm);
+ public abstract static class Match implements Predicate {
+
+ public abstract boolean match(OsmPrimitive osm);
/**
@@ -243,5 +243,5 @@
* A unary search operator which may take data parameters.
*/
- abstract public static class UnaryMatch extends Match {
+ public abstract static class UnaryMatch extends Match {
protected final Match match;
@@ -265,5 +265,5 @@
* A binary search operator which may take data parameters.
*/
- abstract public static class BinaryMatch extends Match {
+ public abstract static class BinaryMatch extends Match {
protected final Match lhs;
Index: trunk/src/org/openstreetmap/josm/command/Command.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/Command.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/command/Command.java (revision 6883)
@@ -36,5 +36,5 @@
* @author imi
*/
-abstract public class Command extends PseudoCommand {
+public abstract class Command extends PseudoCommand {
private static final class CloneVisitor extends AbstractVisitor {
@@ -171,5 +171,5 @@
* @param added The added primitives
*/
- abstract public void fillModifiedData(Collection modified,
+ public abstract void fillModifiedData(Collection modified,
Collection deleted,
Collection added);
Index: trunk/src/org/openstreetmap/josm/command/PseudoCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/PseudoCommand.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/command/PseudoCommand.java (revision 6883)
@@ -13,9 +13,10 @@
* executed or undone.
*/
-abstract public class PseudoCommand {
+public abstract class PseudoCommand {
+
/**
* Provides a description text representing this command.
*/
- abstract public String getDescriptionText();
+ public abstract String getDescriptionText();
/**
@@ -29,5 +30,5 @@
* Return the primitives that take part in this command.
*/
- abstract public Collection getParticipatingPrimitives();
+ public abstract Collection getParticipatingPrimitives();
/**
Index: trunk/src/org/openstreetmap/josm/command/PurgeCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/PurgeCommand.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/command/PurgeCommand.java (revision 6883)
@@ -42,5 +42,5 @@
protected final ConflictCollection purgedConflicts = new ConflictCollection();
- final protected DataSet ds;
+ protected final DataSet ds;
/**
Index: trunk/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java (revision 6883)
@@ -9,6 +9,5 @@
import javax.swing.table.AbstractTableModel;
-public abstract class CorrectionTableModel extends
- AbstractTableModel {
+public abstract class CorrectionTableModel extends AbstractTableModel {
private List corrections;
@@ -17,5 +16,4 @@
public CorrectionTableModel(List corrections) {
- super();
this.corrections = corrections;
apply = new boolean[this.corrections.size()];
@@ -25,9 +23,9 @@
@Override
- abstract public int getColumnCount();
+ public abstract int getColumnCount();
- abstract protected boolean isBoldCell(int row, int column);
- abstract public String getCorrectionColumnName(int colIndex);
- abstract public Object getCorrectionValueAt(int rowIndex, int colIndex);
+ protected abstract boolean isBoldCell(int row, int column);
+ public abstract String getCorrectionColumnName(int colIndex);
+ public abstract Object getCorrectionValueAt(int rowIndex, int colIndex);
public List getCorrections() {
Index: trunk/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java (revision 6883)
@@ -56,5 +56,5 @@
* @return the default coordinate format
*/
- static public CoordinateFormat getDefaultFormat() {
+ public static CoordinateFormat getDefaultFormat() {
return defaultCoordinateFormat;
}
@@ -65,5 +65,5 @@
* @param format the default coordinate format
*/
- static public void setCoordinateFormat(CoordinateFormat format) {
+ public static void setCoordinateFormat(CoordinateFormat format) {
if (format != null) {
defaultCoordinateFormat = format;
Index: trunk/src/org/openstreetmap/josm/data/coor/LatLon.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (revision 6883)
@@ -191,6 +191,6 @@
}
- public final static String SOUTH = trc("compass", "S");
- public final static String NORTH = trc("compass", "N");
+ public static final String SOUTH = trc("compass", "S");
+ public static final String NORTH = trc("compass", "N");
public String latToString(CoordinateFormat d) {
switch(d) {
@@ -211,6 +211,6 @@
}
- public final static String WEST = trc("compass", "W");
- public final static String EAST = trc("compass", "E");
+ public static final String WEST = trc("compass", "W");
+ public static final String EAST = trc("compass", "E");
public String lonToString(CoordinateFormat d) {
switch(d) {
Index: trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java (revision 6883)
@@ -25,5 +25,5 @@
static List defaultLayers = new ArrayList();
- private final static String[] DEFAULT_LAYER_SITES = {
+ private static final String[] DEFAULT_LAYER_SITES = {
Main.JOSM_WEBSITE+"/maps"
};
Index: trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java (revision 6883)
@@ -24,21 +24,21 @@
* The default JOSM OAuth consumer key (created by user josmeditor).
*/
- static public final String DEFAULT_JOSM_CONSUMER_KEY = "F7zPYlVCqE2BUH9Hr4SsWZSOnrKjpug1EgqkbsSb";
+ public static final String DEFAULT_JOSM_CONSUMER_KEY = "F7zPYlVCqE2BUH9Hr4SsWZSOnrKjpug1EgqkbsSb";
/**
* The default JOSM OAuth consumer secret (created by user josmeditor).
*/
- static public final String DEFAULT_JOSM_CONSUMER_SECRET = "rIkjpPcBNkMQxrqzcOvOC4RRuYupYr7k8mfP13H5";
+ public static final String DEFAULT_JOSM_CONSUMER_SECRET = "rIkjpPcBNkMQxrqzcOvOC4RRuYupYr7k8mfP13H5";
/**
* The default OSM OAuth request token URL.
*/
- static public final String DEFAULT_REQUEST_TOKEN_URL = Main.OSM_WEBSITE + "/oauth/request_token";
+ public static final String DEFAULT_REQUEST_TOKEN_URL = Main.OSM_WEBSITE + "/oauth/request_token";
/**
* The default OSM OAuth access token URL.
*/
- static public final String DEFAULT_ACCESS_TOKEN_URL = Main.OSM_WEBSITE + "/oauth/access_token";
+ public static final String DEFAULT_ACCESS_TOKEN_URL = Main.OSM_WEBSITE + "/oauth/access_token";
/**
* The default OSM OAuth authorize URL.
*/
- static public final String DEFAULT_AUTHORISE_URL = Main.OSM_WEBSITE + "/oauth/authorize";
+ public static final String DEFAULT_AUTHORISE_URL = Main.OSM_WEBSITE + "/oauth/authorize";
@@ -49,5 +49,5 @@
* @return a set of default parameters
*/
- static public OAuthParameters createDefault() {
+ public static OAuthParameters createDefault() {
return createDefault(null);
}
@@ -62,5 +62,5 @@
* @since 5422
*/
- static public OAuthParameters createDefault(String apiUrl) {
+ public static OAuthParameters createDefault(String apiUrl) {
OAuthParameters parameters = new OAuthParameters();
parameters.setConsumerKey(DEFAULT_JOSM_CONSUMER_KEY);
@@ -90,5 +90,5 @@
* @return the parameters
*/
- static public OAuthParameters createFromPreferences(Preferences pref) {
+ public static OAuthParameters createFromPreferences(Preferences pref) {
OAuthParameters parameters = createDefault(pref.get("osm-server.url"));
parameters.setConsumerKey(pref.get("oauth.settings.consumer-key", parameters.getConsumerKey()));
Index: trunk/src/org/openstreetmap/josm/data/oauth/OAuthToken.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/oauth/OAuthToken.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/data/oauth/OAuthToken.java (revision 6883)
@@ -14,5 +14,5 @@
* @return the token
*/
- static public OAuthToken createToken(OAuthConsumer consumer) {
+ public static OAuthToken createToken(OAuthConsumer consumer) {
return new OAuthToken(consumer.getToken(), consumer.getTokenSecret());
}
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java (revision 6883)
@@ -42,7 +42,7 @@
*
*/
- static public final String PREF_KEY_RENDERER_CLASS_NAME = "mappaint.renderer-class-name";
-
- static public class MapRendererFactoryException extends RuntimeException {
+ public static final String PREF_KEY_RENDERER_CLASS_NAME = "mappaint.renderer-class-name";
+
+ public static class MapRendererFactoryException extends RuntimeException {
public MapRendererFactoryException() {
}
@@ -61,5 +61,5 @@
}
- static public class Descriptor {
+ public static class Descriptor {
private Class renderer;
private String displayName;
@@ -85,5 +85,5 @@
}
- static private MapRendererFactory instance;
+ private static MapRendererFactory instance;
/**
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java (revision 6883)
@@ -32,17 +32,17 @@
* outer polygon. Default is outer.
*/
- static public final String PREF_KEY_OUTER_ROLES = "mappaint.multipolygon.outer.roles";
+ public static final String PREF_KEY_OUTER_ROLES = "mappaint.multipolygon.outer.roles";
/** preference key for collection of role prefixes which indicate that the respective
* member belongs to an outer polygon. Default is empty.
*/
- static public final String PREF_KEY_OUTER_ROLE_PREFIXES = "mappaint.multipolygon.outer.role-prefixes";
+ public static final String PREF_KEY_OUTER_ROLE_PREFIXES = "mappaint.multipolygon.outer.role-prefixes";
/** preference key for a collection of roles which indicate that the respective member belongs to an
* inner polygon. Default is inner.
*/
- static public final String PREF_KEY_INNER_ROLES = "mappaint.multipolygon.inner.roles";
+ public static final String PREF_KEY_INNER_ROLES = "mappaint.multipolygon.inner.roles";
/** preference key for collection of role prefixes which indicate that the respective
* member belongs to an inner polygon. Default is empty.
*/
- static public final String PREF_KEY_INNER_ROLE_PREFIXES = "mappaint.multipolygon.inner.role-prefixes";
+ public static final String PREF_KEY_INNER_ROLE_PREFIXES = "mappaint.multipolygon.inner.role-prefixes";
/**
Index: trunk/src/org/openstreetmap/josm/data/projection/AbstractProjection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/AbstractProjection.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/data/projection/AbstractProjection.java (revision 6883)
@@ -21,5 +21,5 @@
* In addition, either datum or nadgrid has to be initialized to some value.
*/
-abstract public class AbstractProjection implements Projection {
+public abstract class AbstractProjection implements Projection {
protected Ellipsoid ellps;
Index: trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java (revision 6883)
@@ -75,5 +75,5 @@
public boolean hasValue;
- public final static Map paramsByKey = new HashMap();
+ public static final Map paramsByKey = new HashMap();
static {
for (Param p : Param.values()) {
Index: trunk/src/org/openstreetmap/josm/data/projection/Projections.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/Projections.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/data/projection/Projections.java (revision 6883)
@@ -60,9 +60,9 @@
* should be compatible to PROJ.4
*/
- final public static Map projs = new HashMap();
- final public static Map ellipsoids = new HashMap();
- final public static Map datums = new HashMap();
- final public static Map nadgrids = new HashMap();
- final public static Map> inits = new HashMap>();
+ public static final Map projs = new HashMap();
+ public static final Map ellipsoids = new HashMap();
+ public static final Map datums = new HashMap();
+ public static final Map nadgrids = new HashMap();
+ public static final Map> inits = new HashMap>();
static {
@@ -158,7 +158,7 @@
}
- private final static Set allCodes = new HashSet();
- private final static Map allProjectionChoicesByCode = new HashMap();
- private final static Map projectionsByCode_cache = new HashMap();
+ private static final Set allCodes = new HashSet();
+ private static final Map allProjectionChoicesByCode = new HashMap();
+ private static final Map projectionsByCode_cache = new HashMap();
static {
Index: trunk/src/org/openstreetmap/josm/data/projection/datum/AbstractDatum.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/datum/AbstractDatum.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/data/projection/datum/AbstractDatum.java (revision 6883)
@@ -4,5 +4,5 @@
import org.openstreetmap.josm.data.projection.Ellipsoid;
-abstract public class AbstractDatum implements Datum {
+public abstract class AbstractDatum implements Datum {
protected String name;
@@ -10,4 +10,10 @@
protected Ellipsoid ellps;
+ /**
+ * Constructs a new {@code AbstractDatum}.
+ * @param name The name
+ * @param proj4Id The Proj4 identifier
+ * @param ellps The ellipsoid
+ */
public AbstractDatum(String name, String proj4Id, Ellipsoid ellps) {
this.name = name;
Index: trunk/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/data/projection/datum/GRS80Datum.java (revision 6883)
@@ -12,5 +12,8 @@
public final class GRS80Datum extends NullDatum {
- public final static GRS80Datum INSTANCE = new GRS80Datum();
+ /**
+ * The unique instance.
+ */
+ public static final GRS80Datum INSTANCE = new GRS80Datum();
private GRS80Datum() {
Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java (revision 6883)
@@ -20,5 +20,5 @@
* Description of Transformation - DE_DHDN (BeTA, 2007) to ETRS89
*/
- public final static NTV2GridShiftFileWrapper BETA2007 = new NTV2GridShiftFileWrapper("resource://data/projection/BETA2007.gsb");
+ public static final NTV2GridShiftFileWrapper BETA2007 = new NTV2GridShiftFileWrapper("resource://data/projection/BETA2007.gsb");
/**
@@ -28,6 +28,5 @@
* [French] Transformation de coordonnées NTF – RGF93 / Format de grille NTv2
*/
- public final static NTV2GridShiftFileWrapper ntf_rgf93 = new NTV2GridShiftFileWrapper("resource://data/projection/ntf_r93_b.gsb");
-
+ public static final NTV2GridShiftFileWrapper ntf_rgf93 = new NTV2GridShiftFileWrapper("resource://data/projection/ntf_r93_b.gsb");
private NTV2GridShiftFile instance = null;
Index: trunk/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java (revision 6883)
@@ -28,5 +28,5 @@
protected double e;
- public static abstract class Parameters {
+ public abstract static class Parameters {
public final double latitudeOrigin;
public Parameters(double latitudeOrigin) {
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java (revision 6883)
@@ -87,15 +87,15 @@
}
- protected final static int DUPLICATE_NODE = 1;
- protected final static int DUPLICATE_NODE_MIXED = 2;
- protected final static int DUPLICATE_NODE_OTHER = 3;
- protected final static int DUPLICATE_NODE_BUILDING = 10;
- protected final static int DUPLICATE_NODE_BOUNDARY = 11;
- protected final static int DUPLICATE_NODE_HIGHWAY = 12;
- protected final static int DUPLICATE_NODE_LANDUSE = 13;
- protected final static int DUPLICATE_NODE_NATURAL = 14;
- protected final static int DUPLICATE_NODE_POWER = 15;
- protected final static int DUPLICATE_NODE_RAILWAY = 16;
- protected final static int DUPLICATE_NODE_WATERWAY = 17;
+ protected static final int DUPLICATE_NODE = 1;
+ protected static final int DUPLICATE_NODE_MIXED = 2;
+ protected static final int DUPLICATE_NODE_OTHER = 3;
+ protected static final int DUPLICATE_NODE_BUILDING = 10;
+ protected static final int DUPLICATE_NODE_BOUNDARY = 11;
+ protected static final int DUPLICATE_NODE_HIGHWAY = 12;
+ protected static final int DUPLICATE_NODE_LANDUSE = 13;
+ protected static final int DUPLICATE_NODE_NATURAL = 14;
+ protected static final int DUPLICATE_NODE_POWER = 15;
+ protected static final int DUPLICATE_NODE_RAILWAY = 16;
+ protected static final int DUPLICATE_NODE_WATERWAY = 17;
/** The map of potential duplicates.
Index: trunk/src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapView.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/MapView.java (revision 6883)
@@ -151,8 +151,6 @@
public static void addEditLayerChangeListener(EditLayerChangeListener listener, boolean initialFire) {
addEditLayerChangeListener(listener);
- if (initialFire) {
- if (Main.isDisplayingMapView() && Main.map.mapView.getEditLayer() != null) {
- fireEditLayerChanged(null, Main.map.mapView.getEditLayer());
- }
+ if (initialFire && Main.isDisplayingMapView() && Main.map.mapView.getEditLayer() != null) {
+ fireEditLayerChanged(null, Main.map.mapView.getEditLayer());
}
}
Index: trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java (revision 6883)
@@ -52,5 +52,5 @@
public class DeleteFromRelationConfirmationDialog extends JDialog implements TableModelListener {
/** the unique instance of this dialog */
- static private DeleteFromRelationConfirmationDialog instance;
+ private static DeleteFromRelationConfirmationDialog instance;
/**
@@ -59,5 +59,5 @@
* @return The unique instance of this dialog
*/
- static public DeleteFromRelationConfirmationDialog getInstance() {
+ public static DeleteFromRelationConfirmationDialog getInstance() {
if (instance == null) {
instance = new DeleteFromRelationConfirmationDialog();
Index: trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 6883)
@@ -217,6 +217,6 @@
*
*/
- static private class TileGridInputPanel extends JPanel implements PropertyChangeListener{
- static public final String TILE_BOUNDS_PROP = TileGridInputPanel.class.getName() + ".tileBounds";
+ private static class TileGridInputPanel extends JPanel implements PropertyChangeListener{
+ public static final String TILE_BOUNDS_PROP = TileGridInputPanel.class.getName() + ".tileBounds";
private JosmTextField tfMaxY;
@@ -437,7 +437,7 @@
*
*/
- static private class TileAddressInputPanel extends JPanel {
-
- static public final String TILE_BOUNDS_PROP = TileAddressInputPanel.class.getName() + ".tileBounds";
+ private static class TileAddressInputPanel extends JPanel {
+
+ public static final String TILE_BOUNDS_PROP = TileAddressInputPanel.class.getName() + ".tileBounds";
private JosmTextField tfTileAddress;
@@ -526,5 +526,5 @@
* Validates a tile address
*/
- static private class TileAddressValidator extends AbstractTextComponentValidator {
+ private static class TileAddressValidator extends AbstractTextComponentValidator {
private TileBounds tileBounds = null;
@@ -585,5 +585,5 @@
*
*/
- static private class TileCoordinateValidator extends AbstractTextComponentValidator {
+ private static class TileCoordinateValidator extends AbstractTextComponentValidator {
private int zoomLevel;
private int tileIndex;
@@ -633,5 +633,5 @@
*
*/
- static private class TileBounds {
+ private static class TileBounds {
public Point min;
public Point max;
@@ -663,5 +663,5 @@
* The map view used in this bounding box chooser
*/
- static private class TileBoundsMapView extends JMapViewer {
+ private static class TileBoundsMapView extends JMapViewer {
private Point min;
private Point max;
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (revision 6883)
@@ -56,14 +56,14 @@
* {@link #isResolvedCompletely()}
*/
- static public final String RESOLVED_COMPLETELY_PROP = ConflictResolver.class.getName() + ".resolvedCompletely";
+ public static final String RESOLVED_COMPLETELY_PROP = ConflictResolver.class.getName() + ".resolvedCompletely";
/**
* name of the property for the {@link OsmPrimitive} in the role "my"
*/
- static public final String MY_PRIMITIVE_PROP = ConflictResolver.class.getName() + ".myPrimitive";
+ public static final String MY_PRIMITIVE_PROP = ConflictResolver.class.getName() + ".myPrimitive";
/**
* name of the property for the {@link OsmPrimitive} in the role "my"
*/
- static public final String THEIR_PRIMITIVE_PROP = ConflictResolver.class.getName() + ".theirPrimitive";
+ public static final String THEIR_PRIMITIVE_PROP = ConflictResolver.class.getName() + ".theirPrimitive";
private JTabbedPane tabbedPane = null;
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 6883)
@@ -80,7 +80,7 @@
private JLabel lblFrozenState;
- abstract protected JScrollPane buildMyElementsTable();
- abstract protected JScrollPane buildMergedElementsTable();
- abstract protected JScrollPane buildTheirElementsTable();
+ protected abstract JScrollPane buildMyElementsTable();
+ protected abstract JScrollPane buildMergedElementsTable();
+ protected abstract JScrollPane buildTheirElementsTable();
protected JScrollPane embeddInScrollPane(JTable table) {
@@ -770,5 +770,5 @@
}
- static public interface FreezeActionProperties {
+ public static interface FreezeActionProperties {
String PROP_SELECTED = FreezeActionProperties.class.getName() + ".selected";
}
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java (revision 6883)
@@ -39,6 +39,6 @@
public class PropertiesMergeModel extends Observable {
- static public final String RESOLVED_COMPLETELY_PROP = PropertiesMergeModel.class.getName() + ".resolvedCompletely";
- static public final String DELETE_PRIMITIVE_PROP = PropertiesMergeModel.class.getName() + ".deletePrimitive";
+ public static final String RESOLVED_COMPLETELY_PROP = PropertiesMergeModel.class.getName() + ".resolvedCompletely";
+ public static final String DELETE_PRIMITIVE_PROP = PropertiesMergeModel.class.getName() + ".deletePrimitive";
private OsmPrimitive my;
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java (revision 6883)
@@ -30,5 +30,5 @@
*/
public class TagMergeModel extends DefaultTableModel {
- static public final String PROP_NUM_UNDECIDED_TAGS = TagMergeModel.class.getName() + ".numUndecidedTags";
+ public static final String PROP_NUM_UNDECIDED_TAGS = TagMergeModel.class.getName() + ".numUndecidedTags";
/** the list of tag merge items */
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java (revision 6883)
@@ -146,5 +146,5 @@
*
*/
- static private class EditorCellRenderer extends JLabel implements ListCellRenderer {
+ private static class EditorCellRenderer extends JLabel implements ListCellRenderer {
public EditorCellRenderer() {
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (revision 6883)
@@ -44,5 +44,5 @@
public class PasteTagsConflictResolverDialog extends JDialog implements PropertyChangeListener {
- static private final Map PANE_TITLES;
+ private static final Map PANE_TITLES;
static {
PANE_TITLES = new HashMap();
@@ -354,5 +354,5 @@
}
- static public class StatisticsInfo {
+ public static class StatisticsInfo {
public int numTags;
public Map sourceInfo;
@@ -365,5 +365,5 @@
}
- static private class StatisticsTableColumnModel extends DefaultTableColumnModel {
+ private static class StatisticsTableColumnModel extends DefaultTableColumnModel {
public StatisticsTableColumnModel() {
TableCellRenderer renderer = new StatisticsInfoRenderer();
@@ -393,5 +393,5 @@
}
- static private class StatisticsTableModel extends DefaultTableModel {
+ private static class StatisticsTableModel extends DefaultTableModel {
private static final String[] HEADERS = new String[] {tr("Paste ..."), tr("From ..."), tr("To ...") };
private List data;
@@ -432,5 +432,5 @@
}
- static private class StatisticsInfoRenderer extends JLabel implements TableCellRenderer {
+ private static class StatisticsInfoRenderer extends JLabel implements TableCellRenderer {
protected void reset() {
setIcon(null);
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java (revision 6883)
@@ -23,5 +23,5 @@
UNDECIDED;
- static public void prepareLabel(RelationMemberConflictDecisionType decision, JLabel label) {
+ public static void prepareLabel(RelationMemberConflictDecisionType decision, JLabel label) {
switch(decision) {
case REMOVE:
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java (revision 6883)
@@ -28,5 +28,5 @@
public class RelationMemberConflictResolverModel extends DefaultTableModel {
/** the property name for the number conflicts managed by this model */
- static public final String NUM_CONFLICTS_PROP = RelationMemberConflictResolverModel.class.getName() + ".numConflicts";
+ public static final String NUM_CONFLICTS_PROP = RelationMemberConflictResolverModel.class.getName() + ".numConflicts";
/** the list of conflict decisions */
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (revision 6883)
@@ -20,5 +20,5 @@
public class TagConflictResolverModel extends DefaultTableModel {
- static public final String NUM_CONFLICTS_PROP = TagConflictResolverModel.class.getName() + ".numConflicts";
+ public static final String NUM_CONFLICTS_PROP = TagConflictResolverModel.class.getName() + ".numConflicts";
private TagCollection tags;
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java (revision 6883)
@@ -28,5 +28,5 @@
/** the name of the property for the currently selected changeset in the detail view */
- public final static String CHANGESET_IN_DETAIL_VIEW_PROP = ChangesetCacheManagerModel.class.getName() + ".changesetInDetailView";
+ public static final String CHANGESET_IN_DETAIL_VIEW_PROP = ChangesetCacheManagerModel.class.getName() + ".changesetInDetailView";
private final List data = new ArrayList();
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java (revision 6883)
@@ -140,5 +140,5 @@
*
*/
- static private class ChangesetContentEntry implements ChangesetDataSetEntry{
+ private static class ChangesetContentEntry implements ChangesetDataSetEntry{
private final ChangesetModificationType modificationType;
private final HistoryOsmPrimitive primitive;
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java (revision 6883)
@@ -44,5 +44,5 @@
* @return the download task
*/
- static public ChangesetHeaderDownloadTask buildTaskForChangesets(Collection changesets) {
+ public static ChangesetHeaderDownloadTask buildTaskForChangesets(Collection changesets) {
return buildTaskForChangesets(Main.parent, changesets);
}
@@ -59,5 +59,5 @@
* @throws IllegalArgumentException thrown if parent is null
*/
- static public ChangesetHeaderDownloadTask buildTaskForChangesets(Component parent, Collection changesets) {
+ public static ChangesetHeaderDownloadTask buildTaskForChangesets(Component parent, Collection changesets) {
CheckParameterUtil.ensureParameterNotNull(parent, "parent");
if (changesets == null) {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 6883)
@@ -373,5 +373,5 @@
*
*/
- static private class UserRestrictionPanel extends JPanel {
+ private static class UserRestrictionPanel extends JPanel {
private ButtonGroup bgUserRestrictions;
private JRadioButton rbRestrictToMyself;
@@ -635,5 +635,5 @@
* This is the panel to apply a time restriction to the changeset query
*/
- static private class TimeRestrictionPanel extends JPanel {
+ private static class TimeRestrictionPanel extends JPanel {
private JRadioButton rbClosedAfter;
@@ -968,6 +968,6 @@
*
*/
- static private class UidInputFieldValidator extends AbstractTextComponentValidator {
- static public UidInputFieldValidator decorate(JTextComponent tc) {
+ private static class UidInputFieldValidator extends AbstractTextComponentValidator {
+ public static UidInputFieldValidator decorate(JTextComponent tc) {
return new UidInputFieldValidator(tc);
}
@@ -1015,6 +1015,6 @@
}
- static private class UserNameInputValidator extends AbstractTextComponentValidator {
- static public UserNameInputValidator decorate(JTextComponent tc) {
+ private static class UserNameInputValidator extends AbstractTextComponentValidator {
+ public static UserNameInputValidator decorate(JTextComponent tc) {
return new UserNameInputValidator(tc);
}
@@ -1046,6 +1046,6 @@
* Dates can be entered in one of four standard formats defined for the current locale.
*/
- static private class DateValidator extends AbstractTextComponentValidator {
- static public DateValidator decorate(JTextComponent tc) {
+ private static class DateValidator extends AbstractTextComponentValidator {
+ public static DateValidator decorate(JTextComponent tc) {
return new DateValidator(tc);
}
@@ -1109,6 +1109,6 @@
* Time values can be entered in one of four standard formats defined for the current locale.
*/
- static private class TimeValidator extends AbstractTextComponentValidator {
- static public TimeValidator decorate(JTextComponent tc) {
+ private static class TimeValidator extends AbstractTextComponentValidator {
+ public static TimeValidator decorate(JTextComponent tc) {
return new TimeValidator(tc);
}
Index: trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (revision 6883)
@@ -47,5 +47,5 @@
/** displays information about the current download area */
private JMultilineLabel lblCurrentDownloadArea;
- final private JosmTextArea bboxDisplay = new JosmTextArea();
+ private final JosmTextArea bboxDisplay = new JosmTextArea();
/** the add action */
private AddAction actAdd;
Index: trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 6883)
@@ -48,9 +48,9 @@
/**
- *
+ * Dialog displayed to download OSM and/or GPS data from OSM server.
*/
public class DownloadDialog extends JDialog {
/** the unique instance of the download dialog */
- static private DownloadDialog instance;
+ private static DownloadDialog instance;
/**
@@ -59,5 +59,5 @@
* @return the unique instance of the download dialog
*/
- static public DownloadDialog getInstance() {
+ public static DownloadDialog getInstance() {
if (instance == null) {
instance = new DownloadDialog(Main.parent);
Index: trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 6883)
@@ -70,9 +70,8 @@
private JTable tblSearchResults;
private DownloadDialog parent;
- private final static Server[] servers = new Server[]{
- new Server("Nominatim","http://nominatim.openstreetmap.org/search?format=xml&q=",tr("Class Type"),tr("Bounds")),
- //new Server("Namefinder","http://gazetteer.openstreetmap.org/namefinder/search.xml?find=",tr("Near"),trc("placeselection", "Zoom"))
+ private static final Server[] SERVERS = new Server[] {
+ new Server("Nominatim","http://nominatim.openstreetmap.org/search?format=xml&q=",tr("Class Type"),tr("Bounds"))
};
- private final JosmComboBox server = new JosmComboBox(servers);
+ private final JosmComboBox server = new JosmComboBox(SERVERS);
private static class Server {
@@ -101,7 +100,7 @@
lpanel.add(new JLabel(tr("Choose the server for searching:")));
lpanel.add(server);
- String s = Main.pref.get("namefinder.server", servers[0].name);
- for (int i = 0; i < servers.length; ++i) {
- if (servers[i].name.equals(s)) {
+ String s = Main.pref.get("namefinder.server", SERVERS[0].name);
+ for (int i = 0; i < SERVERS.length; ++i) {
+ if (SERVERS[i].name.equals(s)) {
server.setSelectedIndex(i);
}
@@ -172,5 +171,5 @@
* Data storage for search results.
*/
- static private class SearchResult {
+ private static class SearchResult {
public String name;
public String info;
@@ -450,5 +449,5 @@
// column 2 - Near
col3 = new TableColumn(2);
- col3.setHeaderValue(servers[0].thirdcol);
+ col3.setHeaderValue(SERVERS[0].thirdcol);
col3.setResizable(true);
col3.setPreferredWidth(100);
@@ -458,5 +457,5 @@
// column 3 - Zoom
col4 = new TableColumn(3);
- col4.setHeaderValue(servers[0].fourthcol);
+ col4.setHeaderValue(SERVERS[0].fourthcol);
col4.setResizable(true);
col4.setPreferredWidth(50);
Index: trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 6883)
@@ -72,5 +72,5 @@
* @return the unique instance of the help browser
*/
- static public HelpBrowser getInstance() {
+ public static HelpBrowser getInstance() {
if (instance == null) {
instance = new HelpBrowser();
@@ -103,5 +103,5 @@
* @param helpTopic the help topic
*/
- static public void launchBrowser(String helpTopic) {
+ public static void launchBrowser(String helpTopic) {
HelpBrowser browser = getInstance();
browser.openHelpTopic(helpTopic);
Index: trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (revision 6883)
@@ -29,5 +29,5 @@
/** background color used when the coordinates are different */
- public final static Color BGCOLOR_DIFFERENCE = new Color(255,197,197);
+ public static final Color BGCOLOR_DIFFERENCE = new Color(255,197,197);
/** the model */
Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (revision 6883)
@@ -27,6 +27,6 @@
public class HistoryBrowserDialogManager implements MapView.LayerChangeListener {
- static private HistoryBrowserDialogManager instance;
- static public HistoryBrowserDialogManager getInstance() {
+ private static HistoryBrowserDialogManager instance;
+ public static HistoryBrowserDialogManager getInstance() {
if (instance == null) {
instance = new HistoryBrowserDialogManager();
Index: trunk/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java (revision 6883)
@@ -17,8 +17,11 @@
public class NodeListTableCellRenderer extends JLabel implements TableCellRenderer {
- public final static Color BGCOLOR_SELECTED = new Color(143,170,255);
+ public static final Color BGCOLOR_SELECTED = new Color(143,170,255);
private ImageIcon nodeIcon;
+ /**
+ * Constructs a new {@code NodeListTableCellRenderer}.
+ */
public NodeListTableCellRenderer(){
setOpaque(true);
Index: trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java (revision 6883)
@@ -280,5 +280,5 @@
}
- static private PrimitiveId primitiveIdAtRow(TableModel model, int row) {
+ private static PrimitiveId primitiveIdAtRow(TableModel model, int row) {
DiffTableModel castedModel = (DiffTableModel) model;
Long id = (Long)castedModel.getValueAt(row, 0).value;
Index: trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java (revision 6883)
@@ -26,12 +26,15 @@
public class RelationMemberListTableCellRenderer extends JLabel implements TableCellRenderer {
- public final static Color BGCOLOR_EMPTY_ROW = new Color(234,234,234);
- public final static Color BGCOLOR_NOT_IN_OPPOSITE = new Color(255,197,197);
- public final static Color BGCOLOR_IN_OPPOSITE = new Color(255,234,213);
- public final static Color BGCOLOR_SELECTED = new Color(143,170,255);
+ public static final Color BGCOLOR_EMPTY_ROW = new Color(234,234,234);
+ public static final Color BGCOLOR_NOT_IN_OPPOSITE = new Color(255,197,197);
+ public static final Color BGCOLOR_IN_OPPOSITE = new Color(255,234,213);
+ public static final Color BGCOLOR_SELECTED = new Color(143,170,255);
private Map icons;
- public RelationMemberListTableCellRenderer(){
+ /**
+ * Constructs a new {@code RelationMemberListTableCellRenderer}.
+ */
+ public RelationMemberListTableCellRenderer() {
setOpaque(true);
icons = new HashMap();
Index: trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java (revision 6883)
@@ -18,6 +18,9 @@
*/
public class TagTableCellRenderer extends JLabel implements TableCellRenderer {
- public final static Color BGCOLOR_DIFFERENCE = new Color(255,197,197);
+ public static final Color BGCOLOR_DIFFERENCE = new Color(255,197,197);
+ /**
+ * Constructs a new {@code TagTableCellRenderer}.
+ */
public TagTableCellRenderer() {
setOpaque(true);
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 6883)
@@ -657,8 +657,8 @@
syncDialog.pack();
syncDialog.addWindowListener(new WindowAdapter() {
- final static int CANCEL = -1;
- final static int DONE = 0;
- final static int AGAIN = 1;
- final static int NOTHING = 2;
+ static final int CANCEL = -1;
+ static final int DONE = 0;
+ static final int AGAIN = 1;
+ static final int NOTHING = 2;
private int checkAndSave() {
if (syncDialog.isVisible())
@@ -686,6 +686,5 @@
}
- if (lastNumMatched == 0) {
- if (new ExtendedDialog(
+ if (lastNumMatched == 0 && new ExtendedDialog(
Main.parent,
tr("Correlate images with GPX track"),
@@ -694,6 +693,5 @@
setButtonIcons(new String[] { "ok.png", "dialogs/refresh.png"}).
showDialog().getValue() == 2)
- return AGAIN;
- }
+ return AGAIN;
return DONE;
}
@@ -1084,14 +1082,10 @@
}
- if (e.getExifCoor() != null) {
- if (!exif) {
- continue;
- }
- }
-
- if (e.isTagged() && e.getExifCoor() == null) {
- if (!tagged) {
- continue;
- }
+ if (e.getExifCoor() != null && !exif) {
+ continue;
+ }
+
+ if (e.isTagged() && e.getExifCoor() == null && !tagged) {
+ continue;
}
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java (revision 6883)
@@ -12,5 +12,5 @@
* Stores info about each image
*/
-final public class ImageEntry implements Comparable, Cloneable {
+public final class ImageEntry implements Comparable, Cloneable {
private File file;
private Integer exifOrientation;
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java (revision 6883)
@@ -6,13 +6,13 @@
import java.io.File;
-class JpegFileFilter extends javax.swing.filechooser.FileFilter
- implements java.io.FileFilter {
+class JpegFileFilter extends javax.swing.filechooser.FileFilter implements java.io.FileFilter {
- static final private JpegFileFilter instance = new JpegFileFilter();
+ private static final JpegFileFilter instance = new JpegFileFilter();
public static JpegFileFilter getInstance() {
return instance;
}
- @Override public boolean accept(File f) {
+ @Override
+ public boolean accept(File f) {
if (f.isDirectory()) {
return true;
@@ -23,5 +23,6 @@
}
- @Override public String getDescription() {
+ @Override
+ public String getDescription() {
return tr("JPEG images (*.jpg)");
}
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (revision 6883)
@@ -88,5 +88,5 @@
// will make gui for it so I'm keeping it here
- private final static Map cache = new HashMap();
+ private static final Map CACHE = new HashMap();
// Legacy code - convert label from int to template engine expression
@@ -111,5 +111,5 @@
key += "." + layerName;
}
- TemplateEntryProperty result = cache.get(key);
+ TemplateEntryProperty result = CACHE.get(key);
if (result == null) {
String defaultValue = layerName == null ? getDefaultLabelPattern():"";
@@ -117,5 +117,5 @@
try {
result = new TemplateEntryProperty(key, defaultValue, parent);
- cache.put(key, result);
+ CACHE.put(key, result);
} catch (ParseError e) {
Main.warn("Unable to parse template engine pattern ''{0}'' for property {1}", defaultValue, key);
@@ -130,5 +130,5 @@
key += "." + layerName;
}
- TemplateEntryProperty result = cache.get(key);
+ TemplateEntryProperty result = CACHE.get(key);
if (result == null) {
String defaultValue = layerName == null?"?{ '{name}' | '{desc}' | '{" + Marker.MARKER_FORMATTED_OFFSET + "}' }":"";
@@ -136,5 +136,5 @@
try {
result = new TemplateEntryProperty(key, defaultValue, parent);
- cache.put(key, result);
+ CACHE.put(key, result);
} catch (ParseError e) {
Main.warn("Unable to parse template engine pattern ''{0}'' for property {1}", defaultValue, key);
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (revision 6883)
@@ -172,11 +172,11 @@
* Return a static icon.
*/
- @Override public Icon getIcon() {
+ @Override
+ public Icon getIcon() {
return ImageProvider.get("layer", "marker_small");
}
@Override
- public Color getColor(boolean ignoreCustom)
- {
+ public Color getColor(boolean ignoreCustom) {
String name = getName();
return Main.pref.getColor(marktr("gps marker"), name != null ? "layer "+name : null, Color.gray);
@@ -184,10 +184,10 @@
/* for preferences */
- static public Color getGenericColor()
- {
+ public static Color getGenericColor() {
return Main.pref.getColor(marktr("gps marker"), Color.gray);
}
- @Override public void paint(Graphics2D g, MapView mv, Bounds box) {
+ @Override
+ public void paint(Graphics2D g, MapView mv, Bounds box) {
boolean showTextOrIcon = isTextOrIconShown();
g.setColor(getColor(true));
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (revision 6883)
@@ -38,5 +38,5 @@
private Timer timer = null;
private double animationInterval = 0.0; // seconds
- static private PlayHeadMarker playHead = null;
+ private static PlayHeadMarker playHead = null;
private MapMode oldMode = null;
private LatLon oldCoor;
@@ -152,14 +152,12 @@
* layer, even if it is only one at the start of the track) to
* offset the audio from */
- if (cw != null) {
- if (recent != null && recent.parentLayer != null) {
- for (Marker m : recent.parentLayer.data) {
- if (m instanceof AudioMarker) {
- AudioMarker a = (AudioMarker) m;
- if (a.time > cw.time) {
- break;
- }
- ca = a;
+ if (cw != null && recent != null && recent.parentLayer != null) {
+ for (Marker m : recent.parentLayer.data) {
+ if (m instanceof AudioMarker) {
+ AudioMarker a = (AudioMarker) m;
+ if (a.time > cw.time) {
+ break;
}
+ ca = a;
}
}
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java (revision 6883)
@@ -17,6 +17,6 @@
import org.openstreetmap.josm.tools.Utils;
-public class AreaElemStyle extends ElemStyle
-{
+public class AreaElemStyle extends ElemStyle {
+
/**
* If fillImage == null, color is the fill-color, otherwise
@@ -79,20 +79,14 @@
@Override
public void paintPrimitive(OsmPrimitive osm, MapPaintSettings paintSettings, StyledMapRenderer painter, boolean selected, boolean member) {
- if (osm instanceof Way)
- {
+ if (osm instanceof Way) {
Color myColor = color;
- if (color != null) {
- if (osm.isSelected()) {
- myColor = paintSettings.getSelectedColor(color.getAlpha());
- }
+ if (color != null && osm.isSelected()) {
+ myColor = paintSettings.getSelectedColor(color.getAlpha());
}
painter.drawArea((Way) osm, myColor, fillImage, text);
- } else if (osm instanceof Relation)
- {
+ } else if (osm instanceof Relation) {
Color myColor = color;
- if (color != null) {
- if (selected) {
- myColor = paintSettings.getRelationSelectedColor(color.getAlpha());
- }
+ if (color != null && selected) {
+ myColor = paintSettings.getRelationSelectedColor(color.getAlpha());
}
painter.drawArea((Relation) osm, myColor, fillImage, text);
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (revision 6883)
@@ -206,9 +206,7 @@
for (StyleSource source : styles.getStyleSources()) {
source.loadStyleSource();
- if (Main.pref.getBoolean("mappaint.auto_reload_local_styles", true)) {
- if (source.isLocal()) {
- File f = new File(source.url);
- source.setLastMTime(f.lastModified());
- }
+ if (Main.pref.getBoolean("mappaint.auto_reload_local_styles", true) && source.isLocal()) {
+ File f = new File(source.url);
+ source.setLastMTime(f.lastModified());
}
}
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/CSSColors.java (revision 6883)
@@ -7,5 +7,5 @@
public final class CSSColors {
- private final static Map CSS_COLORS = new HashMap();
+ private static final Map CSS_COLORS = new HashMap();
static {
Object[][] CSSCOLORS_INIT = new Object[][] {
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java (revision 6883)
@@ -22,7 +22,7 @@
import org.openstreetmap.josm.tools.Utils;
-abstract public class Condition {
-
- abstract public boolean applies(Environment e);
+public abstract class Condition {
+
+ public abstract boolean applies(Environment e);
public static Condition createKeyValueCondition(String k, String v, Op op, Context context, boolean considerValAsKey) {
@@ -132,5 +132,5 @@
/**
- * context, where the condition applies
+ * Context, where the condition applies.
*/
public static enum Context {
@@ -146,5 +146,5 @@
}
- public final static EnumSet COMPARISON_OPERATERS =
+ public static final EnumSet COMPARISON_OPERATERS =
EnumSet.of(Op.GREATER_OR_EQUAL, Op.GREATER, Op.LESS_OR_EQUAL, Op.LESS);
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (revision 6883)
@@ -589,5 +589,8 @@
public static class NullExpression implements Expression {
- final public static NullExpression INSTANCE = new NullExpression();
+ /**
+ * The unique instance.
+ */
+ public static final NullExpression INSTANCE = new NullExpression();
@Override
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java (revision 6883)
@@ -11,5 +11,5 @@
import org.openstreetmap.josm.gui.mappaint.StyleKeys;
-abstract public class Instruction implements StyleKeys {
+public abstract class Instruction implements StyleKeys {
public abstract void execute(Environment env);
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (revision 6883)
@@ -311,8 +311,8 @@
/**
- * Super class of {@link GeneralSelector} and {@link LinkSelector}
+ * Super class of {@link GeneralSelector} and {@link LinkSelector}.
* @since 5841
*/
- public static abstract class AbstractSelector implements Selector {
+ public abstract static class AbstractSelector implements Selector {
protected final List conds;
@@ -466,5 +466,5 @@
}
- final static double R = 6378135;
+ static final double R = 6378135;
public static double level2scale(int lvl) {
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/xml/Prototype.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/xml/Prototype.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/xml/Prototype.java (revision 6883)
@@ -8,5 +8,5 @@
import org.openstreetmap.josm.gui.mappaint.Range;
-abstract public class Prototype {
+public abstract class Prototype {
// zoom range to display the feature
public Range range;
Index: trunk/src/org/openstreetmap/josm/gui/oauth/AbstractAuthorizationUI.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/AbstractAuthorizationUI.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/AbstractAuthorizationUI.java (revision 6883)
@@ -17,5 +17,5 @@
* The property name for the Access Token property
*/
- static public final String ACCESS_TOKEN_PROP = AbstractAuthorizationUI.class.getName() + ".accessToken";
+ public static final String ACCESS_TOKEN_PROP = AbstractAuthorizationUI.class.getName() + ".accessToken";
private String apiUrl;
Index: trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java (revision 6883)
@@ -288,9 +288,7 @@
switch (e.getStateChange()) {
case ItemEvent.SELECTED:
- if (hasCustomSettings()) {
- if (!confirmOverwriteCustomSettings()) {
- cbUseDefaults.setSelected(false);
- return;
- }
+ if (hasCustomSettings() && !confirmOverwriteCustomSettings()) {
+ cbUseDefaults.setSelected(false);
+ return;
}
resetToDefaultSettings();
Index: trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java (revision 6883)
@@ -15,4 +15,7 @@
public class AuthorizationProcedureComboBox extends JosmComboBox {
+ /**
+ * Constructs a new {@code AuthorizationProcedureComboBox}.
+ */
public AuthorizationProcedureComboBox() {
super(AuthorizationProcedure.values());
@@ -21,5 +24,5 @@
}
- static private class AuthorisationProcedureCellRenderer extends JLabel implements ListCellRenderer {
+ private static class AuthorisationProcedureCellRenderer extends JLabel implements ListCellRenderer {
public AuthorisationProcedureCellRenderer() {
setOpaque(true);
Index: trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java (revision 6883)
@@ -401,6 +401,5 @@
}
-
- static private class UserNameValidator extends AbstractTextComponentValidator {
+ private static class UserNameValidator extends AbstractTextComponentValidator {
public UserNameValidator(JTextComponent tc) {
super(tc);
@@ -422,5 +421,5 @@
}
- static private class PasswordValidator extends AbstractTextComponentValidator {
+ private static class PasswordValidator extends AbstractTextComponentValidator {
public PasswordValidator(JTextComponent tc) {
Index: trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java (revision 6883)
@@ -55,5 +55,7 @@
}
-
+ /**
+ * Constructs a new {@code FullyAutomaticPropertiesPanel}.
+ */
public FullyAutomaticPropertiesPanel() {
setLayout(new GridBagLayout());
@@ -72,5 +74,5 @@
}
- static private class UserNameValidator extends AbstractTextComponentValidator {
+ private static class UserNameValidator extends AbstractTextComponentValidator {
public UserNameValidator(JTextComponent tc) {
Index: trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java (revision 6883)
@@ -196,5 +196,5 @@
}
- static private class AccessTokenSecretValidator extends AbstractTextComponentValidator {
+ private static class AccessTokenSecretValidator extends AbstractTextComponentValidator {
public AccessTokenSecretValidator(JTextComponent tc) throws IllegalArgumentException {
super(tc);
Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 6883)
@@ -143,5 +143,5 @@
// all created tabs
private final List tabs = new ArrayList();
- private final static Collection settingsFactory = new LinkedList();
+ private static final Collection settingsFactory = new LinkedList();
private final List settings = new ArrayList();
Index: trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 6883)
@@ -375,15 +375,15 @@
* Load the list of source entries that the user has configured.
*/
- abstract public Collection getInitialSourcesList();
+ public abstract Collection getInitialSourcesList();
/**
* Load the list of configured icon paths.
*/
- abstract public Collection getInitialIconPathsList();
+ public abstract Collection getInitialIconPathsList();
/**
* Get the default list of entries (used when resetting the list).
*/
- abstract public Collection getDefault();
+ public abstract Collection getDefault();
/**
@@ -391,10 +391,10 @@
* @return true if restart is required
*/
- abstract public boolean finish();
+ public abstract boolean finish();
/**
* Provide the GUI strings. (There are differences for MapPaint and Preset)
*/
- abstract protected String getStr(I18nString ident);
+ protected abstract String getStr(I18nString ident);
/**
@@ -1543,5 +1543,5 @@
}
- abstract public static class SourcePrefHelper {
+ public abstract static class SourcePrefHelper {
private final String pref;
@@ -1559,9 +1559,9 @@
* @return the default sources provided by JOSM core
*/
- abstract public Collection getDefault();
-
- abstract public Map serialize(SourceEntry entry);
-
- abstract public SourceEntry deserialize(Map entryStr);
+ public abstract Collection getDefault();
+
+ public abstract Map serialize(SourceEntry entry);
+
+ public abstract SourceEntry deserialize(Map entryStr);
/**
Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java (revision 6883)
@@ -109,5 +109,5 @@
}
- static private class LanguageCellRenderer extends DefaultListCellRenderer {
+ private static class LanguageCellRenderer extends DefaultListCellRenderer {
private ListCellRenderer dispatch;
public LanguageCellRenderer(ListCellRenderer dispatch) {
Index: trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java (revision 6883)
@@ -189,5 +189,5 @@
* The unique instance.
*/
- public final static MapPaintPrefHelper INSTANCE = new MapPaintPrefHelper();
+ public static final MapPaintPrefHelper INSTANCE = new MapPaintPrefHelper();
/**
Index: trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (revision 6883)
@@ -325,5 +325,5 @@
* The unique instance.
*/
- public final static PresetPrefHelper INSTANCE = new PresetPrefHelper();
+ public static final PresetPrefHelper INSTANCE = new PresetPrefHelper();
/**
Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java (revision 6883)
@@ -45,5 +45,5 @@
* OSM API URL property key.
*/
- static public final String API_URL_PROP = OsmApiUrlInputPanel.class.getName() + ".apiUrl";
+ public static final String API_URL_PROP = OsmApiUrlInputPanel.class.getName() + ".apiUrl";
private JLabel lblValid;
@@ -241,5 +241,5 @@
}
- static private class ApiUrlValidator extends AbstractTextComponentValidator {
+ private static class ApiUrlValidator extends AbstractTextComponentValidator {
public ApiUrlValidator(JTextComponent tc) throws IllegalArgumentException {
super(tc);
Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java (revision 6883)
@@ -72,5 +72,5 @@
* @return The proxy policy matching the given name, or {@code null}
*/
- static public ProxyPolicy fromName(String policyName) {
+ public static ProxyPolicy fromName(String policyName) {
if (policyName == null) return null;
policyName = policyName.trim().toLowerCase();
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java (revision 6883)
@@ -33,5 +33,5 @@
@SuppressWarnings("serial")
public class TagEditorModel extends AbstractTableModel {
- static public final String PROP_DIRTY = TagEditorModel.class.getName() + ".dirty";
+ public static final String PROP_DIRTY = TagEditorModel.class.getName() + ".dirty";
/** the list holding the tags */
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (revision 6883)
@@ -77,5 +77,5 @@
public String locale_name;
public boolean preset_name_label;
- public final static String OPTIONAL_TOOLTIP_TEXT = "Optional tooltip text";
+ public static final String OPTIONAL_TOOLTIP_TEXT = "Optional tooltip text";
/**
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (revision 6883)
@@ -304,5 +304,5 @@
* @since 6190
*/
- public static abstract class TaggingPresetTextItem extends TaggingPresetItem {
+ public abstract static class TaggingPresetTextItem extends TaggingPresetItem {
/**
@@ -505,5 +505,5 @@
}
- public static abstract class KeyedItem extends TaggingPresetItem {
+ public abstract static class KeyedItem extends TaggingPresetItem {
public String key;
@@ -893,5 +893,5 @@
}
- public static abstract class ComboMultiSelect extends KeyedItem {
+ public abstract static class ComboMultiSelect extends KeyedItem {
public String locale_text;
@@ -1357,5 +1357,6 @@
}
}
- static public EnumSet getType(String types) throws SAXException {
+
+ public static EnumSet getType(String types) throws SAXException {
if (typeCache.containsKey(types))
return typeCache.get(types);
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java (revision 6883)
@@ -1,4 +1,6 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.tagging;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.BorderLayout;
@@ -18,6 +20,6 @@
import java.util.EnumSet;
import java.util.HashSet;
-import java.util.LinkedList;
import java.util.List;
+
import javax.swing.AbstractAction;
import javax.swing.AbstractListModel;
@@ -36,4 +38,5 @@
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
+
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.SelectionChangedListener;
@@ -43,5 +46,4 @@
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.data.preferences.BooleanProperty;
-import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Key;
@@ -50,7 +52,5 @@
import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Roles;
import org.openstreetmap.josm.gui.widgets.JosmTextField;
-import org.openstreetmap.josm.gui.widgets.ListPopupMenu;
import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
-import static org.openstreetmap.josm.tools.I18n.tr;
/**
@@ -77,5 +77,4 @@
private final List classifications = new ArrayList();
private ResultListModel lsResultModel = new ResultListModel();
- private JPopupMenu popupMenu;
private ActionListener dblClickListener;
@@ -297,5 +296,5 @@
setPreferredSize(new Dimension(400, 300));
filterPresets();
- popupMenu = new JPopupMenu();
+ JPopupMenu popupMenu = new JPopupMenu();
popupMenu.add(new AbstractAction(tr("Add toolbar button")) {
@Override
@@ -435,5 +434,4 @@
init();
}
-
public void clearSelection() {
Index: trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java (revision 6883)
@@ -33,6 +33,6 @@
*/
public abstract class AbstractTextComponentValidator implements ActionListener, FocusListener, DocumentListener, PropertyChangeListener{
- static final private Border ERROR_BORDER = BorderFactory.createLineBorder(Color.RED, 1);
- static final private Color ERROR_BACKGROUND = new Color(255,224,224);
+ private static final Border ERROR_BORDER = BorderFactory.createLineBorder(Color.RED, 1);
+ private static final Color ERROR_BACKGROUND = new Color(255,224,224);
private JTextComponent tc;
Index: trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java (revision 6883)
@@ -121,5 +121,5 @@
}
- static private class LatitudeValidator extends AbstractTextComponentValidator {
+ private static class LatitudeValidator extends AbstractTextComponentValidator {
public static void decorate(JTextComponent tc) {
@@ -161,5 +161,5 @@
}
- static private class LongitudeValidator extends AbstractTextComponentValidator{
+ private static class LongitudeValidator extends AbstractTextComponentValidator{
public static void decorate(JTextComponent tc) {
Index: trunk/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java (revision 6883)
@@ -10,5 +10,5 @@
import org.openstreetmap.josm.gui.util.GuiHelper;
-abstract public class AbstractCredentialsAgent implements CredentialsAgent {
+public abstract class AbstractCredentialsAgent implements CredentialsAgent {
protected Map memoryCredentialsCache = new HashMap();
Index: trunk/src/org/openstreetmap/josm/io/auth/CredentialsManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/auth/CredentialsManager.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/io/auth/CredentialsManager.java (revision 6883)
@@ -27,5 +27,5 @@
* @return the single credential agent used in JOSM
*/
- static public CredentialsManager getInstance() {
+ public static CredentialsManager getInstance() {
if (instance == null) {
CredentialsAgent delegate;
Index: trunk/src/org/openstreetmap/josm/io/imagery/Grabber.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/imagery/Grabber.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/io/imagery/Grabber.java (revision 6883)
@@ -8,5 +8,5 @@
import org.openstreetmap.josm.gui.layer.WMSLayer;
-abstract public class Grabber implements Runnable {
+public abstract class Grabber implements Runnable {
protected final MapView mv;
protected final WMSLayer layer;
@@ -27,4 +27,5 @@
return layer.getBaseImageWidth();
}
+
int height(){
return layer.getBaseImageHeight();
@@ -81,9 +82,8 @@
}
- abstract public boolean loadFromCache(WMSRequest request);
+ public abstract boolean loadFromCache(WMSRequest request);
public void cancel() {
canceled = true;
}
-
}
Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java (revision 6883)
@@ -93,5 +93,5 @@
* @return the message
*/
- abstract public String getPermissionMessage();
+ public abstract String getPermissionMessage();
/**
@@ -105,7 +105,7 @@
* @return the preference name and error message or null
*/
- abstract public PermissionPrefWithDefault getPermissionPref();
-
- abstract public String[] getMandatoryParams();
+ public abstract PermissionPrefWithDefault getPermissionPref();
+
+ public abstract String[] getMandatoryParams();
public String[] getOptionalParams() {
@@ -137,6 +137,5 @@
* @throws RequestHandlerForbiddenException
*/
- final public void checkPermission() throws RequestHandlerForbiddenException
- {
+ public final void checkPermission() throws RequestHandlerForbiddenException {
/*
* If the subclass defines a specific preference and if this is set
@@ -147,6 +146,5 @@
*/
PermissionPrefWithDefault permissionPref = getPermissionPref();
- if((permissionPref != null) && (permissionPref.pref != null))
- {
+ if (permissionPref != null && permissionPref.pref != null) {
if (!Main.pref.getBoolean(permissionPref.pref, permissionPref.defaultVal)) {
String err = MessageFormat.format("RemoteControl: ''{0}'' forbidden by preferences", myCommand);
Index: trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java (revision 6883)
@@ -90,5 +90,6 @@
}
- @Override protected void cancel() {
+ @Override
+ protected void cancel() {
this.canceled = true;
synchronized(this) {
@@ -99,5 +100,6 @@
}
- @Override protected void finish() {}
+ @Override
+ protected void finish() {}
protected void download(PluginInformation pi, File file) throws PluginDownloadException{
@@ -152,12 +154,11 @@
}
- @Override protected void realRun() throws SAXException, IOException {
+ @Override
+ protected void realRun() throws SAXException, IOException {
File pluginDir = Main.pref.getPluginsDirectory();
- if (!pluginDir.exists()) {
- if (!pluginDir.mkdirs()) {
- lastException = new PluginDownloadException(tr("Failed to create plugin directory ''{0}''", pluginDir.toString()));
- failed.addAll(toUpdate);
- return;
- }
+ if (!pluginDir.exists() && !pluginDir.mkdirs()) {
+ lastException = new PluginDownloadException(tr("Failed to create plugin directory ''{0}''", pluginDir.toString()));
+ failed.addAll(toUpdate);
+ return;
}
getProgressMonitor().setTicksCount(toUpdate.size());
Index: trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 6883)
@@ -78,5 +78,5 @@
* Deprecated plugins that are removed on start
*/
- public final static Collection DEPRECATED_PLUGINS;
+ public static final Collection DEPRECATED_PLUGINS;
static {
String IN_CORE = tr("integrated into main program");
@@ -195,5 +195,5 @@
* All installed and loaded plugins (resp. their main classes)
*/
- public final static Collection pluginList = new LinkedList();
+ public static final Collection pluginList = new LinkedList();
/**
@@ -1035,10 +1035,8 @@
File plugin = new File(filePath.substring(0, filePath.length() - 4));
String pluginName = updatedPlugin.getName().substring(0, updatedPlugin.getName().length() - 8);
- if (plugin.exists()) {
- if (!plugin.delete() && dowarn) {
- Main.warn(tr("Failed to delete outdated plugin ''{0}''.", plugin.toString()));
- Main.warn(tr("Failed to install already downloaded plugin ''{0}''. Skipping installation. JOSM is still going to load the old plugin version.", pluginName));
- continue;
- }
+ if (plugin.exists() && !plugin.delete() && dowarn) {
+ Main.warn(tr("Failed to delete outdated plugin ''{0}''.", plugin.toString()));
+ Main.warn(tr("Failed to install already downloaded plugin ''{0}''. Skipping installation. JOSM is still going to load the old plugin version.", pluginName));
+ continue;
}
try {
@@ -1324,5 +1322,5 @@
}
- static private class UpdatePluginsMessagePanel extends JPanel {
+ private static class UpdatePluginsMessagePanel extends JPanel {
private JMultilineLabel lblMessage;
private JCheckBox cbDontShowAgain;
Index: trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java (revision 6883)
@@ -325,8 +325,6 @@
try {
File pluginDir = Main.pref.getPluginsDirectory();
- if (!pluginDir.exists()) {
- if (! pluginDir.mkdirs()) {
- Main.warn(tr("Failed to create plugin directory ''{0}''. Cannot cache plugin list from plugin site ''{1}''.", pluginDir.toString(), site));
- }
+ if (!pluginDir.exists() && !pluginDir.mkdirs()) {
+ Main.warn(tr("Failed to create plugin directory ''{0}''. Cannot cache plugin list from plugin site ''{1}''.", pluginDir.toString(), site));
}
File cacheFile = createSiteCacheFile(pluginDir, site, CacheType.PLUGIN_LIST);
Index: trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 6882)
+++ trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 6883)
@@ -831,8 +831,6 @@
}
File josmTmpDir = new File(tmpDir, "JOSM");
- if (!josmTmpDir.exists()) {
- if (!josmTmpDir.mkdirs()) {
- Main.warn("Unable to create temp directory "+josmTmpDir);
- }
+ if (!josmTmpDir.exists() && !josmTmpDir.mkdirs()) {
+ Main.warn("Unable to create temp directory "+josmTmpDir);
}
return josmTmpDir;