Ignore:
Timestamp:
2013-08-22T14:41:30+02:00 (6 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

    r6104 r6175  
    3737    private CopyOnWriteArrayList<IConflictListener> listeners;
    3838
     39    /**
     40     * Constructs a new {@code ConflictCollection}.
     41     */
    3942    public ConflictCollection() {
    40         conflicts = new ArrayList<Conflict<?>>();
     43        conflicts = new ArrayList<Conflict<? extends OsmPrimitive>>();
    4144        listeners = new CopyOnWriteArrayList<IConflictListener>();
    4245    }
    4346
     47    /**
     48     * Adds the specified conflict listener, if not already present.
     49     * @param listener The conflict listener to add
     50     */
    4451    public void addConflictListener(IConflictListener listener) {
    4552        if (listener != null) {
     
    4855    }
    4956
     57    /**
     58     * Removes the specified conflict listener.
     59     * @param listener The conflict listener to remove
     60     */
    5061    public void removeConflictListener(IConflictListener listener) {
    5162        listeners.remove(listener);
Note: See TracChangeset for help on using the changeset viewer.