Changeset 6889 in josm for trunk/src/org


Ignore:
Timestamp:
2014-02-27T01:41:49+01:00 (11 years ago)
Author:
Don-vip
Message:

fix some Sonar issues (JLS order)

Location:
trunk/src/org/openstreetmap/josm
Files:
106 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java

    r6743 r6889  
    3939     * @return the base URL, i.e. http://api.openstreetmap.org/browse
    4040     */
    41     static public String getBaseBrowseUrl() {
     41    public static String getBaseBrowseUrl() {
    4242        String baseUrl = Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL);
    4343        Pattern pattern = Pattern.compile("/api/?$");
    … …  
    5858     * @return the base URL, i.e. http://www.openstreetmap.org/user
    5959     */
    60     static public String getBaseUserUrl() {
     60    public static String getBaseUserUrl() {
    6161        String baseUrl = Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL);
    6262        Pattern pattern = Pattern.compile("/api/?$");

  • trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java

    r6792 r6889  
    2828     *
    2929     */
    30     static public class LayerListCellRenderer extends DefaultListCellRenderer {
     30    public static class LayerListCellRenderer extends DefaultListCellRenderer {
    3131
    3232        @Override

  • trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

    r6679 r6889  
    44import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
    55import static org.openstreetmap.josm.tools.I18n.tr;
    6 import static org.openstreetmap.josm.tools.I18n.trc;
    76import static org.openstreetmap.josm.tools.I18n.trn;
    87
    … …  
    258257     * A pair of nodes.
    259258     */
    260     static public class NodePair {
     259    public static class NodePair {
    261260        private final Node a;
    262261        private final Node b;
    … …  
    376375    }
    377376
    378     static public class NodeGraph {
    379         static public List<NodePair> buildNodePairs(Way way, boolean directed) {
     377    public static class NodeGraph {
     378        public static List<NodePair> buildNodePairs(Way way, boolean directed) {
    380379            List<NodePair> pairs = new ArrayList<NodePair>();
    381380            for (Pair<Node,Node> pair: way.getNodePairs(false /* don't sort */)) {
    … …  
    388387        }
    389388
    390         static public List<NodePair> buildNodePairs(List<Way> ways, boolean directed) {
     389        public static List<NodePair> buildNodePairs(List<Way> ways, boolean directed) {
    391390            List<NodePair> pairs = new ArrayList<NodePair>();
    392391            for (Way w: ways) {
    … …  
    396395        }
    397396
    398         static public List<NodePair> eliminateDuplicateNodePairs(List<NodePair> pairs) {
     397        public static List<NodePair> eliminateDuplicateNodePairs(List<NodePair> pairs) {
    399398            List<NodePair> cleaned = new ArrayList<NodePair>();
    400399            for(NodePair p: pairs) {
    … …  
    406405        }
    407406
    408         static public NodeGraph createDirectedGraphFromNodePairs(List<NodePair> pairs) {
     407        public static NodeGraph createDirectedGraphFromNodePairs(List<NodePair> pairs) {
    409408            NodeGraph graph = new NodeGraph();
    410409            for (NodePair pair: pairs) {
    … …  
    414413        }
    415414
    416         static public NodeGraph createDirectedGraphFromWays(Collection<Way> ways) {
     415        public static NodeGraph createDirectedGraphFromWays(Collection<Way> ways) {
    417416            NodeGraph graph = new NodeGraph();
    418417            for (Way w: ways) {
    … …  
    422421        }
    423422
    424         static public NodeGraph createUndirectedGraphFromNodeList(List<NodePair> pairs) {
     423        public static NodeGraph createUndirectedGraphFromNodeList(List<NodePair> pairs) {
    425424            NodeGraph graph = new NodeGraph();
    426425            for (NodePair pair: pairs) {

  • trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java

    r6830 r6889  
    1414 * @since 78
    1515 */
    16 abstract public class DiskAccessAction extends JosmAction {
     16public abstract class DiskAccessAction extends JosmAction {
    1717
    1818    /**

  • trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java

    r6792 r6889  
    2828    private static final ExpertToggleAction INSTANCE = new ExpertToggleAction();
    2929
    30     private synchronized static void fireExpertModeChanged(boolean isExpert) {
     30    private static synchronized void fireExpertModeChanged(boolean isExpert) {
    3131        {
    3232            Iterator<WeakReference<ExpertModeChangeListener>> it = listeners.iterator();
    … …  
    6464    }
    6565
    66     public synchronized static void addExpertModeChangeListener(ExpertModeChangeListener listener, boolean fireWhenAdding) {
     66    public static synchronized void addExpertModeChangeListener(ExpertModeChangeListener listener, boolean fireWhenAdding) {
    6767        if (listener == null) return;
    6868        for (WeakReference<ExpertModeChangeListener> wr : listeners) {
    … …  
    8181     * @param listener the listener. Ignored if null.
    8282     */
    83     public synchronized static void removeExpertModeChangeListener(ExpertModeChangeListener listener) {
     83    public static synchronized void removeExpertModeChangeListener(ExpertModeChangeListener listener) {
    8484        if (listener == null) return;
    8585        Iterator<WeakReference<ExpertModeChangeListener>> it = listeners.iterator();
    … …  
    9494    }
    9595
    96     public synchronized static void addVisibilitySwitcher(Component c) {
     96    public static synchronized void addVisibilitySwitcher(Component c) {
    9797        if (c == null) return;
    9898        for (WeakReference<Component> wr : visibilityToggleListeners) {
    … …  
    104104    }
    105105
    106     public synchronized static void removeVisibilitySwitcher(Component c) {
     106    public static synchronized void removeVisibilitySwitcher(Component c) {
    107107        if (c == null) return;
    108108        Iterator<WeakReference<Component>> it = visibilityToggleListeners.iterator();

  • trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java

    r6882 r6889  
    9595    private final String defaultExtension;
    9696
    97     static protected void sort(List<ExtensionFileFilter> filters) {
     97    protected static void sort(List<ExtensionFileFilter> filters) {
    9898        Collections.sort(
    9999                filters,

  • trunk/src/org/openstreetmap/josm/actions/JosmAction.java

    r6814 r6889  
    3838 * @author imi
    3939 */
    40 abstract public class JosmAction extends AbstractAction implements Destroyable {
     40public abstract class JosmAction extends AbstractAction implements Destroyable {
    4141
    4242    protected Shortcut sc;

  • trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java

    r6822 r6889  
    8383     * @param fileList A list of files
    8484     */
    85     static public void openFiles(List<File> fileList) {
     85    public static void openFiles(List<File> fileList) {
    8686        openFiles(fileList, false);
    8787    }
    8888
    89     static public void openFiles(List<File> fileList, boolean recordHistory) {
     89    public static void openFiles(List<File> fileList, boolean recordHistory) {
    9090        OpenFileTask task = new OpenFileTask(fileList, null);
    9191        task.setRecordHistory(recordHistory);
    … …  
    9393    }
    9494
    95     static public class OpenFileTask extends PleaseWaitRunnable {
     95    public static class OpenFileTask extends PleaseWaitRunnable {
    9696        private List<File> files;
    9797        private List<File> successfullyOpenedFiles = new ArrayList<File>();

  • trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java

    r6798 r6889  
    405405     */
    406406    private static class WayData {
    407         final public Way way;             // The assigned way
    408         final public int nSeg;            // Number of Segments of the Way
    409         final public int nNode;           // Number of Nodes of the Way
     407        public final Way way;             // The assigned way
     408        public final int nSeg;            // Number of Segments of the Way
     409        public final int nNode;           // Number of Nodes of the Way
    410410        public Direction[] segDirections; // Direction of the segments
    411411        // segment i goes from node i to node (i+1)
    412412        public EastNorth segSum;          // (Vector-)sum of all horizontal segments plus the sum of all vertical
    413         //     segments turned by 90 degrees
     413        // segments turned by 90 degrees
    414414        public double heading;            // heading of segSum == approximate heading of the way
    415415        public WayData(Way pWay) {

  • trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

    r6679 r6889  
    259259     * @return the list of chunks
    260260     */
    261     static public List<List<Node>> buildSplitChunks(Way wayToSplit, List<Node> splitPoints){
     261    public static List<List<Node>> buildSplitChunks(Way wayToSplit, List<Node> splitPoints){
    262262        CheckParameterUtil.ensureParameterNotNull(wayToSplit, "wayToSplit");
    263263        CheckParameterUtil.ensureParameterNotNull(splitPoints, "splitPoints");
    … …  
    532532     * @return the result from the split operation
    533533     */
    534     static public SplitWayResult split(OsmDataLayer layer, Way way, List<Node> atNodes, Collection<? extends OsmPrimitive> selection) {
     534    public static SplitWayResult split(OsmDataLayer layer, Way way, List<Node> atNodes, Collection<? extends OsmPrimitive> selection) {
    535535        List<List<Node>> chunks = buildSplitChunks(way, atNodes);
    536536        if (chunks == null) return null;

  • trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

    r6380 r6889  
    120120    }
    121121
    122     @Override public void exitMode() {
     122    @Override
     123    public void exitMode() {
    123124        super.exitMode();
    124125        Main.map.mapView.removeMouseListener(this);
    … …  
    132133    }
    133134
    134     @Override public void actionPerformed(ActionEvent e) {
     135    @Override
     136    public void actionPerformed(ActionEvent e) {
    135137        super.actionPerformed(e);
    136138        doActionPerformed(e);
    137139    }
    138140
    139     static public void doActionPerformed(ActionEvent e) {
     141    public static void doActionPerformed(ActionEvent e) {
    140142        if(!Main.map.mapView.isActiveLayerDrawable())
    141143            return;

  • trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

    r6798 r6889  
    8282 */
    8383public class DrawAction extends MapMode implements MapViewPaintable, SelectionChangedListener, AWTEventListener {
    84     final private Cursor cursorJoinNode;
    85     final private Cursor cursorJoinWay;
     84    private final Cursor cursorJoinNode;
     85    private final Cursor cursorJoinWay;
    8686
    8787    private Node lastUsedNode = null;

  • trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

    r6792 r6889  
    823823     * @param g the Graphics2D object  it will be used on
    824824     */
    825     static private Line2D createSemiInfiniteLine(Point2D start, Point2D unitvector, Graphics2D g) {
     825    private static Line2D createSemiInfiniteLine(Point2D start, Point2D unitvector, Graphics2D g) {
    826826        Rectangle bounds = g.getDeviceConfiguration().getBounds();
    827827        try {

  • trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java

    r6830 r6889  
    7474    private boolean dragging = false;
    7575
    76     final private Cursor cursorSelect;
    77     final private Cursor cursorSelectHover;
    78     final private Cursor cursorImprove;
    79     final private Cursor cursorImproveAdd;
    80     final private Cursor cursorImproveDelete;
    81     final private Cursor cursorImproveAddLock;
    82     final private Cursor cursorImproveLock;
     76    private final Cursor cursorSelect;
     77    private final Cursor cursorSelectHover;
     78    private final Cursor cursorImprove;
     79    private final Cursor cursorImproveAdd;
     80    private final Cursor cursorImproveDelete;
     81    private final Cursor cursorImproveAddLock;
     82    private final Cursor cursorImproveLock;
    8383
    8484    private Color guideColor;

  • trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java

    r6084 r6889  
    2424 * control.
    2525 */
    26 abstract public class MapMode extends JosmAction implements MouseListener, MouseMotionListener {
     26public abstract class MapMode extends JosmAction implements MouseListener, MouseMotionListener {
    2727    protected final Cursor cursor;
    2828    protected boolean ctrl;

  • trunk/src/org/openstreetmap/josm/actions/mapmode/ModifiersSpec.java

    r4134 r6889  
    88 */
    99public class ModifiersSpec {
    10     static public final int ON = 1, OFF = 0, UNKNOWN = 2;
     10    public static final int ON = 1, OFF = 0, UNKNOWN = 2;
    1111    public int alt = UNKNOWN;
    1212    public int shift = UNKNOWN;

  • trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java

    r6316 r6889  
    188188    }
    189189
    190     static private Node copyNode(Node source, boolean copyTags) {
     190    private static Node copyNode(Node source, boolean copyTags) {
    191191        if (copyTags)
    192192            return new Node(source, true);

  • trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

    r6679 r6889  
    7575
    7676    // contains all possible cases the cursor can be in the SelectAction
    77     static private enum SelectActionCursor {
     77    private static enum SelectActionCursor {
    7878        rect("normal", "selection"),
    7979        rect_add("normal", "select_add"),
    … …  
    666666     * still pressed)
    667667     */
    668     final private boolean dragInProgress() {
     668    private final boolean dragInProgress() {
    669669        return didMouseDrag && startingDraggingPos != null;
    670670    }
    671 
    672671
    673672    /**
    … …  
    832831     * reported. If there is, it will execute the merge and add it to the undo buffer.
    833832     */
    834     final private void mergePrims(Point p) {
     833    private final void mergePrims(Point p) {
    835834        Collection<Node> selNodes = getCurrentDataSet().getSelectedNodes();
    836835        if (selNodes.isEmpty())
    … …  
    850849     * position. Either returns the node or null, if no suitable one is nearby.
    851850     */
    852     final private Node findNodeToMergeTo(Point p) {
     851    private final Node findNodeToMergeTo(Point p) {
    853852        Collection<Node> target = mv.getNearestNodes(p,
    854853                getCurrentDataSet().getSelectedNodes(),

  • trunk/src/org/openstreetmap/josm/data/Preferences.java

    r6851 r6889  
    154154     * @param <T> The setting type
    155155     */
    156     abstract public static class AbstractSetting<T> implements Setting<T> {
     156    public abstract static class AbstractSetting<T> implements Setting<T> {
    157157        protected final T value;
    158158        /**
    … …  
    13071307     * The default plugin site
    13081308     */
    1309     private final static String[] DEFAULT_PLUGIN_SITE = {Main.JOSM_WEBSITE+"/plugin%<?plugins=>"};
     1309    private static final String[] DEFAULT_PLUGIN_SITE = {Main.JOSM_WEBSITE+"/plugin%<?plugins=>"};
    13101310
    13111311    /**

  • trunk/src/org/openstreetmap/josm/data/Version.java

    r6822 r6889  
    2323public class Version {
    2424    /** constant to indicate that the current build isn't assigned a JOSM version number */
    25     static public final int JOSM_UNKNOWN_VERSION = 0;
     25    public static final int JOSM_UNKNOWN_VERSION = 0;
    2626
    2727    /** the unique instance */
    … …  
    3434     * @return  the content of the resource file; null, if an error occurred
    3535     */
    36     static public String loadResourceFile(URL resource) {
     36    public static String loadResourceFile(URL resource) {
    3737        if (resource == null) return null;
    3838        String s = null;
    … …  
    6060     * @return the unique instance of the version information
    6161     */
    62 
    63     static public Version getInstance() {
     62    public static Version getInstance() {
    6463        if (instance == null) {
    6564            instance = new Version();

  • trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

    r6830 r6889  
    675675     * What to do, when the tags have changed by one of the tag-changing methods.
    676676     */
    677     abstract protected void keysChangedImpl(Map<String, String> originalKeys);
     677    protected abstract void keysChangedImpl(Map<String, String> originalKeys);
    678678
    679679    /**

  • trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java

    r6362 r6889  
    3434public final class ChangesetCache implements PreferenceChangedListener{
    3535    /** the unique instance */
    36     static private final ChangesetCache instance = new ChangesetCache();
     36    private static final ChangesetCache instance = new ChangesetCache();
    3737
    3838    /**

  • trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java

    r6084 r6889  
    2828    }
    2929
    30     final private Map<PrimitiveId, HistoryOsmPrimitive> primitives = new HashMap<PrimitiveId, HistoryOsmPrimitive>();
    31     final private Map<PrimitiveId, ChangesetModificationType> modificationTypes = new HashMap<PrimitiveId, ChangesetModificationType>();
     30    private final Map<PrimitiveId, HistoryOsmPrimitive> primitives = new HashMap<PrimitiveId, HistoryOsmPrimitive>();
     31    private final Map<PrimitiveId, ChangesetModificationType> modificationTypes = new HashMap<PrimitiveId, ChangesetModificationType>();
    3232
    3333    /**

  • trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

    r6830 r6889  
    4040 * @author imi
    4141 */
    42 abstract public class OsmPrimitive extends AbstractPrimitive implements Comparable<OsmPrimitive>, TemplateEngineDataProvider {
     42public abstract class OsmPrimitive extends AbstractPrimitive implements Comparable<OsmPrimitive>, TemplateEngineDataProvider {
    4343    private static final String SPECIAL_VALUE_ID = "id";
    4444    private static final String SPECIAL_VALUE_LOCAL_NAME = "localname";
    … …  
    119119     * @return the sub-list of OSM primitives of type <code>type</code>
    120120     */
    121     static public <T extends OsmPrimitive>  List<T> getFilteredList(Collection<OsmPrimitive> list, Class<T> type) {
     121    public static <T extends OsmPrimitive>  List<T> getFilteredList(Collection<OsmPrimitive> list, Class<T> type) {
    122122        if (list == null) return Collections.emptyList();
    123123        List<T> ret = new LinkedList<T>();
    … …  
    141141     * @return the sub-set of OSM primitives of type <code>type</code>
    142142     */
    143     static public <T extends OsmPrimitive> Set<T> getFilteredSet(Collection<OsmPrimitive> set, Class<T> type) {
     143    public static <T extends OsmPrimitive> Set<T> getFilteredSet(Collection<OsmPrimitive> set, Class<T> type) {
    144144        Set<T> ret = new LinkedHashSet<T>();
    145145        if (set != null) {
    … …  
    160160     * empty set if primitives is null or if there are no referring primitives
    161161     */
    162     static public Set<OsmPrimitive> getReferrer(Collection<? extends OsmPrimitive> primitives) {
     162    public static Set<OsmPrimitive> getReferrer(Collection<? extends OsmPrimitive> primitives) {
    163163        HashSet<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
    164164        if (primitives == null || primitives.isEmpty()) return ret;
    … …  
    10771077     * @param visitor The visitor from which the visit() function must be called.
    10781078     */
    1079     abstract public void accept(Visitor visitor);
     1079    public abstract void accept(Visitor visitor);
    10801080
    10811081    /**

  • trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java

    r6380 r6889  
    1010/** Comparator, comparing by type and objects display names */
    1111public class OsmPrimitiveComparator implements Comparator<OsmPrimitive> {
    12     final private Map<OsmPrimitive, String> cache= new HashMap<OsmPrimitive, String>();
    13     final private DefaultNameFormatter df = DefaultNameFormatter.getInstance();
     12    private final Map<OsmPrimitive, String> cache= new HashMap<OsmPrimitive, String>();
     13    private final DefaultNameFormatter df = DefaultNameFormatter.getInstance();
    1414    public boolean relationsFirst = false;
    1515
    … …  
    2626        String an = cachedName(a);
    2727        String bn = cachedName(b);
    28         // make sure display names starting with digits are the end of the
    29         // list
     28        // make sure display names starting with digits are the end of the list
    3029        if (Character.isDigit(an.charAt(0)) && Character.isDigit(bn.charAt(0)))
    3130            return an.compareTo(bn);

  • trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java

    r4387 r6889  
    1919    MULTIPOLYGON (marktr(/* ICON(data/) */"multipolygon"), null, RelationData.class);
    2020
    21     private final static Collection<OsmPrimitiveType> DATA_VALUES = Arrays.asList(NODE, WAY, RELATION);
     21    private static final Collection<OsmPrimitiveType> DATA_VALUES = Arrays.asList(NODE, WAY, RELATION);
    2222
    2323    private final String apiTypeName;

  • trunk/src/org/openstreetmap/josm/data/osm/PrimitiveData.java

    r5589 r6889  
    1717public abstract class PrimitiveData extends AbstractPrimitive {
    1818
     19    /**
     20     * Constructs a new {@code PrimitiveData}.
     21     */
    1922    public PrimitiveData() {
    2023        id = OsmPrimitive.generateUniqueId();
    … …  
    5154
    5255    @SuppressWarnings("unchecked")
    53     static public <T extends PrimitiveData> List<T> getFilteredList(Collection<T> list, OsmPrimitiveType type) {
     56    public static <T extends PrimitiveData> List<T> getFilteredList(Collection<T> list, OsmPrimitiveType type) {
    5457        List<T> ret = new ArrayList<T>();
    5558        for(PrimitiveData p: list) {

  • trunk/src/org/openstreetmap/josm/data/osm/RelationToChildReference.java

    r5266 r6889  
    1414     * @return  a set of all {@link RelationToChildReference}s for a given child primitive
    1515     */
    16     static public Set<RelationToChildReference> getRelationToChildReferences(OsmPrimitive child) {
     16    public static Set<RelationToChildReference> getRelationToChildReferences(OsmPrimitive child) {
    1717        Set<Relation> parents = OsmPrimitive.getFilteredSet(child.getReferrers(), Relation.class);
    1818        Set<RelationToChildReference> references = new HashSet<RelationToChildReference>();
    … …  
    3434     * primitives
    3535     */
    36     static public Set<RelationToChildReference> getRelationToChildReferences(Collection<? extends OsmPrimitive> children) {
     36    public static Set<RelationToChildReference> getRelationToChildReferences(Collection<? extends OsmPrimitive> children) {
    3737        Set<RelationToChildReference> references = new HashSet<RelationToChildReference>();
    3838        for (OsmPrimitive child: children) {

  • trunk/src/org/openstreetmap/josm/data/osm/User.java

    r6822 r6889  
    2525public final class User {
    2626
    27     static private AtomicLong uidCounter = new AtomicLong();
     27    private static AtomicLong uidCounter = new AtomicLong();
    2828
    2929    /**
    … …  
    3131     */
    3232    private static Map<Long,User> userMap = new HashMap<Long,User>();
    33     private final static User anonymous = createLocalUser(tr("<anonymous>"));
     33    private static final User anonymous = createLocalUser(tr("<anonymous>"));
    3434
    3535    private static long getNextLocalUid() {

  • trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java

    r6830 r6889  
    113113     * @return the option selected by user. {@link JOptionPane#CLOSED_OPTION} if the dialog was closed.
    114114     */
    115     static public int showOptionDialog(String preferenceKey, Component parent, Object message, String title, int optionType, int messageType, Object [] options, Object defaultOption) throws HeadlessException {
     115    public static int showOptionDialog(String preferenceKey, Component parent, Object message, String title, int optionType, int messageType, Object [] options, Object defaultOption) throws HeadlessException {
    116116        int ret = getDialogReturnValue(preferenceKey);
    117117        if (isYesOrNo(ret))
    … …  
    156156     * @see JOptionPane#ERROR_MESSAGE
    157157     */
    158     static public boolean showConfirmationDialog(String preferenceKey, Component parent, Object message, String title, int optionType, int messageType, int trueOption) throws HeadlessException {
     158    public static boolean showConfirmationDialog(String preferenceKey, Component parent, Object message, String title, int optionType, int messageType, int trueOption) throws HeadlessException {
    159159        int ret = getDialogReturnValue(preferenceKey);
    160160        if (isYesOrNo(ret))
    … …  
    190190     * @see JOptionPane#ERROR_MESSAGE
    191191     */
    192     static public void showMessageDialog(String preferenceKey, Component parent, Object message, String title,int messageType) {
     192    public static void showMessageDialog(String preferenceKey, Component parent, Object message, String title,int messageType) {
    193193        if (getDialogReturnValue(preferenceKey) == Integer.MAX_VALUE)
    194194            return;

  • trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java

    r6804 r6889  
    4747public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter {
    4848
    49     static private DefaultNameFormatter instance;
     49    private static DefaultNameFormatter instance;
    5050
    5151    private static final List<NameFormatterHook> formatHooks = new LinkedList<NameFormatterHook>();
    … …  
    5656     * @return the unique instance of this formatter
    5757     */
    58     static public DefaultNameFormatter getInstance() {
     58    public static DefaultNameFormatter getInstance() {
    5959        if (instance == null) {
    6060            instance = new DefaultNameFormatter();
    … …  
    9191     * A ? prefix indicates a boolean value, for which the key (instead of the value) is used.
    9292     */
    93     static public final String[] DEFAULT_NAMING_TAGS_FOR_RELATIONS = {"name", "ref", "restriction", "landuse", "natural",
     93    public static final String[] DEFAULT_NAMING_TAGS_FOR_RELATIONS = {"name", "ref", "restriction", "landuse", "natural",
    9494        "public_transport", ":LocationCode", "note", "?building"};
    9595
    9696    /** the current list of tags used as naming tags in relations */
    97     static private List<String> namingTagsForRelations =  null;
     97    private static List<String> namingTagsForRelations =  null;
    9898
    9999    /**
    … …  
    106106     * @return the list of naming tags used in relations
    107107     */
    108     static public List<String> getNamingtagsForRelations() {
     108    public static List<String> getNamingtagsForRelations() {
    109109        if (namingTagsForRelations == null) {
    110110            namingTagsForRelations = new ArrayList<String>(

  • trunk/src/org/openstreetmap/josm/gui/FileDrop.java

    r6830 r6889  
    514514     * @version 1.2
    515515     */
    516     public static class TransferableObject implements Transferable
    517     {
     516    public static class TransferableObject implements Transferable {
     517
    518518        /**
    519519         * The MIME type for {@link #DATA_FLAVOR} is
    520520         * <tt>application/x-net.iharder.dnd.TransferableObject</tt>.
    521521         */
    522         public final static String MIME_TYPE = "application/x-net.iharder.dnd.TransferableObject";
     522        public static final String MIME_TYPE = "application/x-net.iharder.dnd.TransferableObject";
    523523
    524524        /**
    … …  
    529529         * <tt>application/x-net.iharder.dnd.TransferableObject</tt>.
    530530         */
    531         public final static DataFlavor DATA_FLAVOR =
     531        public static final DataFlavor DATA_FLAVOR =
    532532            new DataFlavor( FileDrop.TransferableObject.class, MIME_TYPE );
    533533

  • trunk/src/org/openstreetmap/josm/gui/GettingStarted.java

    r6552 r6889  
    7575        }
    7676
    77         final private int myVersion = Version.getInstance().getVersion();
    78         final private String myJava = System.getProperty("java.version");
    79         final private String myLang = LanguageInfo.getWikiLanguagePrefix();
     77        private final int myVersion = Version.getInstance().getVersion();
     78        private final String myJava = System.getProperty("java.version");
     79        private final String myLang = LanguageInfo.getWikiLanguagePrefix();
    8080
    8181        /**

  • trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java

    r6362 r6889  
    106106    }
    107107
    108     static private class DefaultAction extends AbstractAction {
     108    private static class DefaultAction extends AbstractAction {
    109109        private JDialog dialog;
    110110        private JOptionPane pane;
    … …  
    132132     * @return the list of buttons
    133133     */
    134     static private List<JButton> createOptionButtons(ButtonSpec[] options, String helpTopic) {
     134    private static List<JButton> createOptionButtons(ButtonSpec[] options, String helpTopic) {
    135135        List<JButton> buttons = new ArrayList<JButton>();
    136136        if (options == null) {
    … …  
    167167     * @return the help button
    168168     */
    169     static private JButton createHelpButton(final String helpTopic) {
     169    private static JButton createHelpButton(final String helpTopic) {
    170170        JButton b = new JButton(tr("Help"));
    171171        b.setIcon(ImageProvider.get("help"));
    … …  
    211211     * @return the index of the selected option or {@link JOptionPane#CLOSED_OPTION}
    212212     */
    213     static public int showOptionDialog(Component parentComponent, Object msg, String title, int messageType, Icon icon, final ButtonSpec[] options, final ButtonSpec defaultOption, final String helpTopic)  {
     213    public static int showOptionDialog(Component parentComponent, Object msg, String title, int messageType, Icon icon, final ButtonSpec[] options, final ButtonSpec defaultOption, final String helpTopic)  {
    214214        final List<JButton> buttons = createOptionButtons(options, helpTopic);
    215215        if (helpTopic != null) {
    … …  
    318318     * @see #showOptionDialog(Component, Object, String, int, Icon, ButtonSpec[], ButtonSpec, String)
    319319     */
    320     static public int showOptionDialog(Component parentComponent, Object msg, String title, int messageType,final String helpTopic)  {
     320    public static int showOptionDialog(Component parentComponent, Object msg, String title, int messageType,final String helpTopic)  {
    321321        return showOptionDialog(parentComponent, msg, title, messageType, null,null,null, helpTopic);
    322322    }
    … …  
    329329     * e.g. from PleaseWaitRunnable
    330330     */
    331     static public void showMessageDialogInEDT(final Component parentComponent, final Object msg, final String title, final int messageType, final String helpTopic)  {
     331    public static void showMessageDialogInEDT(final Component parentComponent, final Object msg, final String title, final int messageType, final String helpTopic)  {
    332332        GuiHelper.runInEDT(new Runnable() {
    333333            @Override

  • trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java

    r6643 r6889  
    5151public final class JosmUserIdentityManager implements PreferenceChangedListener{
    5252
    53     static private JosmUserIdentityManager instance;
     53    private static JosmUserIdentityManager instance;
    5454
    5555    /**
    … …  
    5858     * @return the unique instance of the JOSM user identity manager
    5959     */
    60     static public JosmUserIdentityManager getInstance() {
     60    public static JosmUserIdentityManager getInstance() {
    6161        if (instance == null) {
    6262            instance = new JosmUserIdentityManager();

  • trunk/src/org/openstreetmap/josm/gui/MainApplet.java

    r6615 r6889  
    3636public class MainApplet extends JApplet {
    3737
    38     final static JFrame frame = new JFrame("Java OpenStreetMap Editor");
     38    static final JFrame frame = new JFrame("Java OpenStreetMap Editor");
    3939
    4040    public static final class UploadPreferencesAction extends JosmAction {
    … …  
    6161    }
    6262
    63     private final static String[][] paramInfo = {
     63    private static final String[][] paramInfo = {
    6464        {"username", tr("string"), tr("Name of the user.")},
    6565        {"password", tr("string"), tr("OSM Password.")},

  • trunk/src/org/openstreetmap/josm/gui/MainMenu.java

    r6830 r6889  
    385385     * these groups are empty.
    386386     */
    387     public final static MenuListener menuSeparatorHandler = new MenuListener() {
     387    public static final MenuListener menuSeparatorHandler = new MenuListener() {
    388388        @Override
    389389        public void menuCanceled(MenuEvent arg0) {}

  • trunk/src/org/openstreetmap/josm/gui/MapScaler.java

    r6792 r6889  
    4141    }
    4242
    43     static public Color getColor() {
     43    public static Color getColor() {
    4444        return Main.pref.getColor(marktr("scale"), Color.white);
    4545    }

  • trunk/src/org/openstreetmap/josm/gui/Notification.java

    r6357 r6889  
    3030public class Notification {
    3131
    32     public final static int DEFAULT_CONTENT_WIDTH = 350;
     32    public static final int DEFAULT_CONTENT_WIDTH = 350;
    3333
    3434    // some standard duration values (in milliseconds)
    … …  
    3838     * E.g. "Please select at least one node".
    3939     */
    40     public final static int TIME_SHORT = Main.pref.getInteger("notification-time-short-ms", 3000);
     40    public static final int TIME_SHORT = Main.pref.getInteger("notification-time-short-ms", 3000);
     41
    4142    /**
    4243     * Short message of one or two lines (5 s).
    4344     */
    44     public final static int TIME_DEFAULT = Main.pref.getInteger("notification-time-default-ms", 5000);
     45    public static final int TIME_DEFAULT = Main.pref.getInteger("notification-time-default-ms", 5000);
     46
    4547    /**
    4648     * Somewhat longer message (10 s).
    4749     */
    48     public final static int TIME_LONG = Main.pref.getInteger("notification-time-long-ms", 10000);
     50    public static final int TIME_LONG = Main.pref.getInteger("notification-time-long-ms", 10000);
     51
    4952    /**
    5053     * Long text.
    5154     * (Make sure is still sensible to show as a notification)
    5255     */
    53     public final static int TIME_VERY_LONG = Main.pref.getInteger("notification-time-very_long-ms", 20000);
     56    public static final int TIME_VERY_LONG = Main.pref.getInteger("notification-time-very_long-ms", 20000);
    5457
    5558    private Component content;

  • trunk/src/org/openstreetmap/josm/gui/SideButton.java

    r6367 r6889  
    2525 */
    2626public class SideButton extends JButton implements Destroyable {
    27     private final static int iconHeight = 20;
     27    private static final int iconHeight = 20;
    2828
    2929    private PropertyChangeListener propertyChangeListener;

  • trunk/src/org/openstreetmap/josm/gui/SplashScreen.java

    r6267 r6889  
    111111    }
    112112
    113     static private class SplashScreenProgressRenderer extends JPanel implements ProgressRenderer {
     113    private static class SplashScreenProgressRenderer extends JPanel implements ProgressRenderer {
    114114        private JLabel lblTaskTitle;
    115115        private JLabel lblCustomText;

  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

    r6802 r6889  
    8787
    8888    /** the unique instance of the dialog */
    89     static private CombinePrimitiveResolverDialog instance;
     89    private static CombinePrimitiveResolverDialog instance;
    9090
    9191    /**

  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java

    r6883 r6889  
    503503    }
    504504
    505     static private class StatisticsInfoTable extends JPanel {
     505    private static class StatisticsInfoTable extends JPanel {
    506506
    507507        private JTable infoTable;

  • trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

    r6822 r6889  
    7171     * @see #paintConflicts
    7272     */
    73     static public Color getColor() {
     73    public static Color getColor() {
    7474        return Main.pref.getColor(marktr("conflict"), Color.gray);
    7575    }

  • trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java

    r6340 r6889  
    2727    private List<JPanel> panels = new ArrayList<JPanel>();
    2828
    29     final private JSplitPane parent;
     29    private final JSplitPane parent;
    3030    public DialogsPanel(JSplitPane parent) {
    3131        this.parent = parent;

  • trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

    r6783 r6889  
    8080public class LayerListDialog extends ToggleDialog {
    8181    /** the unique instance of the dialog */
    82     static private LayerListDialog instance;
     82    private static LayerListDialog instance;
    8383
    8484    /**
    … …  
    8787     * @param mapFrame the map frame
    8888     */
    89     static public void createInstance(MapFrame mapFrame) {
     89    public static void createInstance(MapFrame mapFrame) {
    9090        if (instance != null)
    9191            throw new IllegalStateException("Dialog was already created");
    … …  
    100100     * @see #createInstance(MapFrame)
    101101     */
    102     static public LayerListDialog getInstance() throws IllegalStateException {
     102    public static LayerListDialog getInstance() throws IllegalStateException {
    103103        if (instance == null)
    104104            throw new IllegalStateException("Dialog not created yet. Invoke createInstance() first");

  • trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java

    r6708 r6889  
    3131public class LayerListPopup extends JPopupMenu {
    3232
    33     public final static class InfoAction extends AbstractAction {
     33    public static final class InfoAction extends AbstractAction {
    3434        private final Layer layer;
    3535       

  • trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

    r6822 r6889  
    3838import org.openstreetmap.josm.actions.relation.EditRelationAction;
    3939import org.openstreetmap.josm.actions.relation.SelectInRelationListAction;
    40 import org.openstreetmap.josm.actions.search.SearchAction;
    4140import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;
    4241import org.openstreetmap.josm.data.SelectionChangedListener;
    … …  
    408407     *
    409408     */
    410     static private class SelectionListModel extends AbstractListModel implements EditLayerChangeListener, SelectionChangedListener, DataSetListener{
     409    private static class SelectionListModel extends AbstractListModel implements EditLayerChangeListener, SelectionChangedListener, DataSetListener{
    411410
    412411        private static final int SELECTION_HISTORY_SIZE = 10;
    … …  
    656655     */
    657656    protected static class SearchMenuItem extends JMenuItem implements ActionListener {
    658         final protected SearchSetting s;
     657        protected final SearchSetting s;
    659658
    660659        public SearchMenuItem(SearchSetting s) {
    … …  
    675674     */
    676675    protected static class SearchPopupMenu extends JPopupMenu {
    677         static public void launch(Component parent) {
     676        public static void launch(Component parent) {
    678677            if (org.openstreetmap.josm.actions.search.SearchAction.getSearchHistory().isEmpty())
    679678                return;
    … …  
    696695     */
    697696    protected static class SelectionMenuItem extends JMenuItem implements ActionListener {
    698         final private DefaultNameFormatter df = DefaultNameFormatter.getInstance();
     697        private final DefaultNameFormatter df = DefaultNameFormatter.getInstance();
    699698        protected Collection<? extends OsmPrimitive> sel;
    700699
    … …  
    755754     */
    756755    protected static class SelectionHistoryPopup extends JPopupMenu {
    757         static public void launch(Component parent, Collection<Collection<? extends OsmPrimitive>> history) {
     756        public static void launch(Component parent, Collection<Collection<? extends OsmPrimitive>> history) {
    758757            if (history == null || history.isEmpty()) return;
    759758            JPopupMenu menu = new SelectionHistoryPopup(history);
    … …  
    770769
    771770    /** Quicker comparator, comparing just by type and ID's */
    772     static private class OsmPrimitiveQuickComparator implements Comparator<OsmPrimitive> {
     771    private static class OsmPrimitiveQuickComparator implements Comparator<OsmPrimitive> {
    773772
    774773        private int compareId(OsmPrimitive a, OsmPrimitive b) {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

    r6829 r6889  
    115115    protected final ToggleDialogAction toggleAction;
    116116    protected String preferencePrefix;
    117     final protected String name;
     117    protected final String name;
    118118
    119119    /** DialogsPanel that manages all ToggleDialogs */

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java

    r6883 r6889  
    280280     * open or closed changesets
    281281     */
    282     static private class OpenAndCloseStateRestrictionPanel extends JPanel {
     282    private static class OpenAndCloseStateRestrictionPanel extends JPanel {
    283283
    284284        private JRadioButton rbOpenOnly;
    … …  
    928928    }
    929929
    930     static private class BBoxRestrictionPanel extends BoundingBoxSelectionPanel {
     930    private static class BBoxRestrictionPanel extends BoundingBoxSelectionPanel {
    931931        public BBoxRestrictionPanel() {
    932932            setBorder(BorderFactory.createCompoundBorder(

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java

    r6101 r6889  
    1818 */
    1919public abstract class MemberTableCellRenderer extends JLabel implements TableCellRenderer {
    20     public final static Color BGCOLOR_EMPTY_ROW = new Color(234, 234, 234);
    21     public final static Color BGCOLOR_IN_JOSM_SELECTION = new Color(235,255,177);
     20    public static final Color BGCOLOR_EMPTY_ROW = new Color(234, 234, 234);
     21    public static final Color BGCOLOR_IN_JOSM_SELECTION = new Color(235,255,177);
    2222
    23     public final static Color BGCOLOR_NOT_IN_OPPOSITE = new Color(255, 197, 197);
    24     public final static Color BGCOLOR_DOUBLE_ENTRY = new Color(254,226,214);
     23    public static final Color BGCOLOR_NOT_IN_OPPOSITE = new Color(255, 197, 197);
     24    public static final Color BGCOLOR_DOUBLE_ENTRY = new Color(254,226,214);
    2525
    2626    /**
    … …  
    6666
    6767    @Override
    68     abstract public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected,
     68    public abstract Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected,
    6969            boolean hasFocus, int row, int column);
    7070

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java

    r6296 r6889  
    1717public class MemberTableLinkedCellRenderer extends MemberTableCellRenderer {
    1818
    19     final static Image arrowUp = ImageProvider.get("dialogs/relation", "arrowup").getImage();
    20     final static Image arrowDown = ImageProvider.get("dialogs/relation", "arrowdown").getImage();
    21     final static Image corners = ImageProvider.get("dialogs/relation", "roundedcorners").getImage();
    22     final static Image roundabout_right = ImageProvider.get("dialogs/relation", "roundabout_right_tiny").getImage();
    23     final static Image roundabout_left = ImageProvider.get("dialogs/relation", "roundabout_left_tiny").getImage();
     19    static final Image arrowUp = ImageProvider.get("dialogs/relation", "arrowup").getImage();
     20    static final Image arrowDown = ImageProvider.get("dialogs/relation", "arrowdown").getImage();
     21    static final Image corners = ImageProvider.get("dialogs/relation", "roundedcorners").getImage();
     22    static final Image roundabout_right = ImageProvider.get("dialogs/relation", "roundabout_right_tiny").getImage();
     23    static final Image roundabout_left = ImageProvider.get("dialogs/relation", "roundabout_left_tiny").getImage();
    2424    private WayConnectionType value = new WayConnectionType();
    2525

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java

    r6316 r6889  
    2929     * @return the singleton {@link RelationDialogManager}
    3030     */
    31     static public RelationDialogManager getRelationDialogManager() {
     31    public static RelationDialogManager getRelationDialogManager() {
    3232        if (RelationDialogManager.relationDialogManager == null) {
    3333            RelationDialogManager.relationDialogManager = new RelationDialogManager();
    … …  
    4242     *
    4343     */
    44     static private class DialogContext {
     44    private static class DialogContext {
    4545        public final Relation relation;
    4646        public final OsmDataLayer layer;

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java

    r6792 r6889  
    2424     * @see #getRelation()
    2525     */
    26     static public final String RELATION_PROP = RelationEditor.class.getName() + ".relation";
     26    public static final String RELATION_PROP = RelationEditor.class.getName() + ".relation";
    2727
    2828    /** the property name for the current relation snapshot
    2929     * @see #getRelationSnapshot()
    3030     */
    31     static public final String RELATION_SNAPSHOT_PROP = RelationEditor.class.getName() + ".relationSnapshot";
     31    public static final String RELATION_SNAPSHOT_PROP = RelationEditor.class.getName() + ".relationSnapshot";
    3232
    3333    /** the list of registered relation editor classes */
    … …  
    207207    /* property change support                                                 */
    208208    /* ----------------------------------------------------------------------- */
    209     final private PropertyChangeSupport support = new PropertyChangeSupport(this);
     209    private final PropertyChangeSupport support = new PropertyChangeSupport(this);
    210210
    211211    @Override

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRenderer.java

    r6084 r6889  
    2020 */
    2121public class RelationTreeCellRenderer extends JLabel implements TreeCellRenderer {
    22     public final static Color BGCOLOR_SELECTED = new Color(143,170,255);
     22    public static final Color BGCOLOR_SELECTED = new Color(143,170,255);
    2323
    2424    /** the relation icon */

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java

    r6476 r6889  
    1919 */
    2020public class SelectionTableCellRenderer extends JLabel implements TableCellRenderer {
    21     public final static Color BGCOLOR_DOUBLE_ENTRY = new Color(254,226,214);
    22     public final static Color BGCOLOR_SINGLE_ENTRY = new Color(235,255,177);
     21    public static final Color BGCOLOR_DOUBLE_ENTRY = new Color(254,226,214);
     22    public static final Color BGCOLOR_SINGLE_ENTRY = new Color(235,255,177);
    2323
    2424    /**

  • trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java

    r6340 r6889  
    4848 */
    4949public class ChangesetManagementPanel extends JPanel implements ListDataListener{
    50     public final static String SELECTED_CHANGESET_PROP = ChangesetManagementPanel.class.getName() + ".selectedChangeset";
    51     public final static String CLOSE_CHANGESET_AFTER_UPLOAD = ChangesetManagementPanel.class.getName() + ".closeChangesetAfterUpload";
     50    public static final String SELECTED_CHANGESET_PROP = ChangesetManagementPanel.class.getName() + ".selectedChangeset";
     51    public static final String CLOSE_CHANGESET_AFTER_UPLOAD = ChangesetManagementPanel.class.getName() + ".closeChangesetAfterUpload";
    5252
    5353    private JRadioButton rbUseNew;

  • trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java

    r6885 r6889  
    4343public class CredentialDialog extends JDialog {
    4444
    45     static public CredentialDialog getOsmApiCredentialDialog(String username, String password, String host, String saveUsernameAndPasswordCheckboxText) {
     45    public static CredentialDialog getOsmApiCredentialDialog(String username, String password, String host, String saveUsernameAndPasswordCheckboxText) {
    4646        CredentialDialog dialog = new CredentialDialog(saveUsernameAndPasswordCheckboxText);
    4747        if (Utils.equal(OsmApi.getOsmApi().getHost(), host)) {
    … …  
    5454    }
    5555
    56     static public CredentialDialog getHttpProxyCredentialDialog(String username, String password, String host, String saveUsernameAndPasswordCheckboxText) {
     56    public static CredentialDialog getHttpProxyCredentialDialog(String username, String password, String host, String saveUsernameAndPasswordCheckboxText) {
    5757        CredentialDialog dialog = new CredentialDialog(saveUsernameAndPasswordCheckboxText);
    5858        dialog.prepareForProxyCredentials(username, password);
    … …  
    320320    }
    321321
    322     static private class SelectAllOnFocusHandler extends FocusAdapter {
     322    private static class SelectAllOnFocusHandler extends FocusAdapter {
    323323        @Override
    324324        public void focusGained(FocusEvent e) {
    … …  
    337337     *   If both text fields contain characters, submits the form by calling owner's {@link OKAction}.
    338338     */
    339     static private class TFKeyListener implements KeyListener{
     339    private static class TFKeyListener implements KeyListener{
    340340        protected CredentialDialog owner; // owner Dependency Injection to call OKAction
    341341        protected JTextField currentTF;

  • trunk/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java

    r6087 r6889  
    3232
    3333class LayerNameAndFilePathTableCell extends JPanel implements TableCellRenderer, TableCellEditor {
    34     private final static Color colorError = new Color(255,197,197);
    35     private final static String separator = System.getProperty("file.separator");
    36     private final static String ellipsis = "…" + separator;
     34    private static final Color colorError = new Color(255,197,197);
     35    private static final String separator = System.getProperty("file.separator");
     36    private static final String ellipsis = "…" + separator;
    3737
    3838    private final JLabel lblLayerName = new JLabel();
    … …  
    4141    private final JButton btnFileChooser = new JButton(new LaunchFileChooserAction());
    4242
    43     private final static GBC defaultCellStyle = GBC.eol().fill(GBC.HORIZONTAL).insets(2, 0, 2, 0);
     43    private static final GBC defaultCellStyle = GBC.eol().fill(GBC.HORIZONTAL).insets(2, 0, 2, 0);
    4444
    4545    private CopyOnWriteArrayList<CellEditorListener> listeners;
    4646    private File value;
    47 
    4847
    4948    /** constructor that sets the default on each element **/
    … …  
    6160        tfFilename.addFocusListener(
    6261                new FocusAdapter() {
    63                     @Override public void focusGained(FocusEvent e) {
     62                    @Override
     63                    public void focusGained(FocusEvent e) {
    6464                        tfFilename.selectAll();
    6565                    }

  • trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java

    r6643 r6889  
    5252
    5353public class SaveLayersDialog extends JDialog implements TableModelListener {
    54     static public enum UserAction {
     54    public static enum UserAction {
    5555        /**
    5656         * save/upload layers was successful, proceed with operation
    … …  
    5858        PROCEED,
    5959        /**
    60          * save/upload of layers was not successful or user canceled
    61          * operation
     60         * save/upload of layers was not successful or user canceled operation
    6261         */
    6362        CANCEL

  • trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java

    r6084 r6889  
    1515
    1616public class SaveLayersModel extends DefaultTableModel {
    17     static final public String MODE_PROP = SaveLayerInfo.class.getName() + ".mode";
     17    public static final String MODE_PROP = SaveLayerInfo.class.getName() + ".mode";
    1818    public enum Mode {
    1919        EDITING_DATA,
    … …  
    2929    private static final int columnActions = 2;
    3030
     31    /**
     32     * Constructs a new {@code SaveLayersModel}.
     33     */
    3134    public SaveLayersModel() {
    3235        mode = Mode.EDITING_DATA;

  • trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java

    r6084 r6889  
    2323        private final JLabel needsUpload = new JLabel(tr("should be uploaded"));
    2424        private final JLabel needsSave = new JLabel(tr("should be saved"));
    25         private final static GBC defaultCellStyle = GBC.eol().fill(GBC.HORIZONTAL).insets(2, 0, 2, 0);
     25        private static final GBC defaultCellStyle = GBC.eol().fill(GBC.HORIZONTAL).insets(2, 0, 2, 0);
    2626
    2727        public RecommendedActionsTableCell() {

  • trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

    r6654 r6889  
    6363public class UploadDialog extends JDialog implements PropertyChangeListener, PreferenceChangedListener{
    6464    /**  the unique instance of the upload dialog */
    65     static private UploadDialog uploadDialog;
     65    private static UploadDialog uploadDialog;
    6666
    6767    /**
    6868     * List of custom components that can be added by plugins at JOSM startup.
    6969     */
    70     static private final Collection<Component> customComponents = new ArrayList<Component>();
     70    private static final Collection<Component> customComponents = new ArrayList<Component>();
    7171
    7272    /**
    … …  
    7575     * @return the unique instance of the upload dialog
    7676     */
    77     static public UploadDialog getUploadDialog() {
     77    public static UploadDialog getUploadDialog() {
    7878        if (uploadDialog == null) {
    7979            uploadDialog = new UploadDialog();

  • trunk/src/org/openstreetmap/josm/gui/io/UploadStrategy.java

    r6248 r6889  
    5050     * the default upload strategy
    5151     */
    52     public final static UploadStrategy DEFAULT_UPLOAD_STRATEGY = SINGLE_REQUEST_STRATEGY;
     52    public static final UploadStrategy DEFAULT_UPLOAD_STRATEGY = SINGLE_REQUEST_STRATEGY;
    5353
    5454    /**

  • trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java

    r6340 r6889  
    4646     * The property for the upload strategy
    4747     */
    48     public final static String UPLOAD_STRATEGY_SPECIFICATION_PROP =
     48    public static final String UPLOAD_STRATEGY_SPECIFICATION_PROP =
    4949        UploadStrategySelectionPanel.class.getName() + ".uploadStrategySpecification";
    5050

  • trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java

    r5832 r6889  
    1515public class UploadStrategySpecification  {
    1616    /** indicates that the chunk size isn't specified */
    17     static public final int UNSPECIFIED_CHUNK_SIZE = -1;
     17    public static final int UNSPECIFIED_CHUNK_SIZE = -1;
    1818
    1919    private UploadStrategy strategy;

  • trunk/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java

    r6084 r6889  
    2525 */
    2626public class UploadedObjectsSummaryPanel extends JPanel {
    27     static public final String NUM_OBJECTS_TO_UPLOAD_PROP = UploadedObjectsSummaryPanel.class.getName() + ".numObjectsToUpload";
     27    public static final String NUM_OBJECTS_TO_UPLOAD_PROP = UploadedObjectsSummaryPanel.class.getName() + ".numObjectsToUpload";
    2828
    2929    /** the list with the added primitives */

  • trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

    r6830 r6889  
    255255
    256256    /* for preferences */
    257     static public Color getGenericColor() {
     257    public static Color getGenericColor() {
    258258        return Main.pref.getColor(marktr("gps point"), Color.gray);
    259259    }
    … …  
    363363    }
    364364
    365     private final static Color[] colors = new Color[256];
     365    private static final Color[] colors = new Color[256];
    366366    static {
    367367        for (int i = 0; i < colors.length; i++) {
    … …  
    370370    }
    371371
    372     private final static Color[] colors_cyclic = new Color[256];
     372    private static final Color[] colors_cyclic = new Color[256];
    373373    static {
    374374        for (int i = 0; i < colors_cyclic.length; i++) {
    … …  
    405405
    406406    // lookup array to draw arrows without doing any math
    407     private final static int ll0 = 9;
    408     private final static int sl4 = 5;
    409     private final static int sl9 = 3;
    410     private final static int[][] dir = { { +sl4, +ll0, +ll0, +sl4 }, { -sl9, +ll0, +sl9, +ll0 }, { -ll0, +sl4, -sl4, +ll0 },
     407    private static final int ll0 = 9;
     408    private static final int sl4 = 5;
     409    private static final int sl9 = 3;
     410    private static final int[][] dir = { { +sl4, +ll0, +ll0, +sl4 }, { -sl9, +ll0, +sl9, +ll0 }, { -ll0, +sl4, -sl4, +ll0 },
    411411        { -ll0, -sl9, -ll0, +sl9 }, { -sl4, -ll0, -ll0, -sl4 }, { +sl9, -ll0, -sl9, -ll0 },
    412412        { +ll0, -sl4, +sl4, -ll0 }, { +ll0, +sl9, +ll0, -sl9 }, { +sl4, +ll0, +ll0, +sl4 },
    … …  
    814814     * additional entries are initialized to true;
    815815     */
    816     final private void ensureTrackVisibilityLength() {
     816    private final void ensureTrackVisibilityLength() {
    817817        final int l = data.tracks.size();
    818818        if (l == trackVisibility.length)

  • trunk/src/org/openstreetmap/josm/gui/layer/Layer.java

    r6830 r6889  
    4848 * @author imi
    4949 */
    50 abstract public class Layer implements Destroyable, MapViewPaintable, ProjectionChangeListener {
     50public abstract class Layer implements Destroyable, MapViewPaintable, ProjectionChangeListener {
    5151
    5252    public interface LayerAction {
    … …  
    5959    }
    6060
    61 
    6261    /**
    6362     * Special class that can be returned by getMenuEntries when JSeparator needs to be created
    … …  
    8079    }
    8180
    82     static public final String VISIBLE_PROP = Layer.class.getName() + ".visible";
    83     static public final String OPACITY_PROP = Layer.class.getName() + ".opacity";
    84     static public final String NAME_PROP = Layer.class.getName() + ".name";
    85 
    86     static public final int ICON_SIZE = 16;
     81    public static final String VISIBLE_PROP = Layer.class.getName() + ".visible";
     82    public static final String OPACITY_PROP = Layer.class.getName() + ".opacity";
     83    public static final String NAME_PROP = Layer.class.getName() + ".name";
     84
     85    public static final int ICON_SIZE = 16;
    8786
    8887    /** keeps track of property change listeners */
    … …  
    142141     */
    143142    @Override
    144     abstract public void paint(Graphics2D g, MapView mv, Bounds box);
     143    public abstract void paint(Graphics2D g, MapView mv, Bounds box);
     144
    145145    /**
    146146     * Return a representative small image for this layer. The image must not
    147147     * be larger than 64 pixel in any dimension.
    148148     */
    149     abstract public Icon getIcon();
     149    public abstract Icon getIcon();
    150150
    151151    /**
    … …  
    162162     * @return A small tooltip hint about some statistics for this layer.
    163163     */
    164     abstract public String getToolTipText();
     164    public abstract String getToolTipText();
    165165
    166166    /**
    … …  
    171171     *      mergeFrom should be one of the last things to do with a layer.
    172172     */
    173     abstract public void mergeFrom(Layer from);
     173    public abstract void mergeFrom(Layer from);
    174174
    175175    /**
    … …  
    177177     * @return Whether the other layer can be merged into this layer.
    178178     */
    179     abstract public boolean isMergable(Layer other);
    180 
    181     abstract public void visitBoundingBox(BoundingXYVisitor v);
    182 
    183     abstract public Object getInfoComponent();
     179    public abstract boolean isMergable(Layer other);
     180
     181    public abstract void visitBoundingBox(BoundingXYVisitor v);
     182
     183    public abstract Object getInfoComponent();
    184184
    185185    /**
    … …  
    200200     *
    201201     */
    202     abstract public Action[] getMenuEntries();
     202    public abstract Action[] getMenuEntries();
    203203
    204204    /**

  • trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

    r6501 r6889  
    9191 */
    9292public class OsmDataLayer extends Layer implements Listener, SelectionChangedListener {
    93     static public final String REQUIRES_SAVE_TO_DISK_PROP = OsmDataLayer.class.getName() + ".requiresSaveToDisk";
    94     static public final String REQUIRES_UPLOAD_TO_SERVER_PROP = OsmDataLayer.class.getName() + ".requiresUploadToServer";
     93    public static final String REQUIRES_SAVE_TO_DISK_PROP = OsmDataLayer.class.getName() + ".requiresSaveToDisk";
     94    public static final String REQUIRES_UPLOAD_TO_SERVER_PROP = OsmDataLayer.class.getName() + ".requiresUploadToServer";
    9595
    9696    private boolean requiresSaveToFile = false;
    … …  
    122122
    123123    /** the global counter for created data layers */
    124     static private int dataLayerCounter = 0;
     124    private static int dataLayerCounter = 0;
    125125
    126126    /**
    … …  
    129129     * @return a new unique name for a data layer
    130130     */
    131     static public String createNewName() {
     131    public static String createNewName() {
    132132        dataLayerCounter++;
    133133        return tr("Data Layer {0}", dataLayerCounter);
    134134    }
    135135
    136     public final static class DataCountVisitor extends AbstractVisitor {
     136    public static final class DataCountVisitor extends AbstractVisitor {
    137137        public int nodes;
    138138        public int ways;

  • trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java

    r6830 r6889  
    471471     * in preferences.
    472472     */
    473     static public void setMaxWorkers() {
     473    public static void setMaxWorkers() {
    474474        JobDispatcher.setMaxWorkers(PROP_TMS_JOBS.get());
    475475        JobDispatcher.getInstance().setLIFO(true);

  • trunk/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java

    r6105 r6889  
    174174     * session. There should be preference listener updating this cache.
    175175     */
    176     static private Color DEFAULT_TEXT_COLOR = null;
    177     static private void initDefaultParameters() {
     176    private static Color DEFAULT_TEXT_COLOR = null;
     177    private static void initDefaultParameters() {
    178178        if (DEFAULT_TEXT_COLOR != null) return;
    179179        DEFAULT_TEXT_COLOR = PaintColors.TEXT.get();

  • trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java

    r6740 r6889  
    2525    protected Map<String, Object> prop = new HashMap<String, Object>();
    2626
    27     private final static Pattern HEX_COLOR_PATTERN = Pattern.compile("#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})");
     27    private static final Pattern HEX_COLOR_PATTERN = Pattern.compile("#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})");
    2828
    2929    public <T> T get(String key, T def, Class<T> klass) {

  • trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java

    r6663 r6889  
    1414import org.openstreetmap.josm.gui.mappaint.mapcss.Instruction.RelativeFloat;
    1515
    16 abstract public class ElemStyle implements StyleKeys {
     16public abstract class ElemStyle implements StyleKeys {
    1717
    1818    protected static final String[] ICON_KEYS = {"icon-image", "icon-width", "icon-height", "icon-opacity"};
    … …  
    9191     * a JOSM session. Should have a listener listening to preference changes.
    9292     */
    93     static private String DEFAULT_FONT_NAME = null;
    94     static private Float DEFAULT_FONT_SIZE = null;
    95     static private void initDefaultFontParameters() {
     93    private static String DEFAULT_FONT_NAME = null;
     94    private static Float DEFAULT_FONT_SIZE = null;
     95    private static void initDefaultFontParameters() {
    9696        if (DEFAULT_FONT_NAME != null) return; // already initialized - skip initialization
    9797        DEFAULT_FONT_NAME = Main.pref.get("mappaint.font", "Helvetica");
    … …  
    9999    }
    100100
    101     static private class FontDescriptor {
     101    private static class FontDescriptor {
    102102        public String name;
    103103        public int style;
    … …  
    141141    }
    142142
    143     static private final Map<FontDescriptor, Font> FONT_MAP = new HashMap<FontDescriptor, Font>();
    144     static private Font getCachedFont(FontDescriptor fd) {
     143    private static final Map<FontDescriptor, Font> FONT_MAP = new HashMap<FontDescriptor, Font>();
     144    private static Font getCachedFont(FontDescriptor fd) {
    145145        Font f = FONT_MAP.get(fd);
    146146        if (f != null) return f;
    … …  
    150150    }
    151151
    152     static private Font getCachedFont(String name, int style, int size){
     152    private static Font getCachedFont(String name, int style, int size){
    153153        return getCachedFont(new FontDescriptor(name, style, size));
    154154    }

  • trunk/src/org/openstreetmap/josm/gui/mappaint/Keyword.java

    r3967 r6889  
    2828    }
    2929
    30     public final static Keyword AUTO = new Keyword("auto");
    31     public final static Keyword BOTTOM = new Keyword("bottom");
    32     public final static Keyword CENTER = new Keyword("center");
    33     public final static Keyword DEFAULT = new Keyword("default");
    34     public final static Keyword RIGHT = new Keyword("right");
    35     public final static Keyword THINNEST = new Keyword("thinnest");
     30    public static final Keyword AUTO = new Keyword("auto");
     31    public static final Keyword BOTTOM = new Keyword("bottom");
     32    public static final Keyword CENTER = new Keyword("center");
     33    public static final Keyword DEFAULT = new Keyword("default");
     34    public static final Keyword RIGHT = new Keyword("right");
     35    public static final Keyword THINNEST = new Keyword("thinnest");
    3636}

  • trunk/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java

    r6830 r6889  
    4343     * if no suitable value could be composed
    4444     */
    45     abstract public String compose(OsmPrimitive primitive);
    46 
    47     static public class StaticLabelCompositionStrategy extends LabelCompositionStrategy {
     45    public abstract String compose(OsmPrimitive primitive);
     46
     47    public static class StaticLabelCompositionStrategy extends LabelCompositionStrategy {
    4848        private String defaultLabel;
    4949
    … …  
    9292    }
    9393
    94     static public class TagLookupCompositionStrategy extends LabelCompositionStrategy {
     94    public static class TagLookupCompositionStrategy extends LabelCompositionStrategy {
    9595
    9696        private String defaultLabelTag;
    … …  
    147147    }
    148148
    149     static public class DeriveLabelFromNameTagsCompositionStrategy extends LabelCompositionStrategy {
     149    public static class DeriveLabelFromNameTagsCompositionStrategy extends LabelCompositionStrategy {
    150150
    151151        /**

  • trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java

    r6830 r6889  
    2525    private final List<StyleList> data;
    2626
    27     private final static Storage<StyleCache> internPool = new Storage<StyleCache>(); // TODO: clean up the intern pool from time to time (after purge or layer removal)
    28 
    29     public final static StyleCache EMPTY_STYLECACHE = (new StyleCache()).intern();
     27    private static final Storage<StyleCache> internPool = new Storage<StyleCache>(); // TODO: clean up the intern pool from time to time (after purge or layer removal)
     28
     29    public static final StyleCache EMPTY_STYLECACHE = (new StyleCache()).intern();
    3030
    3131    private StyleCache() {

  • trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java

    r6289 r6889  
    2121import org.openstreetmap.josm.tools.Utils;
    2222
    23 abstract public class StyleSource extends SourceEntry {
     23public abstract class StyleSource extends SourceEntry {
    2424
    2525    private List<Throwable> errors = new ArrayList<Throwable>();
    … …  
    4444    }
    4545
    46     abstract public void apply(MultiCascade mc, OsmPrimitive osm, double scale, OsmPrimitive multipolyOuterWay, boolean pretendWayIsClosed);
     46    public abstract void apply(MultiCascade mc, OsmPrimitive osm, double scale, OsmPrimitive multipolyOuterWay, boolean pretendWayIsClosed);
    4747
    48     abstract public void loadStyleSource();
     48    public abstract void loadStyleSource();
    4949
    5050    /**
    … …  
    5454     * @see #closeSourceInputStream(InputStream)
    5555     */
    56     abstract public InputStream getSourceInputStream() throws IOException;
     56    public abstract InputStream getSourceInputStream() throws IOException;
    5757
    5858    /**
    … …  
    101101    }
    102102
    103     final public ImageIcon getIcon() {
     103    public final ImageIcon getIcon() {
    104104        if (getErrors().isEmpty())
    105105            return getSourceIcon();

  • trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java

    r6070 r6889  
    2020 */
    2121public class TextElement implements StyleKeys {
    22     static public final LabelCompositionStrategy AUTO_LABEL_COMPOSITION_STRATEGY = new DeriveLabelFromNameTagsCompositionStrategy();
     22    public static final LabelCompositionStrategy AUTO_LABEL_COMPOSITION_STRATEGY = new DeriveLabelFromNameTagsCompositionStrategy();
    2323
    2424    /** the strategy for building the actual label value for a given a {@link OsmPrimitive}.

  • trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java

    r6883 r6889  
    175175    }
    176176
    177     static private class AccessTokenKeyValidator extends AbstractTextComponentValidator {
     177    private static class AccessTokenKeyValidator extends AbstractTextComponentValidator {
    178178
    179179        public AccessTokenKeyValidator(JTextComponent tc) throws IllegalArgumentException {

  • trunk/src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java

    r6733 r6889  
    66import org.openstreetmap.josm.data.projection.Projections;
    77
    8 abstract public class AbstractProjectionChoice implements ProjectionChoice {
     8public abstract class AbstractProjectionChoice implements ProjectionChoice {
    99
    1010    protected String name;
    … …  
    5353    }
    5454
    55     abstract public String getCurrentCode();
     55    public abstract String getCurrentCode();
    5656
    57     abstract public String getProjectionName();
     57    public abstract String getProjectionName();
    5858
    5959    @Override

  • trunk/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java

    r6295 r6889  
    1717 * A projection choice, that offers a list of projections in a combo-box.
    1818 */
    19 abstract public class ListProjectionChoice extends AbstractProjectionChoice {
     19public abstract class ListProjectionChoice extends AbstractProjectionChoice {
    2020
    2121    protected int index;        // 0-based index
    … …  
    5454     * Convert 0-based index to preference value.
    5555     */
    56     abstract protected String indexToZone(int index);
     56    protected abstract String indexToZone(int index);
    5757
    5858    /**
    5959     * Convert preference value to 0-based index.
    6060     */
    61     abstract protected int zoneToIndex(String zone);
     61    protected abstract int zoneToIndex(String zone);
    6262
    6363    @Override

  • trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java

    r6529 r6889  
    253253     * Combobox with all projections available
    254254     */
    255     private JosmComboBox projectionCombo = new JosmComboBox(projectionChoices.toArray());
     255    private final JosmComboBox projectionCombo = new JosmComboBox(projectionChoices.toArray());
    256256
    257257    /**
    258258     * Combobox with all coordinate display possibilities
    259259     */
    260     private JosmComboBox coordinatesCombo = new JosmComboBox(CoordinateFormat.values());
    261 
    262     private JosmComboBox unitsCombo = new JosmComboBox(unitsValuesTr);
     260    private final JosmComboBox coordinatesCombo = new JosmComboBox(CoordinateFormat.values());
     261
     262    private final JosmComboBox unitsCombo = new JosmComboBox(unitsValuesTr);
    263263
    264264    /**
    … …  
    281281     * This is the panel holding all projection preferences
    282282     */
    283     private JPanel projPanel = new JPanel(new GridBagLayout());
     283    private final JPanel projPanel = new JPanel(new GridBagLayout());
    284284
    285285    /**
    … …  
    288288     * in sync
    289289     */
    290     static private GBC projSubPrefPanelGBC = GBC.std().fill(GBC.BOTH).weight(1.0, 1.0);
     290    private static final GBC projSubPrefPanelGBC = GBC.std().fill(GBC.BOTH).weight(1.0, 1.0);
    291291
    292292    @Override
    … …  
    380380    }
    381381
    382     static public void setProjection() {
     382    public static void setProjection() {
    383383        setProjection(PROP_PROJECTION.get(), PROP_SUB_PROJECTION.get());
    384384    }
    385385
    386     static public void setProjection(String id, Collection<String> pref) {
     386    public static void setProjection(String id, Collection<String> pref) {
    387387        ProjectionChoice pc = projectionChoicesById.get(id);
    388388

  • trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java

    r6792 r6889  
    1111public class UTMFranceDOMProjectionChoice extends ListProjectionChoice {
    1212
    13     private final static String FortMarigotName = tr("Guadeloupe Fort-Marigot 1949");
    14     private final static String SainteAnneName = tr("Guadeloupe Ste-Anne 1948");
    15     private final static String MartiniqueName = tr("Martinique Fort Desaix 1952");
    16     private final static String Reunion92Name = tr("Reunion RGR92");
    17     private final static String Guyane92Name = tr("Guyane RGFG95");
    18     private final static String[] utmGeodesicsNames = { FortMarigotName, SainteAnneName, MartiniqueName, Reunion92Name, Guyane92Name};
     13    private static final String FortMarigotName = tr("Guadeloupe Fort-Marigot 1949");
     14    private static final String SainteAnneName = tr("Guadeloupe Ste-Anne 1948");
     15    private static final String MartiniqueName = tr("Martinique Fort Desaix 1952");
     16    private static final String Reunion92Name = tr("Reunion RGR92");
     17    private static final String Guyane92Name = tr("Guyane RGFG95");
     18    private static final String[] utmGeodesicsNames = { FortMarigotName, SainteAnneName, MartiniqueName, Reunion92Name, Guyane92Name};
    1919
    20     private final static Integer FortMarigotEPSG = 2969;
    21     private final static Integer SainteAnneEPSG = 2970;
    22     private final static Integer MartiniqueEPSG = 2973;
    23     private final static Integer ReunionEPSG = 2975;
    24     private final static Integer GuyaneEPSG = 2972;
    25     private final static Integer[] utmEPSGs = { FortMarigotEPSG, SainteAnneEPSG, MartiniqueEPSG, ReunionEPSG, GuyaneEPSG };
     20    private static final Integer FortMarigotEPSG = 2969;
     21    private static final Integer SainteAnneEPSG = 2970;
     22    private static final Integer MartiniqueEPSG = 2973;
     23    private static final Integer ReunionEPSG = 2975;
     24    private static final Integer GuyaneEPSG = 2972;
     25    private static final Integer[] utmEPSGs = { FortMarigotEPSG, SainteAnneEPSG, MartiniqueEPSG, ReunionEPSG, GuyaneEPSG };
    2626
    2727    /**

  • trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java

    r6792 r6889  
    3333    private Hemisphere hemisphere;
    3434
    35     private final static List<String> cbEntries = new ArrayList<String>();
     35    private static final List<String> cbEntries = new ArrayList<String>();
    3636    static {
    3737        for (int i = 1; i <= 60; i++) {

  • trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java

    r6643 r6889  
    2525     * Common intervals
    2626     */
    27     final static public int INTERVAL_ALWAYS = -1;
    28     final static public int INTERVAL_HOURLY = 60*60;
    29     final static public int INTERVAL_DAILY = INTERVAL_HOURLY * 24;
    30     final static public int INTERVAL_WEEKLY = INTERVAL_DAILY * 7;
    31     final static public int INTERVAL_MONTHLY = INTERVAL_WEEKLY * 4;
    32     final static public int INTERVAL_NEVER = Integer.MAX_VALUE;
     27    public static final int INTERVAL_ALWAYS = -1;
     28    public static final int INTERVAL_HOURLY = 60*60;
     29    public static final int INTERVAL_DAILY = INTERVAL_HOURLY * 24;
     30    public static final int INTERVAL_WEEKLY = INTERVAL_DAILY * 7;
     31    public static final int INTERVAL_MONTHLY = INTERVAL_WEEKLY * 4;
     32    public static final int INTERVAL_NEVER = Integer.MAX_VALUE;
    3333
    3434    /**
    … …  
    4040     * The ident that identifies the stored file. Includes file-ending.
    4141     */
    42     final private String ident;
     42    private final String ident;
    4343
    4444    /**
    4545     * The (file-)path where the data will be stored
    4646     */
    47     final private File path;
     47    private final File path;
    4848
    4949    /**
    5050     * How often to update the cached version
    5151     */
    52     final private int updateInterval;
     52    private final int updateInterval;
    5353
    5454    /**

  • trunk/src/org/openstreetmap/josm/io/CacheFiles.java

    r6248 r6889  
    2929     * Common expirey dates
    3030     */
    31     final static public int EXPIRE_NEVER = -1;
    32     final static public int EXPIRE_DAILY = 60 * 60 * 24;
    33     final static public int EXPIRE_WEEKLY = EXPIRE_DAILY * 7;
    34     final static public int EXPIRE_MONTHLY = EXPIRE_WEEKLY * 4;
    35 
    36     final private File dir;
    37     final private String ident;
    38     final private boolean enabled;
     31    public static final int EXPIRE_NEVER = -1;
     32    public static final int EXPIRE_DAILY = 60 * 60 * 24;
     33    public static final int EXPIRE_WEEKLY = EXPIRE_DAILY * 7;
     34    public static final int EXPIRE_MONTHLY = EXPIRE_WEEKLY * 4;
     35
     36    private final File dir;
     37    private final String ident;
     38    private final boolean enabled;
    3939
    4040    private long expire;  // in seconds
    … …  
    273273    }
    274274
    275     final static public int CLEAN_ALL = 0;
    276     final static public int CLEAN_SMALL_FILES = 1;
    277     final static public int CLEAN_BY_DATE = 2;
     275    public static final int CLEAN_ALL = 0;
     276    public static final int CLEAN_SMALL_FILES = 1;
     277    public static final int CLEAN_BY_DATE = 2;
     278
    278279    /**
    279280     * Performs a non-default, specified clean up

  • trunk/src/org/openstreetmap/josm/io/ChangesetClosedException.java

    r6643 r6889  
    3131     * that a changeset was closed
    3232     */
    33     final static public String ERROR_HEADER_PATTERN = "The changeset (\\d+) was closed at (.*)";
     33    public static final String ERROR_HEADER_PATTERN = "The changeset (\\d+) was closed at (.*)";
    3434
    3535    public static enum Source {
    … …  
    5757     * @return true if <code>errorHeader</code> matches with {@link #ERROR_HEADER_PATTERN}
    5858     */
    59     static public boolean errorHeaderMatchesPattern(String errorHeader) {
     59    public static boolean errorHeaderMatchesPattern(String errorHeader) {
    6060        if (errorHeader == null)
    6161            return false;

  • trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java

    r6830 r6889  
    3636     *
    3737     */
    38     static public ChangesetQuery buildFromUrlQuery(String query) throws ChangesetQueryUrlException{
     38    public static ChangesetQuery buildFromUrlQuery(String query) throws ChangesetQueryUrlException{
    3939        return new ChangesetQueryUrlParser().parse(query);
    4040    }

  • trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java

    r6380 r6889  
    3232public class DiffResultProcessor  {
    3333
    34     static private class DiffResultEntry {
     34    private static class DiffResultEntry {
    3535        public long new_id;
    3636        public int new_version;

  • trunk/src/org/openstreetmap/josm/io/GpxExporter.java

    r6815 r6889  
    3939
    4040public class GpxExporter extends FileExporter implements GpxConstants {
    41     private final static String warningGpl = "<html><font color='red' size='-2'>"
     41    private static final String warningGpl = "<html><font color='red' size='-2'>"
    4242        + tr("Note: GPL is not compatible with the OSM license. Do not upload GPL licensed tracks.") + "</html>";
    4343

  • trunk/src/org/openstreetmap/josm/io/GpxWriter.java

    r6552 r6889  
    4141    private String indent = "";
    4242
    43     private final static int WAY_POINT = 0;
    44     private final static int ROUTE_POINT = 1;
    45     private final static int TRACK_POINT = 2;
     43    private static final int WAY_POINT = 0;
     44    private static final int ROUTE_POINT = 1;
     45    private static final int TRACK_POINT = 2;
    4646
    4747    public void write(GpxData data) {

  • trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java

    r6867 r6889  
    3434    File file = null;
    3535
    36     public final static long DEFAULT_MAXTIME = -1L;
     36    public static final long DEFAULT_MAXTIME = -1L;
    3737
    3838    /**

  • trunk/src/org/openstreetmap/josm/io/NmeaReader.java

    r6822 r6889  
    132132    public GpxData data;
    133133
    134     //  private final static SimpleDateFormat GGATIMEFMT =
     134    //  private static final SimpleDateFormat GGATIMEFMT =
    135135    //      new SimpleDateFormat("HHmmss.SSS");
    136     private final static SimpleDateFormat RMCTIMEFMT =
     136    private static final SimpleDateFormat RMCTIMEFMT =
    137137        new SimpleDateFormat("ddMMyyHHmmss.SSS");
    138     private final static SimpleDateFormat RMCTIMEFMTSTD =
     138    private static final SimpleDateFormat RMCTIMEFMTSTD =
    139139        new SimpleDateFormat("ddMMyyHHmmss");
    140140
    141     private Date readTime(String p)
    142     {
     141    private Date readTime(String p) {
    143142        Date d = RMCTIMEFMT.parse(p, new ParsePosition(0));
    144143        if (d == null) {

  • trunk/src/org/openstreetmap/josm/io/OsmApi.java

    r6875 r6889  
    5959     * Maximum number of retries to send a request in case of HTTP 500 errors or timeouts
    6060     */
    61     static public final int DEFAULT_MAX_NUM_RETRIES = 5;
     61    public static final int DEFAULT_MAX_NUM_RETRIES = 5;
    6262
    6363    /**
    … …  
    6767     * @since 5386
    6868     */
    69     static public final int MAX_DOWNLOAD_THREADS = 2;
     69    public static final int MAX_DOWNLOAD_THREADS = 2;
    7070
    7171    /**
    … …  
    7373     * @since 5422
    7474     */
    75     static public final String DEFAULT_API_URL = "http://api.openstreetmap.org/api";
     75    public static final String DEFAULT_API_URL = "http://api.openstreetmap.org/api";
    7676
    7777    // The collection of instantiated OSM APIs
    … …  
    8888     *
    8989     */
    90     static public OsmApi getOsmApi(String serverUrl) {
     90    public static OsmApi getOsmApi(String serverUrl) {
    9191        OsmApi api = instances.get(serverUrl);
    9292        if (api == null) {
    … …  
    102102     * @return the OsmApi
    103103     */
    104     static public OsmApi getOsmApi() {
     104    public static OsmApi getOsmApi() {
    105105        String serverUrl = Main.pref.get("osm-server.url", DEFAULT_API_URL);
    106106        return getOsmApi(serverUrl);

  • trunk/src/org/openstreetmap/josm/io/OsmApiPrimitiveGoneException.java

    r3083 r6889  
    1717     * The regexp pattern for the error header replied by the OSM API
    1818     */
    19     static public final String ERROR_HEADER_PATTERN = "The (\\S+) with the id (\\d+) has already been deleted";
     19    public static final String ERROR_HEADER_PATTERN = "The (\\S+) with the id (\\d+) has already been deleted";
    2020    /** the type of the primitive which is gone on the server */
    2121    private OsmPrimitiveType type;

  • trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java

    r6009 r6889  
    1818 */
    1919public class OsmChangeBuilder {
    20     static public final String DEFAULT_API_VERSION = "0.6";
     20    public static final String DEFAULT_API_VERSION = "0.6";
    2121
    2222    private String currentMode;

  • trunk/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java

    r6695 r6889  
    2525public class OsmServerUserInfoReader extends OsmServerReader {
    2626
    27     static protected String getAttribute(Node node, String name) {
     27    protected static String getAttribute(Node node, String name) {
    2828        return node.getAttributes().getNamedItem(name).getNodeValue();
    2929    }
    … …  
    3535     * @throws OsmDataParsingException if parsing goes wrong
    3636     */
    37     static public UserInfo buildFromXML(Document document) throws OsmDataParsingException {
     37    public static UserInfo buildFromXML(Document document) throws OsmDataParsingException {
    3838        try {
    3939            XPathFactory factory = XPathFactory.newInstance();

  • trunk/src/org/openstreetmap/josm/tools/AudioUtil.java

    r6830 r6889  
    2828     * @return the calibrated length of recording in seconds.
    2929     */
    30     static public double getCalibratedDuration(File wavFile) {
     30    public static double getCalibratedDuration(File wavFile) {
    3131        try {
    3232            AudioInputStream audioInputStream = AudioSystem.getAudioInputStream(

  • trunk/src/org/openstreetmap/josm/tools/Diff.java

    r6830 r6889  
    491491
    492492    /** Standard ScriptBuilders. */
    493     public final static ScriptBuilder
     493    public static final ScriptBuilder
    494494    forwardScript = new ForwardScript(),
    495495    reverseScript = new ReverseScript();

  • trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

    r6814 r6889  
    854854
    855855    /** 90 degrees in radians units */
    856     final static double DEGREE_90 = 90.0 * Math.PI / 180.0;
     856    static final double DEGREE_90 = 90.0 * Math.PI / 180.0;
    857857
    858858    /**

  • trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java

    r6380 r6889  
    3535     * @since 5915
    3636     */
    37     static public String getWikiLanguagePrefix(LocaleType type) {
     37    public static String getWikiLanguagePrefix(LocaleType type) {
    3838        if(type == LocaleType.ENGLISH)
    3939          return "";
    … …  
    6060     * @see #getWikiLanguagePrefix(LocaleType)
    6161     */
    62     static public String getWikiLanguagePrefix() {
     62    public static String getWikiLanguagePrefix() {
    6363        return getWikiLanguagePrefix(LocaleType.DEFAULT);
    6464    }
    … …  
    7070     * @see #getJOSMLocaleCode(Locale)
    7171     */
    72     static public String getJOSMLocaleCode() {
     72    public static String getJOSMLocaleCode() {
    7373        return getJOSMLocaleCode(Locale.getDefault());
    7474    }
    … …  
    8484     * @return the JOSM code for the given locale
    8585     */
    86     static public String getJOSMLocaleCode(Locale locale) {
     86    public static String getJOSMLocaleCode(Locale locale) {
    8787        if (locale == null) return "en";
    8888        String full = locale.toString();
    … …  
    106106     * @return the resulting locale
    107107     */
    108     static public Locale getLocale(String localeName) {
     108    public static Locale getLocale(String localeName) {
    109109        if (localeName.equals("he")) {
    110110            localeName = "iw_IL";
    … …  
    123123    }
    124124
    125     static public String getLanguageCodeXML() {
     125    public static String getLanguageCodeXML() {
    126126        return getJOSMLocaleCode()+".";
    127127    }
    128128   
    129     static public String getLanguageCodeManifest() {
     129    public static String getLanguageCodeManifest() {
    130130        return getJOSMLocaleCode()+"_";
    131131    }

  • trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java

    r6830 r6889  
    250250     * @return matching zoom level for area
    251251     */
    252     static public int getZoom(Bounds b) {
     252    public static int getZoom(Bounds b) {
    253253        // convert to mercator (for calculation of zoom only)
    254254        double latMin = Math.log(Math.tan(Math.PI/4.0+b.getMinLat()/180.0*Math.PI/2.0))*180.0/Math.PI;

  • trunk/src/org/openstreetmap/josm/tools/Shortcut.java

    r6380 r6889  
    432432     * @return the platform specific key stroke for the  'Copy' command
    433433     */
    434     static public KeyStroke getCopyKeyStroke() {
     434    public static KeyStroke getCopyKeyStroke() {
    435435        Shortcut sc = shortcuts.get("system:copy");
    436436        if (sc == null) return null;
    … …  
    445445     * @return the platform specific key stroke for the 'Paste' command
    446446     */
    447     static public KeyStroke getPasteKeyStroke() {
     447    public static KeyStroke getPasteKeyStroke() {
    448448        Shortcut sc = shortcuts.get("system:paste");
    449449        if (sc == null) return null;
    … …  
    458458     * @return the platform specific key stroke for the 'Cut' command
    459459     */
    460     static public KeyStroke getCutKeyStroke() {
     460    public static KeyStroke getCutKeyStroke() {
    461461        Shortcut sc = shortcuts.get("system:cut");
    462462        if (sc == null) return null;

  • trunk/src/org/openstreetmap/josm/tools/Utils.java

    r6883 r6889  
    412412    }
    413413
    414     private final static double EPSILON = 1e-11;
     414    private static final double EPSILON = 1e-11;
    415415
    416416    /**

  • trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java

    r6828 r6889  
    3131     * @return the geometry object
    3232     */
    33     static public WindowGeometry centerOnScreen(Dimension extent) {
     33    public static WindowGeometry centerOnScreen(Dimension extent) {
    3434        return centerOnScreen(extent, "gui.geometry");
    3535    }
    … …  
    4444     * @return the geometry object
    4545     */
    46     static public WindowGeometry centerOnScreen(Dimension extent, String preferenceKey) {
     46    public static WindowGeometry centerOnScreen(Dimension extent, String preferenceKey) {
    4747        Rectangle size = preferenceKey != null ? getScreenInfo(preferenceKey)
    4848            : getFullScreenInfo();
    … …  
    6262     * @return the geometry object
    6363     */
    64     static public WindowGeometry centerInWindow(Component reference, Dimension extent) {
     64    public static WindowGeometry centerInWindow(Component reference, Dimension extent) {
    6565        Window parentWindow = null;
    6666        while(reference != null && ! (reference instanceof Window) ) {
    … …  
    8282     * Exception thrown by the WindowGeometry class if something goes wrong
    8383     */
    84     static public class WindowGeometryException extends Exception {
     84    public static class WindowGeometryException extends Exception {
    8585        public WindowGeometryException(String message, Throwable cause) {
    8686            super(message, cause);
    … …  
    178178    }
    179179
    180     static public WindowGeometry mainWindow(String preferenceKey, String arg, boolean maximize) {
     180    public static WindowGeometry mainWindow(String preferenceKey, String arg, boolean maximize) {
    181181        Rectangle screenDimension = getScreenInfo("gui.geometry");
    182182        if (arg != null) {
Note: See TracChangeset for help on using the changeset viewer.