Author: echatellier Date: 2017-03-16 14:42:46 +0100 (Thu, 16 Mar 2017) New Revision: 4404 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4404 Log: fixes #8734: Correction d'une erreur de compilation jaxx (ne comprend pas Java) Added: trunk/src/main/java/fr/ifremer/isisfish/map/MapDataListener.java Modified: trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java Modified: trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java 2017-03-16 12:08:04 UTC (rev 4403) +++ trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java 2017-03-16 13:42:46 UTC (rev 4404) @@ -111,8 +111,8 @@ } private void fireEvent() { - List<ProviderChangeListener> listeners = new ArrayList<>(providerChangeListeners); - for (ProviderChangeListener listener : listeners) { + List<MapDataListener> listeners = new ArrayList<>(mapDataListeners); + for (MapDataListener listener : listeners) { listener.regionChanged(); } } Modified: trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2017-03-16 12:08:04 UTC (rev 4403) +++ trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2017-03-16 13:42:46 UTC (rev 4404) @@ -31,7 +31,6 @@ import java.io.File; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.List; import java.util.Properties; @@ -68,7 +67,7 @@ /** * IsisMapBean. */ -public class IsisMapBean extends OverlayMapPanel implements MapDataProvider.ProviderChangeListener { +public class IsisMapBean extends OverlayMapPanel implements MapDataListener { /** serialVersionUID. */ private static final long serialVersionUID = -4162103384132928473L; Added: trunk/src/main/java/fr/ifremer/isisfish/map/MapDataListener.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/map/MapDataListener.java (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/map/MapDataListener.java 2017-03-16 13:42:46 UTC (rev 4404) @@ -0,0 +1,33 @@ +/* + * #%L + * ISIS-Fish + * %% + * Copyright (C) 2017 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received createNewCells copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ifremer.isisfish.map; + +/** + * Listener to listen for change in data related to map. + */ +public interface MapDataListener { + + /** + * Region or cell changed. + */ + void regionChanged(); +} Property changes on: trunk/src/main/java/fr/ifremer/isisfish/map/MapDataListener.java ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Author Date Id Revision HeadURL \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Modified: trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java 2017-03-16 12:08:04 UTC (rev 4403) +++ trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java 2017-03-16 13:42:46 UTC (rev 4404) @@ -24,7 +24,6 @@ import fr.ifremer.isisfish.entities.Cell; -import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -31,7 +30,7 @@ public abstract class MapDataProvider { - protected Set<ProviderChangeListener> providerChangeListeners = new HashSet<>(); + protected Set<MapDataListener> mapDataListeners = new HashSet<>(); public abstract float getMinLongitude(); @@ -51,15 +50,11 @@ public abstract List<Cell> getCell(); - void addProviderChangeListener(ProviderChangeListener listener) { - providerChangeListeners.add(listener); + void addProviderChangeListener(MapDataListener listener) { + mapDataListeners.add(listener); } - void removeProviderChangeListener(ProviderChangeListener listener) { - providerChangeListeners.remove(listener); + void removeProviderChangeListener(MapDataListener listener) { + mapDataListeners.remove(listener); } - - interface ProviderChangeListener { - void regionChanged(); - } } Modified: trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java 2017-03-16 12:08:04 UTC (rev 4403) +++ trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java 2017-03-16 13:42:46 UTC (rev 4404) @@ -48,7 +48,7 @@ * @author <a href="mailto:seb.regnier@free.fr"></a> * @version $Revision$ */ -public class ZoneDelimiterLayer extends Layer implements MapDataProvider.ProviderChangeListener { //ZoneDelimiterLayer +public class ZoneDelimiterLayer extends Layer implements MapDataListener { //ZoneDelimiterLayer /** serialVersionUID. */ private static final long serialVersionUID = 1127201121371123690L;
participants (1)
-
echatellier＠users.forge.codelutin.com