Index: src/org/openstreetmap/josm/actions/PurgeAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/PurgeAction.java	(revision 6082)
+++ src/org/openstreetmap/josm/actions/PurgeAction.java	(working copy)
@@ -243,7 +243,7 @@
                     return (Long.valueOf(o1.getUniqueId())).compareTo(o2.getUniqueId());
                 }
             });
-            JList list = new JList(toPurgeAdditionally.toArray(new OsmPrimitive[0]));
+            JList list = new JList(toPurgeAdditionally.toArray(new OsmPrimitive[toPurgeAdditionally.size()]));
             /* force selection to be active for all entries */
             list.setCellRenderer(new OsmPrimitivRenderer() {
                 @Override
Index: src/org/openstreetmap/josm/actions/RestartAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/RestartAction.java	(revision 6082)
+++ src/org/openstreetmap/josm/actions/RestartAction.java	(working copy)
@@ -101,7 +101,7 @@
                 @Override
                 public void run() {
                     try {
-                        Runtime.getRuntime().exec(cmd.toArray(new String[]{}));
+                        Runtime.getRuntime().exec(cmd.toArray(new String[cmd.size()]));
                     } catch (IOException e) {
                         e.printStackTrace();
                     }
Index: src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- src/org/openstreetmap/josm/gui/MainApplication.java	(revision 6082)
+++ src/org/openstreetmap/josm/gui/MainApplication.java	(working copy)
@@ -180,7 +180,7 @@
             los.add(new LongOpt(o.getName(), o.requiresArgument() ? LongOpt.REQUIRED_ARGUMENT : LongOpt.NO_ARGUMENT, null, 0));
         }
 
-        Getopt g = new Getopt("JOSM", args, "hv", los.toArray(new LongOpt[0]));
+        Getopt g = new Getopt("JOSM", args, "hv", los.toArray(new LongOpt[los.size()]));
 
         Map<Option, Collection<String>> argMap = new HashMap<Option, Collection<String>>();
 
Index: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 6082)
+++ src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(working copy)
@@ -523,7 +523,7 @@
                 new ConsistencyTestAction(),
                 SeparatorLayerAction.INSTANCE,
                 new LayerListPopup.InfoAction(this)}));
-        return actions.toArray(new Action[0]);
+        return actions.toArray(new Action[actions.size()]);
     }
 
     public static GpxData toGpxData(DataSet data, File file) {
Index: src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 6082)
+++ src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(working copy)
@@ -300,7 +300,7 @@
         entries.add(SeparatorLayerAction.INSTANCE);
         entries.add(new LayerListPopup.InfoAction(this));
 
-        return entries.toArray(new Action[0]);
+        return entries.toArray(new Action[entries.size()]);
 
     }
 
Index: src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java	(revision 6082)
+++ src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java	(working copy)
@@ -251,7 +251,7 @@
         components.add(new RenameLayerAction(getAssociatedFile(), this));
         components.add(SeparatorLayerAction.INSTANCE);
         components.add(new LayerListPopup.InfoAction(this));
-        return components.toArray(new Action[0]);
+        return components.toArray(new Action[components.size()]);
     }
 
     public boolean synchronizeAudioMarkers(AudioMarker startMarker) {
Index: src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java
===================================================================
--- src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java	(revision 6082)
+++ src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java	(working copy)
@@ -109,7 +109,7 @@
                 projections.add("EPSG:" + (32600 + zone + (hemisphere == Hemisphere.South?100:0)));
             }
         }
-        return projections.toArray(new String[0]);
+        return projections.toArray(new String[projections.size()]);
     }
 
     @Override
@@ -133,7 +133,7 @@
         Hemisphere hemisphere = DEFAULT_HEMISPHERE;
 
         if(args != null) {
-            String[] array = args.toArray(new String[0]);
+            String[] array = args.toArray(new String[args.size()]);
 
             if (array.length > 1) {
                 hemisphere = Hemisphere.valueOf(array[1]);