Author: sletellier Date: 2011-12-29 15:16:05 +0100 (Thu, 29 Dec 2011) New Revision: 15 Url: http://forge.codelutin.com/repositories/revision/jmexico/15 Log: Use same listener list Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/InputDesignImpl.java Modified: trunk/jmexico-model/src/main/java/fr/reseaumexico/model/InputDesignImpl.java =================================================================== --- trunk/jmexico-model/src/main/java/fr/reseaumexico/model/InputDesignImpl.java 2011-12-28 16:13:13 UTC (rev 14) +++ trunk/jmexico-model/src/main/java/fr/reseaumexico/model/InputDesignImpl.java 2011-12-29 14:16:05 UTC (rev 15) @@ -46,15 +46,13 @@ private static final long serialVersionUID = 1L; - protected final EventListenerList scenarioListenerList; - protected final EventListenerList factorListenerList; + protected final EventListenerList listenerList; protected final Map<Scenario, ScenarioFactorValueListener> scenarioFactorValueListenerMap; public InputDesignImpl() { this.scenarioFactorValueListenerMap = Maps.newHashMap(); - this.scenarioListenerList = new EventListenerList(); - this.factorListenerList = new EventListenerList(); + this.listenerList = new EventListenerList(); addPropertyChangeListener(PROPERTY_SCENARIO, new PropertyChangeListener() { @Override @@ -126,27 +124,27 @@ @Override public void addInputDesignScenarioListener(InputDesignScenarioListener scenarioListener) { - scenarioListenerList.add(InputDesignScenarioListener.class, scenarioListener); + listenerList.add(InputDesignScenarioListener.class, scenarioListener); } @Override public void removeInputDesignScenarioListener(InputDesignScenarioListener scenarioListener) { - scenarioListenerList.remove(InputDesignScenarioListener.class, scenarioListener); + listenerList.remove(InputDesignScenarioListener.class, scenarioListener); } @Override public void addInputDesignFactorListener(InputDesignFactorListener factorListener) { - factorListenerList.add(InputDesignFactorListener.class, factorListener); + listenerList.add(InputDesignFactorListener.class, factorListener); } @Override public void removeInputDesignFactorListener(InputDesignFactorListener factorListener) { - factorListenerList.remove(InputDesignFactorListener.class, factorListener); + listenerList.remove(InputDesignFactorListener.class, factorListener); } protected void fireInputDesignScenarioAdded(Scenario scenario) { InputDesignScenarioEvent event = new InputDesignScenarioEvent(this, scenario); - InputDesignScenarioListener[] listeners = scenarioListenerList.getListeners(InputDesignScenarioListener.class); + InputDesignScenarioListener[] listeners = listenerList.getListeners(InputDesignScenarioListener.class); for (InputDesignScenarioListener listener : listeners) { listener.onScenarioAdded(event); } @@ -154,7 +152,7 @@ protected void fireInputDesignScenarioRemoved(Scenario scenario) { InputDesignScenarioEvent event = new InputDesignScenarioEvent(this, scenario); - InputDesignScenarioListener[] listeners = scenarioListenerList.getListeners(InputDesignScenarioListener.class); + InputDesignScenarioListener[] listeners = listenerList.getListeners(InputDesignScenarioListener.class); for (InputDesignScenarioListener listener : listeners) { listener.onScenarioRemoved(event); } @@ -162,7 +160,7 @@ protected void fireFactorChanged(Scenario scenario, String factorId, Object oldValue, Object newValue) { InputDesignFactorEvent event = new InputDesignFactorEvent(this, scenario, factorId, oldValue, newValue); - InputDesignFactorListener[] listeners = factorListenerList.getListeners(InputDesignFactorListener.class); + InputDesignFactorListener[] listeners = listenerList.getListeners(InputDesignFactorListener.class); for (InputDesignFactorListener listener : listeners) { listener.onFactorValueChange(event); }