Author: chatellier Date: 2010-12-10 15:38:47 +0000 (Fri, 10 Dec 2010) New Revision: 392 Log: Add openmap toolbar Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-12-10 15:18:00 UTC (rev 391) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-12-10 15:38:47 UTC (rev 392) @@ -512,6 +512,7 @@ SelectionHandler handler = new SelectionHandler(); selectionView.setHandler(handler); + handler.initMapToolBar(selectionView.getSelectionDetailsTab()); handler.initSelection(selectionView); // restore session size @@ -553,6 +554,7 @@ SelectionHandler handler = new SelectionHandler(); selectionView.setHandler(handler); + handler.initMapToolBar(selectionView.getSelectionDetailsTab()); handler.reloadSelection(selectionView); // restore session size @@ -618,7 +620,7 @@ SelectionHandler handler = new SelectionHandler(); selectionView.setHandler(handler); - + handler.initMapToolBar(selectionView.getSelectionDetailsTab()); // FIXME chatellier 20101126 il faut faire un mix de init && reload handler.initSelection(selectionView); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-12-10 15:18:00 UTC (rev 391) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-12-10 15:38:47 UTC (rev 392) @@ -260,8 +260,8 @@ <CardLayout id="detailDecisionPanelLayout" /> <JPanel id="detailDecisionPanel" layout="{detailDecisionPanelLayout}"> <JPanel layout="{new BorderLayout()}" constraints='"ZONEMAP"'> - <com.bbn.openmap.gui.ToolPanel id='toolMap' javaBean='new com.bbn.openmap.gui.ToolPanel()' constraints='BorderLayout.NORTH' /> - <fr.ifremer.coser.ui.maps.CoserMap constraints='BorderLayout.CENTER' /> + <com.bbn.openmap.gui.ToolPanel id='strataMapToolBar' javaBean='new com.bbn.openmap.gui.ToolPanel()' constraints='BorderLayout.NORTH' /> + <fr.ifremer.coser.ui.maps.CoserMap id="strataMap" constraints='BorderLayout.CENTER' /> </JPanel> <JScrollPane constraints='"SPECIESDATA"'> <org.nuiton.math.matrix.gui.MatrixPanelEditor id="matrixPanelEditor" /> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-12-10 15:18:00 UTC (rev 391) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-12-10 15:38:47 UTC (rev 392) @@ -61,6 +61,9 @@ import org.nuiton.math.matrix.gui.MatrixTableModelND; import org.nuiton.widget.SwingSession; +import com.bbn.openmap.gui.OMToolSet; +import com.bbn.openmap.gui.Tool; + import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.CoserException; import fr.ifremer.coser.bean.Project; @@ -258,6 +261,17 @@ } /** + * Link map toolbar with map. + * + * @param view view + */ + public void initMapToolBar(SelectionDetailsView view) { + OMToolSet toolSet = new OMToolSet(); + toolSet.setupListeners(view.getStrataMap()); + view.getStrataMapToolBar().add((Tool)toolSet); + } + + /** * Appellé lorsque la selection de la liste des zones a changé. * * @param view view