Ignore:
Timestamp:
2014-04-26T17:39:23+02:00 (6 years ago)
Author:
Don-vip
Message:

see #8465 - use diamond operator where applicable

File:
1 edited

Legend:

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

    r6555 r7005  
    6464     */
    6565    public ConflictCollection() {
    66         conflicts = new ArrayList<Conflict<? extends OsmPrimitive>>();
    67         listeners = new CopyOnWriteArrayList<IConflictListener>();
     66        conflicts = new ArrayList<>();
     67        listeners = new CopyOnWriteArrayList<>();
    6868    }
    6969
     
    148148     */
    149149    public void add(OsmPrimitive my, OsmPrimitive their) {
    150         addConflict(new Conflict<OsmPrimitive>(my, their));
     150        addConflict(new Conflict<>(my, their));
    151151        fireConflictAdded();
    152152    }
     
    322322     */
    323323    public Set<OsmPrimitive> getMyConflictParties() {
    324         HashSet<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
     324        HashSet<OsmPrimitive> ret = new HashSet<>();
    325325        for (Conflict<?> c: conflicts) {
    326326            ret.add(c.getMy());
     
    336336     */
    337337    public Set<OsmPrimitive> getTheirConflictParties() {
    338         HashSet<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
     338        HashSet<OsmPrimitive> ret = new HashSet<>();
    339339        for (Conflict<?> c: conflicts) {
    340340            ret.add(c.getTheir());
Note: See TracChangeset for help on using the changeset viewer.