Index: trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java (revision 8318) @@ -286,5 +286,5 @@ neighbors.add(nodes.get(i+1)); } - if(neighbors.size() == 0) + if(neighbors.isEmpty()) continue; else if(neighbors.size() == 2) Index: trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (revision 8318) @@ -121,5 +121,5 @@ } } - if (tmpNodes.size() < 1) { + if (tmpNodes.isEmpty()) { if (selection.size() > 1) { errMsg = tr("None of these nodes are glued to anything else."); @@ -262,5 +262,5 @@ */ private boolean checkSelection2(Collection selection) { - if (selection.size() < 1) + if (selection.isEmpty()) return false; @@ -286,5 +286,5 @@ } - if (selectedNodes.size() < 1) { + if (selectedNodes.isEmpty()) { selectedNodes.addAll(selectedWay.getNodes()); } Index: trunk/src/org/openstreetmap/josm/actions/UploadNotesAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/UploadNotesAction.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/actions/UploadNotesAction.java (revision 8318) @@ -36,5 +36,5 @@ } NoteLayer layer; - if (noteLayers != null && noteLayers.size() > 0) { + if (noteLayers != null && !noteLayers.isEmpty()) { layer = noteLayers.get(0); } else { Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java (revision 8318) @@ -114,5 +114,5 @@ } NoteLayer layer; - if (noteLayers != null && noteLayers.size() > 0) { + if (noteLayers != null && !noteLayers.isEmpty()) { layer = noteLayers.get(0); layer.getNoteData().addNotes(notesData); Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesUrlIdTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesUrlIdTask.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesUrlIdTask.java (revision 8318) @@ -2,5 +2,5 @@ package org.openstreetmap.josm.actions.downloadtasks; -import org.openstreetmap.josm.gui.progress.ProgressMonitor; +import static org.openstreetmap.josm.tools.I18n.tr; import java.util.concurrent.Future; @@ -8,5 +8,5 @@ import java.util.regex.Pattern; -import static org.openstreetmap.josm.tools.I18n.tr; +import org.openstreetmap.josm.gui.progress.ProgressMonitor; public class DownloadNotesUrlIdTask extends DownloadNotesTask { @@ -29,8 +29,4 @@ } - public boolean acceptsUrl(String url) { - return super.acceptsUrl(url); - } - @Override public String getTitle() { Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java (revision 8318) @@ -612,12 +612,10 @@ startImproving(wayList.get(0)); return; - } else if (nodeList.size() > 0) { + } else if (nodeList.size() == 1) { // Starting improving the only way of the single selected node - if (nodeList.size() == 1) { - List r = nodeList.get(0).getReferrers(); - if (r.size() == 1 && (r.get(0) instanceof Way)) { - startImproving((Way) r.get(0)); - return; - } + List r = nodeList.get(0).getReferrers(); + if (r.size() == 1 && (r.get(0) instanceof Way)) { + startImproving((Way) r.get(0)); + return; } } Index: trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 8318) @@ -519,5 +519,5 @@ // highlight it and adjust the cursor accordingly. final boolean canMerge = ctrl && !getCurrentDataSet().getSelectedNodes().isEmpty(); - final OsmPrimitive p = canMerge ? (OsmPrimitive)findNodeToMergeTo(e.getPoint()) : null; + final OsmPrimitive p = canMerge ? findNodeToMergeTo(e.getPoint()) : null; boolean needsRepaint = removeHighlighting(); if(p != null) { Index: trunk/src/org/openstreetmap/josm/data/cache/CacheEntryAttributes.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/cache/CacheEntryAttributes.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/data/cache/CacheEntryAttributes.java (revision 8318) @@ -11,13 +11,13 @@ * * @author Wiktor Niesiobędzki - * + * @since 8168 */ public class CacheEntryAttributes extends ElementAttributes { private static final long serialVersionUID = 1L; //version - private Map attrs = new HashMap(); - private final static String NO_TILE_AT_ZOOM = "noTileAtZoom"; - private final static String ETAG = "Etag"; - private final static String LAST_MODIFICATION = "lastModification"; - private final static String EXPIRATION_TIME = "expirationTime"; + private final Map attrs = new HashMap(); + private static final String NO_TILE_AT_ZOOM = "noTileAtZoom"; + private static final String ETAG = "Etag"; + private static final String LAST_MODIFICATION = "lastModification"; + private static final String EXPIRATION_TIME = "expirationTime"; /** Index: trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java (revision 8318) @@ -27,5 +27,4 @@ import org.openstreetmap.josm.data.preferences.IntegerProperty; - /** * @author Wiktor Niesiobędzki @@ -33,5 +32,5 @@ * Wrapper class for JCS Cache. Sets some sane environment and returns instances of cache objects. * Static configuration for now assumes some small LRU cache in memory and larger LRU cache on disk - * + * @since 8168 */ public class JCSCacheManager { @@ -40,6 +39,6 @@ private static volatile CompositeCacheManager cacheManager = null; private static long maxObjectTTL = Long.MAX_VALUE; - private final static String PREFERENCE_PREFIX = "jcs.cache"; - private final static IndexedDiskCacheFactory diskCacheFactory = new IndexedDiskCacheFactory(); + private static final String PREFERENCE_PREFIX = "jcs.cache"; + private static final IndexedDiskCacheFactory diskCacheFactory = new IndexedDiskCacheFactory(); private static FileLock cacheDirLock = null; Index: trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (revision 8318) @@ -43,4 +43,6 @@ * This class will keep only one Job running for specified tile. All others will just finish, but * listeners will be gathered and notified, once download job will be finished + * + * @since 8168 */ public abstract class JCSCachedTileLoaderJob implements ICachedLoaderJob, Runnable { @@ -56,5 +58,5 @@ * maximum download threads that will be started */ - public final static IntegerProperty THREAD_LIMIT = new IntegerProperty("cache.jcs.max_threads", 10); + public static final IntegerProperty THREAD_LIMIT = new IntegerProperty("cache.jcs.max_threads", 10); public static class LIFOQueue extends LinkedBlockingDeque { Index: trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java (revision 8318) @@ -32,5 +32,5 @@ * * Class bridging TMS requests to JCS cache requests - * + * @since 8168 */ public class TMSCachedTileLoaderJob extends JCSCachedTileLoaderJob implements TileJob, ICachedLoaderListener { @@ -43,5 +43,5 @@ * Limit definition for per host concurrent connections */ - public final static IntegerProperty HOST_LIMIT = new IntegerProperty("imagery.tms.tmsloader.maxjobsperhost", 6); + public static final IntegerProperty HOST_LIMIT = new IntegerProperty("imagery.tms.tmsloader.maxjobsperhost", 6); /* @@ -77,5 +77,4 @@ } return ret; - } @@ -87,5 +86,4 @@ } - private static Map HOST_LIMITS = new ConcurrentHashMap<>(); @@ -93,5 +91,5 @@ * overrides the THREAD_LIMIT in superclass, as we want to have separate limit and pool for TMS */ - public final static IntegerProperty THREAD_LIMIT = new IntegerProperty("imagery.tms.tmsloader.maxjobs", 25); + public static final IntegerProperty THREAD_LIMIT = new IntegerProperty("imagery.tms.tmsloader.maxjobs", 25); /** Index: trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (revision 8318) @@ -575,7 +575,5 @@ @Override public boolean isEmpty() { - if (this.size() == 0) - return true; - return false; + return size == 0; } @@ -583,20 +581,15 @@ List ret = new ArrayList<>(); // Doing this cuts down search cost on a real-life data set by about 25% - boolean cache_searches = true; - if (cache_searches) { - if (search_cache == null) { - search_cache = root; - } - // Walk back up the tree when the last search spot can not cover the current search - while (search_cache != null && !search_cache.bbox().bounds(search_bbox)) { - search_cache = search_cache.parent; - } - - if (search_cache == null) { - search_cache = root; - Main.info("bbox: " + search_bbox + " is out of the world"); - } - } else { + if (search_cache == null) { search_cache = root; + } + // Walk back up the tree when the last search spot can not cover the current search + while (search_cache != null && !search_cache.bbox().bounds(search_bbox)) { + search_cache = search_cache.parent; + } + + if (search_cache == null) { + search_cache = root; + Main.info("bbox: " + search_bbox + " is out of the world"); } Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 8318) @@ -1599,9 +1599,7 @@ private final List allStyleElems; - private final DataSet data; - - public ConcurrentTasksHelper(List allStyleElems, DataSet data) { + + public ConcurrentTasksHelper(List allStyleElems) { this.allStyleElems = allStyleElems; - this.data = data; } @@ -1658,5 +1656,5 @@ final List allStyleElems = new ArrayList<>(nodes.size()+ways.size()+relations.size()); - ConcurrentTasksHelper helper = new ConcurrentTasksHelper(allStyleElems, data); + ConcurrentTasksHelper helper = new ConcurrentTasksHelper(allStyleElems); // Need to process all relations first. Index: trunk/src/org/openstreetmap/josm/data/validation/tests/Lanes.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/Lanes.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/Lanes.java (revision 8318) @@ -47,5 +47,5 @@ Predicates.stringContainsPattern(Pattern.compile(":" + lanesKey + "$")))); keysForPattern.removeAll(Arrays.asList(BLACKLIST)); - if (keysForPattern.size() < 1) { + if (keysForPattern.isEmpty()) { // nothing to check return; Index: trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (revision 8318) @@ -144,5 +144,5 @@ * Represents a fix to a validation test. The fixing {@link Command} can be obtained by {@link #createCommand(OsmPrimitive, Selector)}. */ - static abstract class FixCommand { + abstract static class FixCommand { /** * Creates the fixing {@link Command} for the given primitive. The {@code matchingSelector} is used to Index: trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (revision 8318) @@ -129,5 +129,5 @@ if (!w.isArea() && ElemStyles.hasOnlyAreaElemStyle(w)) { List nodes = w.getNodes(); - if (nodes.size()<1) return; // fix zero nodes bug + if (nodes.isEmpty()) return; // fix zero nodes bug for (String key : keysCheckedByAnotherTest) { if (w.hasKey(key)) { Index: trunk/src/org/openstreetmap/josm/gui/MainMenu.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MainMenu.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/gui/MainMenu.java (revision 8318) @@ -1016,5 +1016,5 @@ List searchResult = mainMenu.findMenuItems(currentSearchText); - if(searchResult.size() == 0) { + if(searchResult.isEmpty()) { // Nothing found hideMenu(); Index: trunk/src/org/openstreetmap/josm/gui/MapView.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MapView.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/gui/MapView.java (revision 8318) @@ -48,5 +48,4 @@ import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.OsmPrimitive; -import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors; import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache; @@ -700,14 +699,4 @@ /** - * Set the new dimension to the view. - * - * @deprecated use #zoomTo(BoundingXYVisitor) - */ - @Deprecated - public void recalculateCenterScale(BoundingXYVisitor box) { - zoomTo(box); - } - - /** * @return An unmodifiable collection of all layers */ @@ -733,5 +722,5 @@ * @return an unmodifiable list of layers of a certain type. */ - public List getLayersOfType(Class ofType) { + public List getLayersOfType(Class ofType) { return new ArrayList<>(Utils.filteredCollection(getAllLayers(), ofType)); } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java (revision 8318) @@ -101,9 +101,4 @@ buildDialog(); MapView.addLayerChangeListener(this); - } - - @Override - public void showDialog() { - super.showDialog(); } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 8318) @@ -580,5 +580,5 @@ public void updateTitle() { - if (relations.size() > 0 && relations.size() != getSize()) { + if (!relations.isEmpty() && relations.size() != getSize()) { RelationListDialog.this.setTitle(tr("Relations: {0}/{1}", getSize(), relations.size())); } else if (getSize() > 0) { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (revision 8318) @@ -282,5 +282,5 @@ return false; Arrays.sort(rows); - return rows[0] > 0 && members.size() > 0; + return rows[0] > 0 && !members.isEmpty(); } @@ -289,5 +289,5 @@ return false; Arrays.sort(rows); - return members.size() > 0 && rows[rows.length - 1] < members.size() - 1; + return !members.isEmpty() && rows[rows.length - 1] < members.size() - 1; } Index: trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 8318) @@ -328,5 +328,5 @@ private String searchExpression; private HttpURLConnection connection; - private transient List data; + private List data; private boolean canceled = false; private Server useserver; Index: trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java (revision 8318) @@ -57,5 +57,5 @@ } else if (historyPos == history.size() -1) { // do nothing just append - } else if (historyPos ==0 && history.size() > 0) { + } else if (historyPos ==0 && !history.isEmpty()) { history = new ArrayList<>(Collections.singletonList(history.get(0))); } else if (historyPos < history.size() -1 && historyPos > 0) { Index: trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java (revision 8318) @@ -109,5 +109,5 @@ referenceDiff.add(new Item(DiffItemType.EMPTY, null)); currentDiff.add(new Item(DiffItemType.INSERTED, b[ib++])); - } else if(deleted > 0) { + } else { referenceDiff.add(new Item(DiffItemType.DELETED, a[ia++])); currentDiff.add(new Item(DiffItemType.EMPTY, null)); Index: trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java (revision 8318) @@ -93,5 +93,5 @@ } - static public List getDefaultSources() { + public static List getDefaultSources() { return Arrays.asList("knowledge", "survey", "Bing"); } Index: trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 8318) @@ -1324,5 +1324,5 @@ continue; } - if (missedTiles.size() <= 0) { + if (missedTiles.isEmpty()) { break; } @@ -1351,5 +1351,5 @@ missedTiles = newlyMissedTiles; } - if (Main.isDebugEnabled() && missedTiles.size() > 0) { + if (Main.isDebugEnabled() && !missedTiles.isEmpty()) { Main.debug("still missed "+missedTiles.size()+" in the end"); } Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 8318) @@ -999,5 +999,5 @@ // no images found, exit - if(imgs.size() <= 0) { + if(imgs.isEmpty()) { JOptionPane.showMessageDialog(Main.parent, tr("The selected photos do not contain time information."), @@ -1207,8 +1207,5 @@ // before the first point will be geotagged with the starting point if (prevWpTime == 0 || curWpTime <= prevWpTime) { - while (true) { - if (i < 0) { - break; - } + while (i >= 0) { final ImageEntry curImg = images.get(i); long time = curImg.getExifTime().getTime(); @@ -1231,8 +1228,5 @@ // This code gives a simple linear interpolation of the coordinates between current and // previous track point assuming a constant speed in between - while (true) { - if (i < 0) { - break; - } + while (i >= 0) { ImageEntry curImg = images.get(i); long imgTime = curImg.getExifTime().getTime(); Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 8318) @@ -713,5 +713,5 @@ public void showNextPhoto() { - if (data != null && data.size() > 0) { + if (data != null && !data.isEmpty()) { currentPhoto++; if (currentPhoto >= data.size()) { @@ -739,5 +739,5 @@ public void showFirstPhoto() { - if (data != null && data.size() > 0) { + if (data != null && !data.isEmpty()) { currentPhoto = 0; ImageViewerDialog.showImage(this, data.get(currentPhoto)); @@ -749,5 +749,5 @@ public void showLastPhoto() { - if (data != null && data.size() > 0) { + if (data != null && !data.isEmpty()) { currentPhoto = data.size() - 1; ImageViewerDialog.showImage(this, data.get(currentPhoto)); @@ -764,5 +764,5 @@ public void removeCurrentPhoto() { - if (data != null && data.size() > 0 && currentPhoto >= 0 && currentPhoto < data.size()) { + if (data != null && !data.isEmpty() && currentPhoto >= 0 && currentPhoto < data.size()) { data.remove(currentPhoto); if (currentPhoto >= data.size()) { @@ -781,5 +781,5 @@ public void removeCurrentPhotoFromDisk() { ImageEntry toDelete = null; - if (data != null && data.size() > 0 && currentPhoto >= 0 && currentPhoto < data.size()) { + if (data != null && !data.isEmpty() && currentPhoto >= 0 && currentPhoto < data.size()) { toDelete = data.get(currentPhoto); @@ -828,5 +828,5 @@ public void copyCurrentPhotoPath() { ImageEntry toCopy = null; - if (data != null && data.size() > 0 && currentPhoto >= 0 && currentPhoto < data.size()) { + if (data != null && !data.isEmpty() && currentPhoto >= 0 && currentPhoto < data.size()) { toCopy = data.get(currentPhoto); String copyString = toCopy.getFile().toString(); Index: trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java (revision 8318) @@ -209,6 +209,6 @@ public void consistencyTest() { - if (bd.size() < 2) throw new AssertionError(); - if (data.size() < 1) throw new AssertionError(); + if (bd.size() < 2) throw new AssertionError(bd); + if (data.isEmpty()) throw new AssertionError(data); if (bd.size() != data.size() + 1) throw new AssertionError(); if (bd.get(0) != 0) throw new AssertionError(); Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (revision 8318) @@ -175,5 +175,5 @@ * @author Michael Zangl */ - private final static class MapCSSKeyRules { + private static final class MapCSSKeyRules { /** * The indexes of rules that might be applied if this tag is present and the value has no special handling. Index: trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 8318) @@ -1240,5 +1240,5 @@ class SourceLoader extends PleaseWaitRunnable { private final String url; - private final transient List sourceProviders; + private final List sourceProviders; private BufferedReader reader; private boolean canceled; Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/ListProjectionChoice.java (revision 8318) @@ -64,5 +64,5 @@ public void setPreferences(Collection args) { String zone = null; - if (args != null && args.size() >= 1) { + if (args != null && !args.isEmpty()) { zone = args.iterator().next(); } Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (revision 8318) @@ -419,5 +419,5 @@ } - if (cmds.size() == 0) + if (cmds.isEmpty()) return null; else if (cmds.size() == 1) Index: trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java (revision 8318) @@ -145,5 +145,5 @@ * @see #setDividerPainter */ - public abstract static class DividerPainter { + public interface DividerPainter { /** * Paint a single Divider. @@ -155,5 +155,5 @@ } - private class DefaultDividerPainter extends DividerPainter { + private class DefaultDividerPainter implements DividerPainter { @Override public void paint(Graphics g, Divider divider) { Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java (revision 8318) @@ -60,5 +60,5 @@ String msg = tr("Remote Control has been asked to load data from the API.") + "
" + tr("Bounding box: ") + new BBox(minlon, minlat, maxlon, maxlat).toStringCSV(", "); - if (args.containsKey("select") && toSelect.size() > 0) { + if (args.containsKey("select") && !toSelect.isEmpty()) { msg += "
" + tr("Selection: {0}", toSelect.size()); } Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java (revision 8316) +++ trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java (revision 8318) @@ -313,5 +313,5 @@ } - public static abstract class RawURLParseRequestHandler extends RequestHandler { + public abstract static class RawURLParseRequestHandler extends RequestHandler { @Override protected void parseArgs() {