Author: chatellier Date: 2009-08-25 14:05:36 +0000 (Tue, 25 Aug 2009) New Revision: 2526 Removed: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/OpenMapToolPanel.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx Log: Les hacks jaxx pour contourner les hacks faits pour swixat c'est pas indispensable... :-) Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/OpenMapToolPanel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/OpenMapToolPanel.java 2009-08-25 13:41:58 UTC (rev 2525) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/OpenMapToolPanel.java 2009-08-25 14:05:36 UTC (rev 2526) @@ -1,62 +0,0 @@ -/* - * *##% Copyright (C) 2005 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 published by the Free Software - * Foundation; either version 2 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, write to the Free Software Foundation, Inc., 59 Temple - * Place - Suite 330, Boston, MA 02111-1307, USA. ##% - */ - -package fr.ifremer.isisfish.map; - -import java.awt.Component; - -import com.bbn.openmap.gui.Tool; -import com.bbn.openmap.gui.ToolPanel; - -/** - * Hack class to permit ToolPanel work with SwiXml, because SwiXml call only - * add(Component) and not add(Tool). - * - * EC-20090825 : The hack is still used in Jaxx UI. - * - * Created: 6 septembre 2005 00:01:18 CEST - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * - * @version $Revision$ - * - * Last update: $Date$ by : $Author$ - */ -public class OpenMapToolPanel extends ToolPanel { // OpenMapToolPanel - - /** serialVersionUID. */ - private static final long serialVersionUID = -1961465978756124241L; - - protected boolean inAdd = false; - - public Component add(Component child) { - if (child instanceof Tool && !inAdd) { - inAdd = true; - try { - super.add((Tool) child); - } finally { - inAdd = false; - } - } else { - super.add(child); - } - return child; - } - -} // OpenMapToolPanel - Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-08-25 13:41:58 UTC (rev 2525) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-08-25 14:05:36 UTC (rev 2526) @@ -23,11 +23,14 @@ <fr.ifremer.isisfish.entities.CellImpl id='bean' javaBean='null'/> <script><![CDATA[ +import java.awt.event.MouseEvent; import fr.ifremer.isisfish.entities.Cell; import fr.ifremer.isisfish.entities.CellImpl; +import com.bbn.openmap.gui.Tool; import com.bbn.openmap.gui.OMToolSet; import com.bbn.openmap.event.SelectMouseMode; import fr.ifremer.isisfish.map.CellSelectionLayer; +import fr.ifremer.isisfish.map.CellSelectionLayer; import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI; protected OMToolSet toolSet = new OMToolSet(); @@ -38,7 +41,7 @@ setNextPath("$root/$zones"); cellMap.addMapMouseListener(getMapListener()); toolSet.setupListeners(cellMap); -toolMap.add((Component)toolSet); +toolMap.add((Tool)toolSet); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { @@ -82,7 +85,7 @@ if (mapListener == null){ mapListener = new OpenMapEvents(cellMap, new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) { @Override - public boolean onMouseClicked() { + public boolean mouseClicked(MouseEvent e) { for (Cell c : cellMap.getSelectedCells()) { if (getBean() != null) { if (!c.getTopiaId().equals(getBean().getTopiaId())) { @@ -187,7 +190,7 @@ </row> </Table> <JPanel id='map' layout='{new BorderLayout()}'> - <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' constraints='BorderLayout.NORTH' decorator='boxed'/> + <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' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' selectionMode="1" selectedCells='{getBean()}' fisheryRegion='{getRegion()}' constraints='BorderLayout.CENTER' decorator='boxed'/> </JPanel> </JSplitPane> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-08-25 13:41:58 UTC (rev 2525) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-08-25 14:05:36 UTC (rev 2526) @@ -25,11 +25,12 @@ <script><![CDATA[ import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.entities.FisheryRegionImpl; +import com.bbn.openmap.gui.Tool; import com.bbn.openmap.gui.OMToolSet; protected OMToolSet toolSet = new OMToolSet(); toolSet.setupListeners(cellMap); -toolMap.add((Component)toolSet); +toolMap.add((Tool)toolSet); setButtonTitle(_("isisfish.input.continueCells")); setNextPath("$root/$cells"); @@ -294,7 +295,7 @@ </row> </Table> <JPanel id='map' layout='{new BorderLayout()}'> - <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' + <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="0" javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' fisheryRegion='{getBean()}' constraints='BorderLayout.CENTER' decorator='boxed'/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.java 2009-08-25 13:41:58 UTC (rev 2525) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.java 2009-08-25 14:05:36 UTC (rev 2526) @@ -26,6 +26,7 @@ import com.bbn.openmap.event.ProjectionEvent; import com.bbn.openmap.event.SelectMouseMode; +import fr.ifremer.isisfish.map.CellSelectionLayer; import fr.ifremer.isisfish.map.IsisMapBean; /** @@ -44,6 +45,66 @@ /** 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; + + /** + * OnMouseDragged property. + * + * @deprecated as of 3.2.0.5 unused + */ + protected String onMouseDragged = null; + + /** + * OnMouseEntered property. + * + * @deprecated as of 3.2.0.5 unused + */ + protected String onMouseEntered = null; + + /** + * OnMouseExited property. + * + * @deprecated as of 3.2.0.5 unused + */ + protected String onMouseExited = null; + + /** + * OnMouseMoved property. + * + * @deprecated as of 3.2.0.5 unused + */ + protected String onMouseMoved = null; + + /** + * OnMousePressed property. + * + * @deprecated as of 3.2.0.5 unused + */ + protected String onMousePressed = null; + + /** + * OnMouseReleased property. + * + * @deprecated as of 3.2.0.5 unused + */ + protected String onMouseReleased = null; + + /** + * 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; @@ -55,26 +116,17 @@ } + @Override public void projectionChanged(ProjectionEvent e) { // do nothing, it's not reel layer } /** - * SelectMouseMode property: Null, Distance, Nav, Select - */ - protected MapMouseMode mouseMode = null; - protected IsisMapBean map = null; - protected int selectMode = 1; - - /** - * OnMouseDragged property. - */ - protected String onMouseDragged = null; - - /** * Get onMouseDragged property. * * @return OnMouseDragged property. + * + * @deprecated as of 3.2.0.5 unused */ public String getOnMouseDragged() { return this.onMouseDragged; @@ -84,20 +136,19 @@ * Set onMouseDragged property. * * @param onMouseDragged New onMouseDragged property. + * + * @deprecated as of 3.2.0.5 unused */ public void setOnMouseDragged(String onMouseDragged) { this.onMouseDragged = onMouseDragged; } /** - * OnMouseEntered property. - */ - protected String onMouseEntered = null; - - /** * Get onMouseEntered property. * * @return OnMouseEntered property. + * + * @deprecated as of 3.2.0.5 unused */ public String getOnMouseEntered() { return this.onMouseEntered; @@ -107,20 +158,19 @@ * Set onMouseEntered property. * * @param onMouseEntered New onMouseEntered property. + * + * @deprecated as of 3.2.0.5 unused */ public void setOnMouseEntered(String onMouseEntered) { this.onMouseEntered = onMouseEntered; } /** - * OnMouseExited property. - */ - protected String onMouseExited = null; - - /** * Get onMouseExited property. * * @return OnMouseExited property. + * + * @deprecated as of 3.2.0.5 unused */ public String getOnMouseExited() { return this.onMouseExited; @@ -130,20 +180,19 @@ * Set onMouseExited property. * * @param onMouseExited New onMouseExited property. + * + * @deprecated as of 3.2.0.5 unused */ public void setOnMouseExited(String onMouseExited) { this.onMouseExited = onMouseExited; } /** - * OnMouseMoved property. - */ - protected String onMouseMoved = null; - - /** * Get onMouseMoved property. * * @return OnMouseMoved property. + * + * @deprecated as of 3.2.0.5 unused */ public String getOnMouseMoved() { return this.onMouseMoved; @@ -153,20 +202,19 @@ * Set onMouseMoved property. * * @param onMouseMoved New onMouseMoved property. + * + * @deprecated as of 3.2.0.5 unused */ public void setOnMouseMoved(String onMouseMoved) { this.onMouseMoved = onMouseMoved; } /** - * OnMousePressed property. - */ - protected String onMousePressed = null; - - /** * Get onMousePressed property. * * @return OnMousePressed property. + * + * @deprecated as of 3.2.0.5 unused */ public String getOnMousePressed() { return this.onMousePressed; @@ -176,20 +224,19 @@ * Set onMousePressed property. * * @param onMousePressed New onMousePressed property. + * + * @deprecated as of 3.2.0.5 unused */ public void setOnMousePressed(String onMousePressed) { this.onMousePressed = onMousePressed; } /** - * OnMouseReleased property. - */ - protected String onMouseReleased = null; - - /** * Get onMouseReleased property. * * @return OnMouseReleased property. + * + * @deprecated as of 3.2.0.5 unused */ public String getOnMouseReleased() { return this.onMouseReleased; @@ -199,44 +246,53 @@ * Set onMouseReleased property. * * @param onMouseReleased New onMouseReleased property. + * + * @deprecated as of 3.2.0.5 unused */ public void setOnMouseReleased(String onMouseReleased) { this.onMouseReleased = onMouseReleased; } + @Override public String[] getMouseModeServiceList() { return new String[] { SelectMouseMode.modeID }; } + @Override public boolean mouseClicked(MouseEvent e) { - onMouseClicked(); 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; } - public abstract boolean onMouseClicked(); } // OpenMapEvents Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-08-25 13:41:58 UTC (rev 2525) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-08-25 14:05:36 UTC (rev 2526) @@ -27,6 +27,7 @@ import fr.ifremer.isisfish.entities.Port; import fr.ifremer.isisfish.entities.PortImpl; import fr.ifremer.isisfish.entities.Cell; +import com.bbn.openmap.gui.Tool; import com.bbn.openmap.gui.OMToolSet; import fr.ifremer.isisfish.map.CellSelectionLayer; import com.bbn.openmap.event.SelectMouseMode; @@ -37,7 +38,7 @@ boolean portChanged = true; toolSet.setupListeners(portMap); -toolMap.add((Component)toolSet); +toolMap.add((Tool)toolSet); setMapListener(); setButtonTitle(_("isisfish.input.continueSpecies")); setNextPath("$root/$species"); @@ -88,7 +89,7 @@ if (mapListener == null) { mapListener = new OpenMapEvents(portMap, new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) { @Override - public boolean onMouseClicked() { + public boolean mouseClicked(MouseEvent e) { for (Cell c : portMap.getSelectedCells()) { if (getBean() != null) { if (getBean().getCell() != null) { @@ -174,7 +175,7 @@ </row> </Table> <JPanel id='map' layout='{new BorderLayout()}'> - <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' constraints='BorderLayout.NORTH' decorator='boxed'/> + <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='portMap' selectedCells='{getBean().getCell()}' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' constraints='BorderLayout.CENTER' selectionMode="1" decorator='boxed' fisheryRegion='{getRegion()}'/> </JPanel> </JSplitPane> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-08-25 13:41:58 UTC (rev 2525) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-08-25 14:05:36 UTC (rev 2526) @@ -28,13 +28,14 @@ import fr.ifremer.isisfish.entities.ZoneImpl; import fr.ifremer.isisfish.map.CellSelectionLayer; import com.bbn.openmap.event.SelectMouseMode; +import com.bbn.openmap.gui.Tool; import com.bbn.openmap.gui.OMToolSet; protected OMToolSet toolSet = new OMToolSet(); protected OpenMapEvents mapListener = null; toolSet.setupListeners(zoneMap); -toolMap.add((Component)toolSet); +toolMap.add((Tool)toolSet); zoneMap.addMapMouseListener(getMapListener()); setButtonTitle(_("isisfish.input.continuePorts")); setNextPath("$root/$ports"); @@ -96,7 +97,7 @@ if (mapListener == null) { mapListener = new OpenMapEvents(zoneMap, new SelectMouseMode(false), CellSelectionLayer.MULT_SELECTION) { @Override - public boolean onMouseClicked() { + public boolean mouseClicked(MouseEvent e) { getBean().setCell(zoneMap.getSelectedCells()); if (getBean().getCell() != null){ zoneCells.setSelectedValues(getBean().getCell().toArray()); @@ -184,8 +185,8 @@ </row> </Table> <JPanel id='map' layout='{new BorderLayout()}'> - <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' - javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' + <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'
participants (1)
-
chatellier＠users.labs.libre-entreprise.org