Index: trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- trunk/src/org/openstreetmap/josm/Main.java	(revision 10043)
+++ trunk/src/org/openstreetmap/josm/Main.java	(revision 10044)
@@ -25,6 +25,6 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.EnumSet;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -232,5 +232,5 @@
     private static final List<String> ERRORS_AND_WARNINGS = Collections.<String>synchronizedList(new ArrayList<String>());
 
-    private static final Set<OnlineResource> OFFLINE_RESOURCES = new HashSet<>();
+    private static final Set<OnlineResource> OFFLINE_RESOURCES = EnumSet.noneOf(OnlineResource.class);
 
     /**
@@ -1825,5 +1825,5 @@
      */
     public static Set<OnlineResource> getOfflineResources() {
-        return new HashSet<>(OFFLINE_RESOURCES);
+        return EnumSet.copyOf(OFFLINE_RESOURCES);
     }
 }
Index: trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java	(revision 10043)
+++ trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java	(revision 10044)
@@ -332,5 +332,5 @@
     }
 
-    private StringBuilder formatRelationNameAndType(Relation relation, StringBuilder result, TaggingPreset preset) {
+    private static StringBuilder formatRelationNameAndType(Relation relation, StringBuilder result, TaggingPreset preset) {
         if (preset == null) {
             result.append(getRelationTypeName(relation));
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java	(revision 10043)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java	(revision 10044)
@@ -15,5 +15,5 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
+import java.util.EnumSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -214,5 +214,5 @@
             }));
             tfId.tryToPasteFrom(parsedText);
-            final Set<OsmPrimitiveType> types = new HashSet<>(Utils.transform(ids, new Utils.Function<SimplePrimitiveId, OsmPrimitiveType>() {
+            final Set<OsmPrimitiveType> types = EnumSet.copyOf(Utils.transform(ids, new Utils.Function<SimplePrimitiveId, OsmPrimitiveType>() {
                 @Override
                 public OsmPrimitiveType apply(SimplePrimitiveId x) {
Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetNameTemplateList.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetNameTemplateList.java	(revision 10043)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetNameTemplateList.java	(revision 10044)
@@ -3,5 +3,5 @@
 
 import java.util.Collection;
-import java.util.Collections;
+import java.util.EnumSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -55,5 +55,5 @@
         synchronized (this) {
             for (TaggingPreset t : presetsWithPattern) {
-                Collection<TaggingPresetType> type = Collections.singleton(TaggingPresetType.forPrimitive(primitive));
+                Collection<TaggingPresetType> type = EnumSet.of(TaggingPresetType.forPrimitive(primitive));
                 if (t.typeMatches(type)) {
                     if (t.nameTemplateFilter != null) {