Changeset 6175 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2013-08-22T14:41:30+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8902 - Small performance enhancements / coding style (patches by shinigami):

• bytestohexstring.diff: byte[] to hex string change + small test
• collfix.diff : problem in generic collection definition
• styleiteration.diff: useless iteration to do end of list
• environment.diff: Environment - merge chained ops (each created copy of env.) to one

File:

• trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

@@ -37 +37 @@
     private CopyOnWriteArrayList<IConflictListener> listeners;
 
+    /**
+     * Constructs a new {@code ConflictCollection}.
+     */
     public ConflictCollection() {
-        conflicts = new ArrayList<Conflict<?>>();
+        conflicts = new ArrayList<Conflict<? extends OsmPrimitive>>();
         listeners = new CopyOnWriteArrayList<IConflictListener>();
     }
 
+    /**
+     * Adds the specified conflict listener, if not already present.
+     * @param listener The conflict listener to add
+     */
     public void addConflictListener(IConflictListener listener) {
         if (listener != null) {
@@ -48 +55 @@
     }
 
+    /**
+     * Removes the specified conflict listener.
+     * @param listener The conflict listener to remove
+     */
     public void removeConflictListener(IConflictListener listener) {
         listeners.remove(listener);