Ignore:
Timestamp:
2016-10-04T00:42:54+02:00 (9 years ago)
Author:
donvip
Message:

refactor duplicated code

Location:
applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteActionList.java

    r30737 r33027  
    2828package org.openstreetmap.josm.plugins.mapdust.gui.action.execute;
    2929
     30import static org.openstreetmap.josm.tools.I18n.tr;
    3031
    31 import static org.openstreetmap.josm.tools.I18n.tr;
    3232import java.awt.event.ActionEvent;
    33 import java.util.ArrayList;
    34 import java.util.Iterator;
     33
    3534import javax.swing.JOptionPane;
    3635import javax.swing.JToggleButton;
     36
    3737import org.openstreetmap.josm.Main;
    3838import org.openstreetmap.josm.plugins.mapdust.gui.MapdustActionUploader;
    3939import org.openstreetmap.josm.plugins.mapdust.gui.MapdustActionUploaderException;
    4040import org.openstreetmap.josm.plugins.mapdust.gui.MapdustGUI;
    41 import org.openstreetmap.josm.plugins.mapdust.gui.observer.MapdustUpdateObservable;
    42 import org.openstreetmap.josm.plugins.mapdust.gui.observer.MapdustUpdateObserver;
    4341import org.openstreetmap.josm.plugins.mapdust.gui.value.MapdustPluginState;
    44 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustBugFilter;
    45 
    4642
    4743/**
    … …  
    5349 *
    5450 */
    55 public class ExecuteActionList extends MapdustExecuteAction implements
    56         MapdustUpdateObservable {
    57 
    58     /** List of MapdustRefreshObserver objects */
    59     private final ArrayList<MapdustUpdateObserver> observers =
    60             new ArrayList<>();
     51public class ExecuteActionList extends MapdustExecuteActionObservable {
    6152
    6253    /**
    63      * Builds a <code>ExceuteActionList</code> object
     54     * Builds a <code>ExecuteActionList</code> object
    6455     *
    6556     * @param mapdustGUI The <code>MapdustGUI</code> object
    … …  
    9283    }
    9384
    94     /**
    95      * Adds a new MapDust refresh observer to the list of observers.
    96      *
    97      * @param observer The <code>MapdustRefreshObserver</code> object
    98      */
    99     @Override
    100     public void addObserver(MapdustUpdateObserver observer) {
    101         if (!this.observers.contains(observer)) {
    102             this.observers.add(observer);
    103         }
    104     }
    105 
    106     /**
    107      * Removes the MapDust refresh observer object from the list of observers.
    108      *
    109      * @param observer The <code>MapdustRefreshObserver</code> object
    110      */
    111     @Override
    112     public void removeObserver(MapdustUpdateObserver observer) {
    113         this.observers.remove(observer);
    114     }
    115 
    116     /**
    117      * Notifies the observers observing this action.
    118      */
    119     @Override
    120     public void notifyObservers(MapdustBugFilter filter, boolean first) {
    121         Iterator<MapdustUpdateObserver> elements = this.observers.iterator();
    122         while (elements.hasNext()) {
    123             (elements.next()).update(filter, false);
    124         }
    125     }
    12685
    12786}

  • applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteFilterBug.java

    r32787 r33027  
    3232package org.openstreetmap.josm.plugins.mapdust.gui.action.execute;
    3333
     34import java.awt.event.ActionEvent;
     35import java.util.List;
    3436
    35 import java.awt.event.ActionEvent;
    36 import java.util.ArrayList;
    37 import java.util.Iterator;
    38 import java.util.List;
    3937import javax.swing.JButton;
     38
    4039import org.openstreetmap.josm.plugins.mapdust.gui.MapdustGUI;
    4140import org.openstreetmap.josm.plugins.mapdust.gui.component.dialog.FilterBugDialog;
    42 import org.openstreetmap.josm.plugins.mapdust.gui.observer.MapdustUpdateObservable;
    43 import org.openstreetmap.josm.plugins.mapdust.gui.observer.MapdustUpdateObserver;
    4441import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustBugFilter;
    4542import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustRelevance;
    46 
    4743
    4844/**
    … …  
    5248 * @author Bea
    5349 */
    54 public class ExecuteFilterBug extends MapdustExecuteAction implements
    55         MapdustUpdateObservable {
     50public class ExecuteFilterBug extends MapdustExecuteActionObservable {
    5651
    5752    /** The serial version UID */
    5853    private static final long serialVersionUID = -2724396161610512502L;
    59 
    60     /** The list MapDustBug filter observers */
    61     private final ArrayList<MapdustUpdateObserver> observers =
    62             new ArrayList<>();
    6354
    6455    /**
    … …  
    109100        }
    110101    }
    111 
    112     /**
    113      * Adds a new MapDust bug filter observer to the list of observers.
    114      *
    115      * @param observer The <code>MapdustBugFilterObserver</code> object
    116      */
    117     @Override
    118     public void addObserver(MapdustUpdateObserver observer) {
    119         if (!this.observers.contains(observer)) {
    120             this.observers.add(observer);
    121         }
    122     }
    123 
    124     /**
    125      * Removes the MapDust bug filter observer object from the list of
    126      * observers.
    127      *
    128      * @param observer The <code>MapdustBugFilterObserver</code> object
    129      */
    130     @Override
    131     public void removeObserver(MapdustUpdateObserver observer) {
    132         this.observers.remove(observer);
    133     }
    134 
    135     /**
    136      * Notifies the observers observing this action.
    137      *
    138      * @param filter The <code>MapdustBugFilter</code> object
    139      */
    140     @Override
    141     public void notifyObservers(MapdustBugFilter filter, boolean first) {
    142         Iterator<MapdustUpdateObserver> elements = this.observers.iterator();
    143         while (elements.hasNext()) {
    144             (elements.next()).update(filter, false);
    145         }
    146     }
    147 
    148102}

  • applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/gui/action/execute/ExecuteWorkOffline.java

    r32787 r33027  
    2828package org.openstreetmap.josm.plugins.mapdust.gui.action.execute;
    2929
     30import static org.openstreetmap.josm.tools.I18n.tr;
    3031
    31 import static org.openstreetmap.josm.tools.I18n.tr;
    3232import java.awt.event.ActionEvent;
    33 import java.util.ArrayList;
    34 import java.util.Iterator;
     33
    3534import javax.swing.JOptionPane;
    3635import javax.swing.JToggleButton;
     36
    3737import org.openstreetmap.josm.Main;
    3838import org.openstreetmap.josm.plugins.mapdust.gui.MapdustActionUploader;
    3939import org.openstreetmap.josm.plugins.mapdust.gui.MapdustActionUploaderException;
    4040import org.openstreetmap.josm.plugins.mapdust.gui.MapdustGUI;
    41 import org.openstreetmap.josm.plugins.mapdust.gui.observer.MapdustUpdateObservable;
    42 import org.openstreetmap.josm.plugins.mapdust.gui.observer.MapdustUpdateObserver;
    4341import org.openstreetmap.josm.plugins.mapdust.gui.value.MapdustPluginState;
    44 import org.openstreetmap.josm.plugins.mapdust.service.value.MapdustBugFilter;
    45 
    4642
    4743/**
    … …  
    5551 *
    5652 */
    57 public class ExecuteWorkOffline extends MapdustExecuteAction implements
    58         MapdustUpdateObservable {
     53public class ExecuteWorkOffline extends MapdustExecuteActionObservable {
    5954
    6055    /** The serial version UID */
    6156    private static final long serialVersionUID = 8792828131813689548L;
    62 
    63     /** The list of MapDust refresh observers */
    64     private final ArrayList<MapdustUpdateObserver> observers =
    65             new ArrayList<>();
    6657
    6758    /**
    … …  
    124115        }
    125116    }
    126 
    127     /**
    128      * Adds a new MapDust refresh observer to the list of observers.
    129      *
    130      * @param observer The <code>MapdustRefreshObserver</code> object
    131      */
    132     @Override
    133     public void addObserver(MapdustUpdateObserver observer) {
    134         if (!this.observers.contains(observer)) {
    135             this.observers.add(observer);
    136         }
    137     }
    138 
    139     /**
    140      * Removes the MapDust refresh observer object from the list of observers.
    141      *
    142      * @param observer The <code>MapdustRefreshObserver</code> object
    143      */
    144     @Override
    145     public void removeObserver(MapdustUpdateObserver observer) {
    146         this.observers.remove(observer);
    147     }
    148 
    149     /**
    150      * Notifies the observers observing this action.
    151      */
    152     @Override
    153     public void notifyObservers(MapdustBugFilter filter, boolean first) {
    154         Iterator<MapdustUpdateObserver> elements = this.observers.iterator();
    155         while (elements.hasNext()) {
    156             (elements.next()).update(filter, false);
    157         }
    158     }
    159 
    160117}
Note: See TracChangeset for help on using the changeset viewer.