Index: trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java	(revision 6093)
@@ -114,5 +114,5 @@
 
         /// Only ways selected -> Align their nodes.
-        if ((selectedNodes.size() == 0) && (selectedWays.size() == 1)) { // TODO: handle multiple ways
+        if ((selectedNodes.isEmpty()) && (selectedWays.size() == 1)) { // TODO: handle multiple ways
             for (Way way : selectedWays) {
                 nodes.addAll(way.getNodes());
Index: trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java	(revision 6093)
@@ -98,5 +98,5 @@
         // special case if no single nodes are selected and exactly one way is:
         // then use the way's nodes
-        if ((nodes.size() == 0) && (sel.size() == 1)) {
+        if (nodes.isEmpty() && (sel.size() == 1)) {
             for (OsmPrimitive osm : sel)
                 if (osm instanceof Way) {
Index: trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java	(revision 6093)
@@ -266,5 +266,5 @@
             }
 
-            if( affectedWays.size() > 0 ) {
+            if(!affectedWays.isEmpty()) {
                 // reset key tag on affected ways
                 commands.add(new ChangePropertyCommand(affectedWays, key, null));
Index: trunk/src/org/openstreetmap/josm/actions/DistributeAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/DistributeAction.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/actions/DistributeAction.java	(revision 6093)
@@ -60,5 +60,5 @@
         // special case if no single nodes are selected and exactly one way is:
         // then use the way's nodes
-        if ((nodes.size() == 0) && (sel.size() == 1)) {
+        if (nodes.isEmpty() && (sel.size() == 1)) {
             for (OsmPrimitive osm : sel)
                 if (osm instanceof Way) {
@@ -122,5 +122,5 @@
         // Current number of node
         int pos = 0;
-        while (nodes.size() > 0) {
+        while (!nodes.isEmpty()) {
             pos++;
             Node s = null;
Index: trunk/src/org/openstreetmap/josm/actions/FollowLineAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/FollowLineAction.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/actions/FollowLineAction.java	(revision 6093)
@@ -96,5 +96,5 @@
             }
             Set<Node> points = toFollow.getNeighbours(last);
-            if (!points.remove(prev) || (points.size() == 0))
+            if (!points.remove(prev) || points.isEmpty())
                 continue;
             if (points.size() > 1)    // Ambiguous junction?
Index: trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java	(revision 6093)
@@ -198,5 +198,5 @@
 
         public boolean hasWays() {
-            return availableWays.size() > 0;
+            return !availableWays.isEmpty();
         }
 
@@ -404,5 +404,5 @@
         //find intersection points
         Set<Node> nodes = Geometry.addIntersections(allStartingWays, true, cmds);
-        return nodes.size() > 0;
+        return !nodes.isEmpty();
     }
 
@@ -454,5 +454,5 @@
 
         // Don't warn now, because it will really look corrupted
-        boolean warnAboutRelations = relations.size() > 0 && allStartingWays.size() > 1;
+        boolean warnAboutRelations = !relations.isEmpty() && allStartingWays.size() > 1;
 
         ArrayList<WayInPolygon> preparedWays = new ArrayList<WayInPolygon>();
@@ -507,5 +507,5 @@
 
         // Delete the discarded inner ways
-        if (discardedWays.size() > 0) {
+        if (!discardedWays.isEmpty()) {
             Command deleteCmd = DeleteCommand.delete(Main.map.mapView.getEditLayer(), discardedWays, true);
             if (deleteCmd != null) {
@@ -923,5 +923,5 @@
 
             //process inner ways
-            if (innerCandidates.size() > 0) {
+            if (!innerCandidates.isEmpty()) {
                 List<PolygonLevel> innerList = findOuterWaysImpl(level + 1, innerCandidates);
                 result.addAll(innerList);
Index: trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java	(revision 6093)
@@ -47,5 +47,5 @@
         // If the user has selected some ways, only join the node to these.
         boolean restrictToSelectedWays =
-            getCurrentDataSet().getSelectedWays().size() > 0;
+                !getCurrentDataSet().getSelectedWays().isEmpty();
 
             List<WaySegment> wss = Main.map.mapView.getNearestWaySegments(
@@ -74,5 +74,5 @@
             for (Map.Entry<Way, List<Integer>> insertPoint : insertPoints.entrySet()) {
                 List<Integer> is = insertPoint.getValue();
-                if (is.size() == 0) {
+                if (is.isEmpty()) {
                     continue;
                 }
@@ -88,5 +88,5 @@
                 cmds.add(new ChangeCommand(w, wnew));
             }
-            if (cmds.size() == 0) return;
+            if (cmds.isEmpty()) return;
             Main.main.undoRedo.add(new SequenceCommand(tr("Join Node and Line"), cmds));
             Main.map.repaint();
Index: trunk/src/org/openstreetmap/josm/actions/MirrorAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/MirrorAction.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/actions/MirrorAction.java	(revision 6093)
@@ -51,5 +51,5 @@
         }
 
-        if (nodes.size() == 0) {
+        if (nodes.isEmpty()) {
             JOptionPane.showMessageDialog(
                     Main.parent,
Index: trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java	(revision 6093)
@@ -108,5 +108,5 @@
                     }
                 }
-                if (commands.size() > 0) {
+                if (!commands.isEmpty()) {
                     Main.main.undoRedo.add(new SequenceCommand(tr("Orthogonalize / Undo"), commands));
                     Main.map.repaint();
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 6093)
@@ -517,5 +517,5 @@
 
         // don't draw lines if shift is held
-        if (selection.size() > 0 && !shift) {
+        if (!selection.isEmpty() && !shift) {
             Node selectedNode = null;
             Way selectedWay = null;
@@ -1234,5 +1234,5 @@
          * Handle special case: Self-Overlapping or closing way
          */
-        if (getCurrentDataSet() != null && getCurrentDataSet().getSelectedWays().size() > 0 && !wayIsFinished && !alt) {
+        if (getCurrentDataSet() != null && !getCurrentDataSet().getSelectedWays().isEmpty() && !wayIsFinished && !alt) {
             Way w = getCurrentDataSet().getSelectedWays().iterator().next();
             for (Node m : w.getNodes()) {
Index: trunk/src/org/openstreetmap/josm/actions/relation/DuplicateRelationAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/relation/DuplicateRelationAction.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/actions/relation/DuplicateRelationAction.java	(revision 6093)
@@ -40,5 +40,5 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        if (!isEnabled() || relations.size()==0)
+        if (!isEnabled() || relations.isEmpty())
             return;
         Relation r = relations.iterator().next();
Index: trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java	(revision 6093)
@@ -42,5 +42,5 @@
 
     public void load() {
-        boolean addedDefault = layers.size() != 0;
+        boolean addedDefault = !layers.isEmpty();
         List<ImageryPreferenceEntry> entries = Main.pref.getListOfStructs("imagery.entries", null, ImageryPreferenceEntry.class);
         if (entries != null) {
@@ -121,6 +121,5 @@
 
         Collections.sort(defaultLayers);
-        Main.pref.putCollection("imagery.layers.default", defaultsSave.size() > 0
-                ? defaultsSave : defaults);
+        Main.pref.putCollection("imagery.layers.default", defaultsSave.isEmpty() ? defaults : defaultsSave);
     }
 
Index: trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java	(revision 6093)
@@ -269,5 +269,5 @@
         index.setTotalFileSize(totalFileSize);
         for (ProjectionEntries projectionEntries: entries.values()) {
-            if (projectionEntries.entries.size() > 0) {
+            if (!projectionEntries.entries.isEmpty()) {
                 ProjectionType projectionType = new ProjectionType();
                 projectionType.setName(projectionEntries.projection);
Index: trunk/src/org/openstreetmap/josm/data/osm/MultipolygonCreate.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/MultipolygonCreate.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/data/osm/MultipolygonCreate.java	(revision 6093)
@@ -256,5 +256,5 @@
 
             //process inner ways
-            if (innerCandidates.size() > 0) {
+            if (!innerCandidates.isEmpty()) {
                 List<PolygonLevel> innerList = this.findOuterWaysRecursive(level + 1, innerCandidates);
                 if (innerList == null) {
Index: trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java	(revision 6093)
@@ -175,5 +175,5 @@
                 return false;
             boolean ret = this.content.remove(o);
-            if (this.content.size() == 0) {
+            if (this.content.isEmpty()) {
                 this.content = null;
             }
@@ -492,5 +492,5 @@
         boolean canRemove()
         {
-            if (content != null && content.size() > 0)
+            if (content != null && !content.isEmpty())
                 return false;
             if (this.hasChildren())
Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java	(revision 6093)
@@ -184,5 +184,5 @@
         for (int i = 0; i < subGrid.length; i++) {
             ArrayList<NTV2SubGrid> subSubGrids = subGridMap.get(subGrid[i].getSubGridName());
-            if (subSubGrids.size() > 0) {
+            if (!subSubGrids.isEmpty()) {
                 NTV2SubGrid[] subGridArray = subSubGrids.toArray(nullArray);
                 subGrid[i].setSubGridArray(subGridArray);
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java	(revision 6093)
@@ -157,5 +157,5 @@
                 }
 
-                if (highlight.size() > 0) {
+                if (!highlight.isEmpty()) {
                     errors.add(new TestError(this, Severity.ERROR, tr("Unconnected coastline"),
                             UNCONNECTED_COASTLINE, primitives, highlight));
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java	(revision 6093)
@@ -109,5 +109,5 @@
             }
         }
-        if (allroles.size() == 0) {
+        if (allroles.isEmpty()) {
             errors.add( new TestError(this, Severity.WARNING, tr("Relation type is unknown"),
                     RELATION_UNKNOWN, n) );
Index: trunk/src/org/openstreetmap/josm/gui/MultiSplitLayout.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MultiSplitLayout.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/gui/MultiSplitLayout.java	(revision 6093)
@@ -1193,5 +1193,5 @@
     private static void addSplitChild(Split parent, Node child) {
         List<Node> children = new ArrayList<Node>(parent.getChildren());
-        if (children.size() == 0) {
+        if (children.isEmpty()) {
             children.add(child);
         }
Index: trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 6093)
@@ -1539,5 +1539,5 @@
      */
     public void setNewCursor(Cursor cursor, Object reference) {
-        if(Cursors.size() > 0) {
+        if(!Cursors.isEmpty()) {
             CursorInfo l = Cursors.getLast();
             if(l != null && l.cursor == cursor && l.object == reference)
@@ -1555,5 +1555,5 @@
      */
     public void resetCursor(Object reference) {
-        if(Cursors.size() == 0) {
+        if(Cursors.isEmpty()) {
             setCursor(null);
             return;
@@ -1562,5 +1562,5 @@
         stripCursors(reference);
         if(l != null && l.object == reference) {
-            if(Cursors.size() == 0) {
+            if(Cursors.isEmpty()) {
                 setCursor(null);
             } else {
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java	(revision 6093)
@@ -259,5 +259,5 @@
 
         TagCollection allResolutions = getTagConflictResolverModel().getAllResolutions();
-        if (allResolutions.size() > 0) {
+        if (!allResolutions.isEmpty()) {
             cmds.addAll(buildTagChangeCommand(targetPrimitive, allResolutions));
         }
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java	(revision 6093)
@@ -39,5 +39,5 @@
         int numNodesWithTags = 0;
         for (OsmPrimitive p: merged) {
-            if (p.getKeys().size() >0) {
+            if (!p.getKeys().isEmpty()) {
                 numNodesWithTags++;
             }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java	(revision 6093)
@@ -280,5 +280,5 @@
 
     private void setOkEnabled(boolean b) {
-        if (buttons != null && buttons.size() > 0) {
+        if (buttons != null && !buttons.isEmpty()) {
             buttons.get(0).setEnabled(b);
         }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 6093)
@@ -841,5 +841,5 @@
         }
         add(data, BorderLayout.CENTER);
-        if (buttons.size() > 0 && buttons.get(0) != null && !buttons.get(0).isEmpty()) {
+        if (!buttons.isEmpty() && buttons.get(0) != null && !buttons.get(0).isEmpty()) {
             buttonsPanel = new JPanel(new GridLayout(buttons.size(), 1));
             for (Collection<SideButton> buttonRow : buttons) {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java	(revision 6093)
@@ -91,5 +91,5 @@
 
     protected String buildDownloadFeedbackMessage() {
-        if (parents.size() == 0) {
+        if (parents.isEmpty()) {
             return trn("Downloading {0} incomplete object",
                     "Downloading {0} incomplete objects",
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java	(revision 6093)
@@ -551,5 +551,5 @@
         // make the first selected member visible
         //
-        if (selectedIndices.size() > 0) {
+        if (!selectedIndices.isEmpty()) {
             fireMakeMemberVisible(Collections.min(selectedIndices));
         }
@@ -630,5 +630,5 @@
         }
         getSelectionModel().setValueIsAdjusting(false);
-        if (getSelectedIndices().size() > 0) {
+        if (!getSelectedIndices().isEmpty()) {
             fireMakeMemberVisible(getSelectedIndices().get(0));
         }
Index: trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 6093)
@@ -183,5 +183,5 @@
         }
 
-        if (data.tracks.size() > 0) {
+        if (!data.tracks.isEmpty()) {
             info.append("<table><thead align='center'><tr><td colspan='5'>"
                     + trn("{0} track", "{0} tracks", data.tracks.size(), data.tracks.size())
Index: trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java	(revision 6093)
@@ -1387,5 +1387,5 @@
                 // Instantiating large TileSets is expensive.  If there
                 // are no loaded tiles, don't bother even trying.
-                if (ts2.allLoadedTiles().size() == 0) {
+                if (ts2.allLoadedTiles().isEmpty()) {
                     newlyMissedTiles.add(missed);
                     continue;
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 6093)
@@ -470,5 +470,5 @@
         }
 
-        if (gpxLst.size() == 0) {
+        if (gpxLst.isEmpty()) {
             gpxLst.add(new GpxDataWrapper(tr("<No GPX track loaded yet>"), null, null));
         }
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 6093)
@@ -239,5 +239,5 @@
                 Main.main.addLayer(layer);
 
-                if (! canceled && layer.data.size() > 0) {
+                if (!canceled && !layer.data.isEmpty()) {
                     boolean noGeotagFound = true;
                     for (ImageEntry e : layer.data) {
@@ -633,5 +633,5 @@
 
     public void showPreviousPhoto() {
-        if (data != null && data.size() > 0) {
+        if (data != null && !data.isEmpty()) {
             currentPhoto--;
             if (currentPhoto < 0) {
Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/MarkersFromNamedPointsAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/gpx/MarkersFromNamedPointsAction.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/MarkersFromNamedPointsAction.java	(revision 6093)
@@ -40,5 +40,5 @@
         }
         MarkerLayer ml = new MarkerLayer(namedTrackPoints, tr("Named Trackpoints from {0}", layer.getName()), layer.getAssociatedFile(), layer);
-        if (ml.data.size() > 0) {
+        if (!ml.data.isEmpty()) {
             Main.main.addLayer(ml);
         }
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 6093)
@@ -215,5 +215,5 @@
         }
         p.add(items, GBC.eol().fill());
-        if (selected.size() == 0 && !supportsRelation()) {
+        if (selected.isEmpty() && !supportsRelation()) {
             GuiHelper.setEnabledRec(items, false);
         }
@@ -331,5 +331,5 @@
             }
 
-            answer = new PresetDialog(p, title, (ImageIcon) getValue(Action.SMALL_ICON), (sel.size() == 0)).getValue();
+            answer = new PresetDialog(p, title, (ImageIcon) getValue(Action.SMALL_ICON), sel.isEmpty()).getValue();
         }
         if (!showNewRelation && answer == 2)
@@ -350,5 +350,5 @@
      */
     public Collection<OsmPrimitive> createSelection(Collection<OsmPrimitive> participants) {
-        originalSelectionEmpty = participants.size() == 0;
+        originalSelectionEmpty = participants.isEmpty();
         Collection<OsmPrimitive> sel = new LinkedList<OsmPrimitive>();
         for (OsmPrimitive osm : participants)
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java	(revision 6093)
@@ -358,5 +358,5 @@
         public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
             p.add(new JLabel(" "), GBC.eol()); // space
-            if (roles.size() > 0) {
+            if (!roles.isEmpty()) {
                 JPanel proles = new JPanel(new GridBagLayout());
                 proles.add(new JLabel(tr("Available roles")), GBC.std().insets(0, 0, 10, 0));
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java	(revision 6093)
@@ -101,5 +101,5 @@
                 lastrole = null;
             } else {
-                if (all.size() != 0) {
+                if (!all.isEmpty()) {
                     if (o instanceof TaggingPresetItems.Roles) {
                         all.getLast().data.add((TaggingPresetItem) o);
Index: trunk/src/org/openstreetmap/josm/io/NMEAImporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/NMEAImporter.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/io/NMEAImporter.java	(revision 6093)
@@ -41,5 +41,5 @@
                     if (Main.pref.getBoolean("marker.makeautomarkers", true)) {
                         MarkerLayer ml = new MarkerLayer(r.data, tr("Markers from {0}", fn), fileFinal, gpxLayer);
-                        if (ml.data.size() > 0) {
+                        if (!ml.data.isEmpty()) {
                             Main.main.addLayer(ml);
                         }
Index: trunk/src/org/openstreetmap/josm/io/OsmReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmReader.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/io/OsmReader.java	(revision 6093)
@@ -232,5 +232,5 @@
             }
         }
-        if (w.isDeleted() && nodeIds.size() > 0) {
+        if (w.isDeleted() && !nodeIds.isEmpty()) {
             System.out.println(tr("Deleted way {0} contains nodes", w.getUniqueId()));
             nodeIds = new ArrayList<Long>();
@@ -279,5 +279,5 @@
             }
         }
-        if (r.isDeleted() && members.size() > 0) {
+        if (r.isDeleted() && !members.isEmpty()) {
             System.out.println(tr("Deleted relation {0} contains members", r.getUniqueId()));
             members = new ArrayList<RelationMemberData>();
Index: trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionImporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionImporter.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionImporter.java	(revision 6093)
@@ -80,5 +80,5 @@
         GpxLayer gpxLayer = null;
         List<SessionReader.LayerDependency> deps = support.getLayerDependencies();
-        if (deps.size() > 0) {
+        if (!deps.isEmpty()) {
             Layer layer = deps.iterator().next().getLayer();
             if (layer instanceof GpxLayer) {
Index: trunk/src/org/openstreetmap/josm/io/session/MarkerSessionImporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/session/MarkerSessionImporter.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/io/session/MarkerSessionImporter.java	(revision 6093)
@@ -48,5 +48,5 @@
             GpxLayer gpxLayer = null;
             List<SessionReader.LayerDependency> deps = support.getLayerDependencies();
-            if (deps.size() > 0) {
+            if (!deps.isEmpty()) {
                 Layer layer = deps.iterator().next().getLayer();
                 if (layer instanceof GpxLayer) {
Index: trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java	(revision 6093)
@@ -197,5 +197,5 @@
             }
             Set<Layer> deps = dependencies.get(layer);
-            if (deps.size() > 0) {
+            if (!deps.isEmpty()) {
                 List<Integer> depsInt = new ArrayList<Integer>();
                 for (Layer depLayer : deps) {
Index: trunk/src/org/openstreetmap/josm/tools/Geometry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Geometry.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/tools/Geometry.java	(revision 6093)
@@ -173,5 +173,5 @@
                             }
                         }
-                        else if (test && intersectionNodes.size() > 0)
+                        else if (test && !intersectionNodes.isEmpty())
                             return intersectionNodes;
                     }
Index: trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 6093)
@@ -425,5 +425,5 @@
                     String cache_name = full_name;
                     /* cache separately */
-                    if (dirs != null && dirs.size() > 0) {
+                    if (dirs != null && !dirs.isEmpty()) {
                         cache_name = "id:" + id + ":" + full_name;
                         if(archive != null) {
Index: trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 6092)
+++ trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 6093)
@@ -443,5 +443,5 @@
             T parentless = null;
             for (T key : deps.keySet()) {
-                if (deps.get(key).size() == 0) {
+                if (deps.get(key).isEmpty()) {
                     parentless = key;
                     break;