Index: /trunk/src/org/openstreetmap/josm/actions/JosmAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/JosmAction.java (revision 9999) +++ /trunk/src/org/openstreetmap/josm/actions/JosmAction.java (revision 10000) @@ -71,5 +71,4 @@ * @param toolbarId identifier for the toolbar preferences. The iconName is used, if this parameter is null * @param installAdapters false, if you don't want to install layer changed and selection changed adapters - * TODO: do not pass Icon, pass ImageProvider instead */ public JosmAction(String name, ImageProvider icon, String tooltip, Shortcut shortcut, boolean registerInToolbar, Index: /trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java (revision 9999) +++ /trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java (revision 10000) @@ -274,5 +274,5 @@ } - private boolean isSimilar(ImageryInfo iiA, ImageryInfo iiB) { + private static boolean isSimilar(ImageryInfo iiA, ImageryInfo iiB) { if (iiA == null) return false; Index: /trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (revision 9999) +++ /trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (revision 10000) @@ -293,7 +293,7 @@ XMLInputFactory factory = XMLInputFactory.newFactory(); // do not try to load external entities, nor validate the XML - factory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false); - factory.setProperty(XMLInputFactory.IS_VALIDATING, false); - factory.setProperty(XMLInputFactory.SUPPORT_DTD, false); + factory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, Boolean.FALSE); + factory.setProperty(XMLInputFactory.IS_VALIDATING, Boolean.FALSE); + factory.setProperty(XMLInputFactory.SUPPORT_DTD, Boolean.FALSE); try (CachedFile cf = new CachedFile(baseUrl); InputStream in = cf.setHttpHeaders(headers). Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 9999) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 10000) @@ -391,5 +391,5 @@ } - private Polygon buildPolygon(Point center, int radius, int sides) { + private static Polygon buildPolygon(Point center, int radius, int sides) { return buildPolygon(center, radius, sides, 0.0); } Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java (revision 9999) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java (revision 10000) @@ -189,5 +189,5 @@ } - private void processEvent(AbstractDatasetChangedEvent event, Relation r, Collection> maps) { + private static void processEvent(AbstractDatasetChangedEvent event, Relation r, Collection> maps) { if (event instanceof NodeMovedEvent || event instanceof WayNodesChangedEvent) { dispatchEvent(event, r, maps); Index: /trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java (revision 9999) +++ /trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java (revision 10000) @@ -571,5 +571,5 @@ } if (parameters.containsKey(Param.no_off.key) || parameters.containsKey(Param.no_uoff.key)) { - projParams.no_off = true; + projParams.no_off = Boolean.TRUE; } proj.initialize(projParams); @@ -713,9 +713,9 @@ /** * Factor to convert units of east/north coordinates to meters. - * + * * When east/north coordinates are in degrees (geographic CRS), the scale * at the equator is taken, i.e. 360 degrees corresponds to the length of * the equator in meters. - * + * * @return factor to convert units to meter */ @@ -780,5 +780,5 @@ } - private EastNorth getPointAlong(int i, int N, ProjectionBounds r) { + private static EastNorth getPointAlong(int i, int N, ProjectionBounds r) { double dEast = (r.maxEast - r.minEast) / N; double dNorth = (r.maxNorth - r.minNorth) / N; Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java (revision 9999) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java (revision 10000) @@ -368,5 +368,5 @@ } - private double normalizeLonRad(double a) { + private static double normalizeLonRad(double a) { return Math.toRadians(LatLon.normalizeLon(Math.toDegrees(a))); } Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (revision 9999) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (revision 10000) @@ -114,5 +114,5 @@ } - private List createPolygons(List joinedWays) { + private static List createPolygons(List joinedWays) { List result = new ArrayList<>(); for (Multipolygon.PolyData way : joinedWays) { Index: /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 9999) +++ /trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (revision 10000) @@ -455,6 +455,6 @@ } - private String getRelationName(IRelation relation) { - String nameTag = null; + private static String getRelationName(IRelation relation) { + String nameTag; for (String n : getNamingtagsForRelations()) { nameTag = getNameTagValue(relation, n); Index: /trunk/src/org/openstreetmap/josm/gui/MapMover.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MapMover.java (revision 9999) +++ /trunk/src/org/openstreetmap/josm/gui/MapMover.java (revision 10000) @@ -22,11 +22,10 @@ import org.openstreetmap.gui.jmapviewer.JMapViewer; - import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.mapmode.SelectAction; +import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent; +import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener; import org.openstreetmap.josm.data.coor.EastNorth; import org.openstreetmap.josm.data.preferences.BooleanProperty; -import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent; -import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener; import org.openstreetmap.josm.tools.Destroyable; import org.openstreetmap.josm.tools.Shortcut; @@ -58,5 +57,5 @@ } - private void updateJMapViewer() { + private static void updateJMapViewer() { JMapViewer.zoomReverseWheel = MapMover.PROP_ZOOM_REVERSE_WHEEL.get(); } Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 9999) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 10000) @@ -49,5 +49,5 @@ * @since 1631 */ -public abstract class ListMerger extends JPanel implements PropertyChangeListener, Observer { +public abstract class ListMerger extends JPanel implements PropertyChangeListener, Observer, IConflictResolver { protected OsmPrimitivesTable myEntriesTable; protected OsmPrimitivesTable mergedEntriesTable; Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java (revision 9999) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java (revision 10000) @@ -8,5 +8,4 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.Way; -import org.openstreetmap.josm.gui.conflict.pair.IConflictResolver; import org.openstreetmap.josm.gui.conflict.pair.ListMerger; @@ -15,5 +14,5 @@ * @since 1622 */ -public class NodeListMerger extends ListMerger implements IConflictResolver { +public class NodeListMerger extends ListMerger { /** Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java (revision 9999) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java (revision 10000) @@ -8,5 +8,4 @@ import org.openstreetmap.josm.data.osm.Relation; import org.openstreetmap.josm.data.osm.RelationMember; -import org.openstreetmap.josm.gui.conflict.pair.IConflictResolver; import org.openstreetmap.josm.gui.conflict.pair.ListMerger; @@ -15,5 +14,5 @@ * @since 1631 */ -public class RelationMemberMerger extends ListMerger implements IConflictResolver { +public class RelationMemberMerger extends ListMerger { /** Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 9999) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 10000) @@ -315,5 +315,5 @@ } - private void warnAboutParseError(SearchCompiler.ParseError parseError) { + private static void warnAboutParseError(SearchCompiler.ParseError parseError) { Main.warn(parseError); JOptionPane.showMessageDialog( Index: /trunk/src/org/openstreetmap/josm/gui/layer/AlignImageryPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/AlignImageryPanel.java (revision 9999) +++ /trunk/src/org/openstreetmap/josm/gui/layer/AlignImageryPanel.java (revision 10000) @@ -61,5 +61,5 @@ Main.map.removeTopPanel(AlignImageryPanel.class); if (doNotShowAgain.isSelected()) { - showAgain.put(false); + showAgain.put(Boolean.FALSE); } } Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java (revision 9999) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java (revision 10000) @@ -53,5 +53,5 @@ } - private int getIndex(boolean selected) { + private static int getIndex(boolean selected) { return selected ? SELECTED : PLAIN; } Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (revision 9999) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (revision 10000) @@ -294,5 +294,5 @@ * @return An arbitrary key this rule depends on or null if there is no such key. */ - private String findAnyRequiredKey(List conds) { + private static String findAnyRequiredKey(List conds) { String key = null; for (Condition c : conds) { Index: /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 9999) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 10000) @@ -97,5 +97,5 @@ } - private void addSettingsSection(final JPanel p, String name, JPanel section) { + private static void addSettingsSection(final JPanel p, String name, JPanel section) { addSettingsSection(p, name, section, GBC.eol()); } Index: /trunk/src/org/openstreetmap/josm/io/CertificateAmendment.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/CertificateAmendment.java (revision 9999) +++ /trunk/src/org/openstreetmap/josm/io/CertificateAmendment.java (revision 10000) @@ -106,5 +106,7 @@ } if (certificateIsMissing(keyStore, cert)) { - Main.debug(tr("Adding certificate for TLS connections: {0}", cert.getSubjectX500Principal().getName())); + if (Main.isDebugEnabled()) { + Main.debug(tr("Adding certificate for TLS connections: {0}", cert.getSubjectX500Principal().getName())); + } String alias = "josm:" + new File(CERT_AMEND[i]).getName(); try { Index: /trunk/src/org/openstreetmap/josm/io/OsmApi.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 9999) +++ /trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 10000) @@ -859,5 +859,5 @@ * @throws OsmTransferException if the API response cannot be parsed */ - private Note parseSingleNote(String xml) throws OsmTransferException { + private static Note parseSingleNote(String xml) throws OsmTransferException { try { List newNotes = new NoteReader(xml).parse(); @@ -865,5 +865,5 @@ return newNotes.get(0); } - //Shouldn't ever execute. Server will either respond with an error (caught elsewhere) or one note + // Shouldn't ever execute. Server will either respond with an error (caught elsewhere) or one note throw new OsmTransferException(tr("Note upload failed")); } catch (SAXException | IOException e) { Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java (revision 9999) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java (revision 10000) @@ -266,5 +266,5 @@ * If the error can not be written */ - private void sendError(Writer out) throws IOException { + private static void sendError(Writer out) throws IOException { sendHeader(out, "500 Internal Server Error", "text/html", true); out.write("\r\n"); @@ -285,5 +285,5 @@ * If the error can not be written */ - private void sendNotImplemented(Writer out) throws IOException { + private static void sendNotImplemented(Writer out) throws IOException { sendHeader(out, "501 Not Implemented", "text/html", true); out.write("\r\n"); @@ -306,5 +306,5 @@ * If the error can not be written */ - private void sendForbidden(Writer out, String help) throws IOException { + private static void sendForbidden(Writer out, String help) throws IOException { sendHeader(out, "403 Forbidden", "text/html", true); out.write("\r\n"); @@ -330,5 +330,5 @@ * If the error can not be written */ - private void sendBadRequest(Writer out, String help) throws IOException { + private static void sendBadRequest(Writer out, String help) throws IOException { sendHeader(out, "400 Bad Request", "text/html", true); out.write("\r\n");