Author: echatellier Date: 2014-04-17 10:16:36 +0200 (Thu, 17 Apr 2014) New Revision: 3964 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3964 Log: Update openmap to 5.0.4 Added: branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/OpenMapEvents.java Removed: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.java Modified: branches/4.0.1/pom.xml branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneBasicsUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2014-04-16 15:45:15 UTC (rev 3963) +++ branches/4.0.1/pom.xml 2014-04-17 08:16:36 UTC (rev 3964) @@ -255,7 +255,7 @@ <dependency> <groupId>com.bbn</groupId> <artifactId>openmap</artifactId> - <version>5.0</version> + <version>5.0.4</version> <scope>compile</scope> </dependency> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2014-04-16 15:45:15 UTC (rev 3963) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2014-04-17 08:16:36 UTC (rev 3964) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2002 - 2014 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -27,25 +27,30 @@ import static org.nuiton.i18n.I18n.t; +import java.awt.Color; import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Properties; +import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import com.bbn.openmap.BufferedMapBean; import com.bbn.openmap.Layer; import com.bbn.openmap.LayerHandler; +import com.bbn.openmap.MapBean; import com.bbn.openmap.MouseDelegator; +import com.bbn.openmap.PropertyHandler; +import com.bbn.openmap.event.CoordMouseMode; import com.bbn.openmap.event.MapMouseListener; import com.bbn.openmap.event.MapMouseMode; import com.bbn.openmap.event.NavMouseMode; +import com.bbn.openmap.gui.OverlayMapPanel; import com.bbn.openmap.layer.GraticuleLayer; import com.bbn.openmap.layer.dted.DTEDLayer; import com.bbn.openmap.layer.e00.E00Layer; @@ -74,7 +79,7 @@ * Mise a jour: $Date$ * par : $Author$ */ -public class IsisMapBean extends BufferedMapBean { +public class IsisMapBean extends OverlayMapPanel { /** serialVersionUID. */ private static final long serialVersionUID = -4162103384132928473L; @@ -101,24 +106,36 @@ protected static final float SCALE = 9500000f; public IsisMapBean() { + super(new PropertyHandler(new Properties()), true); + create(); init(); - setActiveMouseMode(new NavMouseMode()); } - protected void init() { - setScale(SCALE); + public void init() { + MapBean mapBean = getMapBean(); + mapBean.setScale(SCALE); // Let the LayerHandler know who is interested in Layers. //MapBean is just one component - layerHandler.addLayerListener(this); + //layerHandler.addLayerListener(this); - md = new MouseDelegator(this); + md = new MouseDelegator(mapBean); // md.addMouseMode(selectMouseMode); // Tell the delegator to use the default modes: Navigation // and Selection md.setDefaultMouseModes(); + addMapComponent(md); + addMapComponent(layerHandler); + + getMapBean().setBackgroundColor(new Color(0x99b3cc)); + + NavMouseMode mouseMode = new NavMouseMode(); + setActiveMouseMode(mouseMode); + + // add copy to clipboard support + addMapMouseListener(new CopyMapToClipboardListener(mapBean)); } - public void setActiveMouseMode(MapMouseMode mode) { + public void setActiveMouseMode(CoordMouseMode mode) { md.setActiveMouseMode(mode); currentMouseMode = mode; // il faut remettre les listeners @@ -278,7 +295,7 @@ public void addResultatLayer(String id, ResultatLayer layer) { layer.setName(id); addMapMouseListener(layer); - layerHandler.addLayer(layer); + addMapComponent(layer); } public void removeAllResultatLayer() { @@ -304,25 +321,27 @@ Layer layer = null; // get layer depending on type - if (mapFile.endsWith(".shp")) { + switch (FilenameUtils.getExtension(mapFile)) { + case "shp": layer = getShapeLayer(layerId, mapFile, lineColor, fillColor); - } - else if (mapFile.endsWith(".e00")) { + break; + case "e00": layer = getE00Layer(layerId, mapFile, lineColor, fillColor); - } - else if (mapFile.endsWith(".mif")) { + break; + case "mif": layer = getMIFLayer(layerId, mapFile, lineColor, fillColor); - } - else if (mapFile.endsWith(".rpf") || mapFile.endsWith(".cadrg") || mapFile.endsWith(".cib")) { + break; + case "rpf": + case "cadrg": + case "cib": layer = getRPFLayer(layerId, mapFile, lineColor, fillColor); - } - else if (mapFile.endsWith(".vmap") || mapFile.endsWith(".dcw") || mapFile.endsWith(".vpf")) { + break; + case "vmap": + case "dcw": + case "vpf": layer = getVPFLayer(layerId, mapFile, lineColor, fillColor); - } - /*else if (mapFile.endsWith(".dt0")) { - layer = getDTEDLayer(layerId, mapFile, lineColor, fillColor); - }*/ - else { + break; + default: if (log.isErrorEnabled()) { log.error("Can't find layer for " + mapFile + " (unknown type)"); } @@ -333,7 +352,7 @@ if (log.isDebugEnabled()) { log.debug("Add layer " + layer); } - layerHandler.addLayer(layer); + addMapComponent(layer); } } @@ -561,12 +580,12 @@ p.setProperty("." + GraticuleLayer.TextColorProperty, "FF000000"); layer.setProperties("", p); - layerHandler.addLayer(layer); + addMapComponent(layer); } protected void addZoneDelimiterLayer() throws TopiaException { ZoneDelimiterLayer layer = new ZoneDelimiterLayer(fisheryRegion); - layerHandler.addLayer(layer); + addMapComponent(layer); } protected void addSpecificLayer() { @@ -595,9 +614,8 @@ // OR this one //setProjection(new CADRG(new LatLonPoint(centerLat, centerLong), SCALE, 480, 540)); - setCenter(new LatLonPoint.Float(centerLat, centerLong)); + getMapBean().setCenter(new LatLonPoint.Float(centerLat, centerLong)); //setScale(SCALE); - addSpecificLayer(); addGraticuleLayer(); // ajout des shapes @@ -621,6 +639,8 @@ String filename = IsisFish.config.getDefaultMapFilename(); addLayer(filename, filename, "ff000000", "ffbdde83"); } + + addSpecificLayer(); } catch (Exception eee) { if (log.isErrorEnabled()) { @@ -653,7 +673,7 @@ try { activeSelectionLayer = new CellSelectionLayer(fisheryRegion, getSelectionMode()); addMapMouseListener(activeSelectionLayer); - layerHandler.addLayer(activeSelectionLayer); + addMapComponent(activeSelectionLayer); } catch (TopiaException eee) { if (log.isWarnEnabled()) { log.warn("Can't add selection layer", eee); Copied: branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/OpenMapEvents.java (from rev 3945, branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.java) =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/OpenMapEvents.java (rev 0) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/OpenMapEvents.java 2014-04-17 08:16:36 UTC (rev 3964) @@ -0,0 +1,129 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2005 - 2010 Ifremer, Code Lutin + * %% + * 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 a 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; + +import java.awt.event.MouseEvent; + +import com.bbn.openmap.Layer; +import com.bbn.openmap.event.CoordMouseMode; +import com.bbn.openmap.event.MapMouseListener; +import com.bbn.openmap.event.MapMouseMode; +import com.bbn.openmap.event.ProjectionEvent; +import com.bbn.openmap.event.SelectMouseMode; + +/** + * OpenMapEvents.java + * + * Created: 5 septembre 2005 03:21:41 CEST + * + * @author Benjamin POUSSIN <poussin@codelutin.com> + * @version $Revision: 202 $ + * + * Last update: $Date: 2006-06-30 18:39:09 +0200 (ven, 30 jun 2006) $ + * by : $Author: bpoussin $ + */ +public abstract class OpenMapEvents extends Layer implements MapMouseListener { // OpenMapEvents + + /** serialVersionUID. */ + private static final long serialVersionUID = -8365120112075269288L; + + /** + * SelectMouseMode property: Null, Distance, Nav, Select + */ + protected MapMouseMode mouseMode; + protected IsisMapBean map; + + protected int selectMode = CellSelectionLayer.SINGLE_SELECTION; + + /** + * Constructor. + * + * Register himself to {@code map} mapMouseListener. + * Also set mouseMode and selectMode on map. + * + * @param map map bean + * @param mouseMode mouse mode + * @param selectMode select mode + */ + public OpenMapEvents(IsisMapBean map, CoordMouseMode mouseMode, int selectMode) { + super(); + this.mouseMode = mouseMode; + this.map = map; + this.selectMode = selectMode; + map.setSelectionMode(selectMode); + map.setActiveMouseMode(mouseMode); + map.addMapMouseListener(this); + + } + + @Override + public void projectionChanged(ProjectionEvent e) { + // do nothing, it's not reel layer + } + + @Override + public String[] getMouseModeServiceList() { + return new String[] { SelectMouseMode.modeID }; + } + + @Override + public boolean mouseClicked(MouseEvent e) { + return true; + } + + @Override + public boolean mouseDragged(MouseEvent e) { + return false; + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } + + @Override + public void mouseMoved() { + } + + @Override + public boolean mouseMoved(MouseEvent e) { + return false; + } + + @Override + public boolean mousePressed(MouseEvent e) { + return false; + } + + @Override + public boolean mouseReleased(MouseEvent e) { + return false; + } + +} // OpenMapEvents Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2014-04-16 15:45:15 UTC (rev 3963) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2014-04-17 08:16:36 UTC (rev 3964) @@ -30,17 +30,16 @@ <import> static org.nuiton.i18n.I18n.n static org.nuiton.i18n.I18n.t - java.awt.event.MouseEvent; - fr.ifremer.isisfish.entities.Cell; - com.bbn.openmap.gui.Tool; - com.bbn.openmap.gui.OMToolSet; - com.bbn.openmap.event.SelectMouseMode; - fr.ifremer.isisfish.map.CellSelectionLayer; - fr.ifremer.isisfish.map.CopyMapToClipboardListener; - fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; - javax.swing.DefaultComboBoxModel; + java.awt.event.MouseEvent + fr.ifremer.isisfish.entities.Cell + com.bbn.openmap.event.SelectMouseMode + fr.ifremer.isisfish.map.CellSelectionLayer + fr.ifremer.isisfish.map.OpenMapEvents + fr.ifremer.isisfish.map.CopyMapToClipboardListener + fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI + java.beans.PropertyChangeEvent + java.beans.PropertyChangeListener + javax.swing.DefaultComboBoxModel </import> <BeanValidator id='validator' @@ -50,14 +49,13 @@ </BeanValidator> <script><![CDATA[ -protected OMToolSet toolSet = new OMToolSet(); - boolean cellChanged = true; protected void $afterCompleteSetup() { setButtonTitle(t("isisfish.input.continueZones")); setNextPath(n("isisfish.input.tree.zones")); + //cellMap.init(cellMapInfo); new OpenMapEvents(cellMap, new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) { @Override public boolean mouseClicked(MouseEvent e) { @@ -78,11 +76,6 @@ } }; - // add copy to clipboard support - cellMap.addMapMouseListener(new CopyMapToClipboardListener(cellMap)); - toolSet.setupListeners(cellMap); - toolMap.add((Tool)toolSet); - addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { @@ -208,12 +201,11 @@ </row> </Table> <JPanel id='map' layout='{new BorderLayout()}'> - <com.bbn.openmap.gui.ToolPanel id='toolMap' javaBean='new com.bbn.openmap.gui.ToolPanel()' - constraints='BorderLayout.NORTH' decorator='boxed' enabled='{getBean() != null}' /> <fr.ifremer.isisfish.map.IsisMapBean id='cellMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' selectionMode="{fr.ifremer.isisfish.map.CellSelectionLayer.SINGLE_SELECTION}" fisheryRegion='{getFisheryRegion()}' selectedCells='{getBean()}' constraints='BorderLayout.CENTER' decorator='boxed' enabled='{getBean() != null}'/> + <com.bbn.openmap.InformationDelegator id="cellMapInfo" constraints='BorderLayout.SOUTH' /> </JPanel> </JSplitPane> </JPanel> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2014-04-16 15:45:15 UTC (rev 3963) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2014-04-17 08:16:36 UTC (rev 3964) @@ -32,8 +32,6 @@ static org.nuiton.i18n.I18n.t fr.ifremer.isisfish.entities.FisheryRegion; fr.ifremer.isisfish.map.CopyMapToClipboardListener; - com.bbn.openmap.gui.Tool; - com.bbn.openmap.gui.OMToolSet; java.beans.PropertyChangeEvent; java.beans.PropertyChangeListener; javax.swing.DefaultListModel @@ -47,15 +45,11 @@ <script><![CDATA[ -protected OMToolSet toolSet = new OMToolSet(); protected void $afterCompleteSetup() { - toolSet.setupListeners(cellMap); - toolMap.add((Tool)toolSet); + + //cellMap.init(cellMapInfo); - // add copy to clipboard support - cellMap.addMapMouseListener(new CopyMapToClipboardListener(cellMap)); - setButtonTitle(t("isisfish.input.continueCells")); setNextPath(n("isisfish.input.tree.cells")); @@ -314,12 +308,11 @@ </row> </Table> <JPanel id='map' layout='{new BorderLayout()}'> - <com.bbn.openmap.gui.ToolPanel id='toolMap' javaBean='new com.bbn.openmap.gui.ToolPanel()' - constraints='BorderLayout.NORTH' decorator='boxed'/> <fr.ifremer.isisfish.map.IsisMapBean id='cellMap' selectionMode="{fr.ifremer.isisfish.map.CellSelectionLayer.NO_SELECTION}" javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' fisheryRegion='{getBean()}' constraints='BorderLayout.CENTER' decorator='boxed'/> + <com.bbn.openmap.InformationDelegator id="cellMapInfo" constraints='BorderLayout.SOUTH' /> </JPanel> </JSplitPane> </JPanel> Deleted: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.java 2014-04-16 15:45:15 UTC (rev 3963) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.java 2014-04-17 08:16:36 UTC (rev 3964) @@ -1,131 +0,0 @@ -/* - * #%L - * IsisFish - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2005 - 2010 Ifremer, Code Lutin - * %% - * 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 a 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.ui.input; - -import java.awt.event.MouseEvent; - -import com.bbn.openmap.Layer; -import com.bbn.openmap.event.MapMouseListener; -import com.bbn.openmap.event.MapMouseMode; -import com.bbn.openmap.event.ProjectionEvent; -import com.bbn.openmap.event.SelectMouseMode; - -import fr.ifremer.isisfish.map.CellSelectionLayer; -import fr.ifremer.isisfish.map.IsisMapBean; - -/** - * OpenMapEvents.java - * - * Created: 5 septembre 2005 03:21:41 CEST - * - * @author Benjamin POUSSIN <poussin@codelutin.com> - * @version $Revision: 202 $ - * - * Last update: $Date: 2006-06-30 18:39:09 +0200 (ven, 30 jun 2006) $ - * by : $Author: bpoussin $ - */ -public abstract class OpenMapEvents extends Layer implements MapMouseListener { // OpenMapEvents - - /** serialVersionUID. */ - private static final long serialVersionUID = -8365120112075269288L; - - /** - * SelectMouseMode property: Null, Distance, Nav, Select - */ - protected MapMouseMode mouseMode; - protected IsisMapBean map; - - protected int selectMode = CellSelectionLayer.SINGLE_SELECTION; - - /** - * Constructor. - * - * Register himself to {@code map} mapMouseListener. - * Also set mouseMode and selectMode on map. - * - * @param map map bean - * @param mouseMode mouse mode - * @param selectMode select mode - */ - public OpenMapEvents(IsisMapBean map, MapMouseMode mouseMode, int selectMode) { - super(); - this.mouseMode = mouseMode; - this.map = map; - this.selectMode = selectMode; - map.setSelectionMode(selectMode); - map.setActiveMouseMode(mouseMode); - map.addMapMouseListener(this); - - } - - @Override - public void projectionChanged(ProjectionEvent e) { - // do nothing, it's not reel layer - } - - @Override - public String[] getMouseModeServiceList() { - return new String[] { SelectMouseMode.modeID }; - } - - @Override - public boolean mouseClicked(MouseEvent e) { - return true; - } - - @Override - public boolean mouseDragged(MouseEvent e) { - return false; - } - - @Override - public void mouseEntered(MouseEvent e) { - } - - @Override - public void mouseExited(MouseEvent e) { - } - - @Override - public void mouseMoved() { - } - - @Override - public boolean mouseMoved(MouseEvent e) { - return false; - } - - @Override - public boolean mousePressed(MouseEvent e) { - return false; - } - - @Override - public boolean mouseReleased(MouseEvent e) { - return false; - } - -} // OpenMapEvents Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2014-04-16 15:45:15 UTC (rev 3963) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2014-04-17 08:16:36 UTC (rev 3964) @@ -32,10 +32,9 @@ static org.nuiton.i18n.I18n.n fr.ifremer.isisfish.entities.Port fr.ifremer.isisfish.entities.Cell - com.bbn.openmap.gui.Tool - com.bbn.openmap.gui.OMToolSet fr.ifremer.isisfish.map.CellSelectionLayer fr.ifremer.isisfish.map.CopyMapToClipboardListener + fr.ifremer.isisfish.map.OpenMapEvents com.bbn.openmap.event.SelectMouseMode java.beans.PropertyChangeEvent java.beans.PropertyChangeListener @@ -50,16 +49,11 @@ </BeanValidator> <script><![CDATA[ -protected OMToolSet toolSet = new OMToolSet(); - boolean portChanged = true; protected void $afterCompleteSetup() { - toolSet.setupListeners(portMap); - toolMap.add((Tool)toolSet); - - // add copy to clipboard support - portMap.addMapMouseListener(new CopyMapToClipboardListener(portMap)); + + //portMap.init(portMapInfo); new OpenMapEvents(portMap, new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) { @Override public boolean mouseClicked(MouseEvent e) { @@ -192,12 +186,11 @@ </row> </Table> <JPanel id='map' layout='{new BorderLayout()}'> - <com.bbn.openmap.gui.ToolPanel id='toolMap' javaBean='new com.bbn.openmap.gui.ToolPanel()' - constraints='BorderLayout.NORTH' decorator='boxed' enabled='{getBean() != null}' /> <fr.ifremer.isisfish.map.IsisMapBean id='portMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' constraints='BorderLayout.CENTER' selectionMode="{fr.ifremer.isisfish.map.CellSelectionLayer.SINGLE_SELECTION}" decorator='boxed' enabled='{getBean() != null}' fisheryRegion='{getFisheryRegion()}' selectedCells='{getBean() == null ? null : bean.getCell()}' /> + <com.bbn.openmap.InformationDelegator id="portMapInfo" constraints='BorderLayout.SOUTH' /> </JPanel> </JSplitPane> </JPanel> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneBasicsUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneBasicsUI.jaxx 2014-04-16 15:45:15 UTC (rev 3963) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneBasicsUI.jaxx 2014-04-17 08:16:36 UTC (rev 3964) @@ -33,10 +33,9 @@ fr.ifremer.isisfish.entities.Zone fr.ifremer.isisfish.map.CellSelectionLayer fr.ifremer.isisfish.map.CopyMapToClipboardListener + fr.ifremer.isisfish.map.OpenMapEvents fr.ifremer.isisfish.ui.input.model.TopiaEntityListModel com.bbn.openmap.event.SelectMouseMode - com.bbn.openmap.gui.Tool - com.bbn.openmap.gui.OMToolSet java.beans.PropertyChangeEvent java.beans.PropertyChangeListener java.awt.event.MouseEvent @@ -51,15 +50,9 @@ </BeanValidator> <script><![CDATA[ -protected OMToolSet toolSet = new OMToolSet(); - protected void $afterCompleteSetup() { - toolSet.setupListeners(zoneMap); - toolMap.add((Tool)toolSet); - - // add copy to clipboard support - zoneMap.addMapMouseListener(new CopyMapToClipboardListener(zoneMap)); + //zoneMap.init(zoneMapInfo); new OpenMapEvents(zoneMap, new SelectMouseMode(false), CellSelectionLayer.MULT_SELECTION) { @Override public boolean mouseClicked(MouseEvent e) { @@ -190,15 +183,12 @@ </row> </Table> <JPanel id='map' layout='{new BorderLayout()}'> - <com.bbn.openmap.gui.ToolPanel id='toolMap' - javaBean='new com.bbn.openmap.gui.ToolPanel()' - decorator='boxed' constraints='BorderLayout.NORTH'/> <fr.ifremer.isisfish.map.IsisMapBean id='zoneMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' selectionMode="{fr.ifremer.isisfish.map.CellSelectionLayer.MULT_SELECTION}" fisheryRegion='{getFisheryRegion()}' selectedCells='{getBean()==null?null:bean.getCell()}' decorator='boxed' constraints='BorderLayout.CENTER'/> - <!-- FIXME echatellier 20110429 : binding --> + <com.bbn.openmap.InformationDelegator id="zoneMapInfo" constraints='BorderLayout.SOUTH' /> </JPanel> </JSplitPane> </JPanel> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx 2014-04-16 15:45:15 UTC (rev 3963) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx 2014-04-17 08:16:36 UTC (rev 3964) @@ -26,24 +26,28 @@ <import> static org.nuiton.i18n.I18n.t </import> - <row> + <script><![CDATA[ + protected void $afterCompleteSetup() { + //isisMapBean.init(informationDelegator); + } + ]]></script> + <!-- <row> <cell fill="horizontal"> <com.bbn.openmap.gui.ToolPanel id="toolPanel" /> </cell> - </row> + </row> --> <row> <cell fill="both" weightx="1" weighty="1"> <fr.ifremer.isisfish.map.IsisMapBean id="isisMapBean" selectionMode="{fr.ifremer.isisfish.map.CellSelectionLayer.NO_SELECTION}"/> </cell> </row> - <!-- <row> + <row> <cell fill="horizontal"> <com.bbn.openmap.InformationDelegator id="informationDelegator" - label='{t("isisfish.simpleResult.more.information")}' - map="{getIsisMapBean()}" showLights="false" /> + showLights="false" /> </cell> - </row> --> + </row> <row> <cell fill="horizontal"> <LegendPanel id="legendPanel" /> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java 2014-04-16 15:45:15 UTC (rev 3963) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java 2014-04-17 08:16:36 UTC (rev 3964) @@ -55,11 +55,11 @@ mapRendererUI = new MapRendererUI(); // Create the directional and zoom control tool - OMToolSet resultatMapOMTS = new OMToolSet(); + //OMToolSet resultatMapOMTS = new OMToolSet(); // Associate the tool with the map - resultatMapOMTS.setupListeners(mapRendererUI.getIsisMapBean()); + //resultatMapOMTS.setupListeners(mapRendererUI.getIsisMapBean()); // Add the tool to the map toolbar - mapRendererUI.getToolPanel().add((Tool)resultatMapOMTS); + //mapRendererUI.getToolPanel().add((Tool)resultatMapOMTS); //mapRendererUI.getInformationDelegator().setMap(getIsisMapBean()); //mapRendererUI.getInformationDelegator().setShowLights(false);