[Isis-fish-commits] r1967 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui/input java/fr/ifremer/isisfish/ui/sensitivity resources

Author: sletellier Date: 2009-03-16 08:41:59 +0000 (Mon, 16 Mar 2009) New Revision: 1967 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/EffortDescriptionUI.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/GearTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java isis-fish/trunk/src/main/resources/sensitivity.properties Log: All factors are enabled 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-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -133,7 +133,7 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldCellName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getName())}' decorator='boxed' - _bean='{CellImpl.class}' _method='"Name"' onKeyReleased='getBean().setName(fieldCellName.getText())' enabled='{isActif()}'/> + onKeyReleased='getBean().setName(fieldCellName.getText())' enabled='{isActif()}'/> </cell> </row> <row> @@ -141,7 +141,7 @@ <JLabel text="isisfish.cell.latitude" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldCellLatitude" text='{getBean().getLatitude()}' editable="false" enabled='{isActif()}' decorator='boxed' _bean='{CellImpl.class}' _method='"Latitude"'/> + <JTextField id="fieldCellLatitude" text='{getBean().getLatitude()}' editable="false" enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -149,7 +149,7 @@ <JLabel text="isisfish.cell.longitude" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldCellLongitude" text='{getBean().getLongitude()}' editable="false" enabled='{isActif()}' decorator='boxed' _bean='{CellImpl.class}' _method='"Longitude"'/> + <JTextField id="fieldCellLongitude" text='{getBean().getLongitude()}' editable="false" enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -157,7 +157,7 @@ <JLabel text="isisfish.cell.land" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JCheckBox id="fieldCellLand" onActionPerformed='getBean().setLand(fieldCellLand.isSelected())' enabled='{isActif()}' selected='{getBean().getLand()}' decorator='boxed' _bean='{CellImpl.class}' _method='"Land"'/> + <JCheckBox id="fieldCellLand" onActionPerformed='getBean().setLand(fieldCellLand.isSelected())' enabled='{isActif()}' selected='{getBean().getLand()}' decorator='boxed'/> </cell> </row> <row> @@ -168,22 +168,22 @@ <row> <cell columns='2' fill='both' weighty='1.0' weightx='1.0'> <JScrollPane> - <JTextArea id="fieldCellComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldCellComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{CellImpl.class}' _method='"Comment"'/> + <JTextArea id="fieldCellComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldCellComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save' text='isisfish.common.save'/> + <JButton id='save' text='isisfish.common.save' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' text='isisfish.common.cancel'/> + <JButton id='cancel' text='isisfish.common.cancel' decorator='boxed'/> </cell> </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'/> - <fr.ifremer.isisfish.map.IsisMapBean id='cellMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' selectionMode="1" selectedCells='{getBean()}' fisheryRegion='{getRegion()}' constraints='BorderLayout.CENTER'/> + <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' 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> </JPanel> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -230,13 +230,13 @@ <Table> <row> <cell fill='horizontal' weightx='0.3'> - <JButton id='save'/> + <JButton id='save' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.3'> - <JButton id='cancel'/> + <JButton id='cancel' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.3'> - <JButton id='remove' text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}'/> + <JButton id='remove' text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}' decorator='boxed'/> </cell> </row> </Table> 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-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -134,7 +134,6 @@ <row> <cell columns='3' fill='horizontal' weightx='1.0'> <JTextField id="fieldRegion" decorator='boxed' - _bean='{FisheryRegionImpl.class}' _method='"Name"' text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getName())}' onKeyReleased='getBean().setName(fieldRegion.getText())'/> </cell> @@ -150,7 +149,7 @@ </cell> <cell columns='2' fill='horizontal' weightx='1.0'> <JTextField id="fieldLatMin" text='{getBean().getMinLatitude()}' decorator='boxed' - _bean='{FisheryRegionImpl.class}' _method='"MinLatitude"' onKeyReleased='getBean().setMinLatitude(Float.parseFloat(fieldLatMin.getText()))'/> + onKeyReleased='getBean().setMinLatitude(Float.parseFloat(fieldLatMin.getText()))'/> </cell> </row> <row> @@ -159,7 +158,7 @@ </cell> <cell columns='2' fill='horizontal' weightx='1.0'> <JTextField id="fieldLatMax" text='{getBean().getMaxLatitude()}' decorator='boxed' - _bean='{FisheryRegionImpl.class}' _method='"MaxLatitude"' onKeyReleased='getBean().setMaxLatitude(Float.parseFloat(fieldLatMax.getText()))'/> + onKeyReleased='getBean().setMaxLatitude(Float.parseFloat(fieldLatMax.getText()))'/> </cell> </row> <row> @@ -168,7 +167,7 @@ </cell> <cell columns='2' fill='horizontal' weightx='1.0'> <JTextField id="fieldLongMin" text='{getBean().getMinLongitude()}' decorator='boxed' - _bean='{FisheryRegionImpl.class}' _method='"MinLongitude"' onKeyReleased='getBean().setMinLongitude(Float.parseFloat(fieldLongMin.getText()))'/> + onKeyReleased='getBean().setMinLongitude(Float.parseFloat(fieldLongMin.getText()))'/> </cell> </row> <row> @@ -177,7 +176,7 @@ </cell> <cell columns='2' fill='horizontal' weightx='1.0'> <JTextField id="fieldLongMax" text='{getBean().getMaxLongitude()}' decorator='boxed' - _bean='{FisheryRegionImpl.class}' _method='"MaxLongitude"' onKeyReleased='getBean().setMaxLongitude(Float.parseFloat(fieldLongMax.getText()))'/> + onKeyReleased='getBean().setMaxLongitude(Float.parseFloat(fieldLongMax.getText()))'/> </cell> </row> <row> @@ -191,7 +190,7 @@ </cell> <cell columns='2' fill='horizontal' weightx='1.0'> <JTextField id="fieldCellLengthLatitude" text='{getBean().getCellLengthLatitude()}' decorator='boxed' - _bean='{FisheryRegionImpl.class}' _method='"CellLengthLatitude"' onKeyReleased='getBean().setCellLengthLatitude(Float.parseFloat(fieldCellLengthLatitude.getText()))'/> + onKeyReleased='getBean().setCellLengthLatitude(Float.parseFloat(fieldCellLengthLatitude.getText()))'/> </cell> </row> <row> @@ -200,13 +199,13 @@ </cell> <cell columns='2' fill='horizontal' weightx='1.0'> <JTextField id="fieldCellLengthLongitude" text='{getBean().getCellLengthLongitude()}' decorator='boxed' - _bean='{FisheryRegionImpl.class}' _method='"CellLengthLongitude"' onKeyReleased='getBean().setCellLengthLongitude(Float.parseFloat(fieldCellLengthLongitude.getText()))'/> + onKeyReleased='getBean().setCellLengthLongitude(Float.parseFloat(fieldCellLengthLongitude.getText()))'/> </cell> </row> <row> <cell columns='3' fill='both' weightx='1.0' weighty='0.6'> <JScrollPane> - <JList id="fieldMapfiles" onMouseClicked='mapFieldChanged()'/> + <JList id="fieldMapfiles" onMouseClicked='mapFieldChanged()' decorator='boxed'/> </JScrollPane> </cell> </row> @@ -215,10 +214,10 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id="buttonAddMap" text="isisfish.fisheryRegion.addMap" onActionPerformed='addMap()'/> + <JButton id="buttonAddMap" text="isisfish.fisheryRegion.addMap" onActionPerformed='addMap()' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id="buttonRemoveMap" text="isisfish.fisheryRegion.delMap" onActionPerformed='delMap()'/> + <JButton id="buttonRemoveMap" text="isisfish.fisheryRegion.delMap" onActionPerformed='delMap()' decorator='boxed'/> </cell> </row> </Table> @@ -233,7 +232,7 @@ <cell columns='3' fill='both' weightx='1.0' weighty='0.4'> <JScrollPane> <JTextArea id="fieldComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' decorator='boxed' - _bean='{FisheryRegionImpl.class}' _method='"Comment"' onKeyReleased='getBean().setComment(fieldComment.getText())'/> + onKeyReleased='getBean().setComment(fieldComment.getText())'/> </JScrollPane> </cell> </row> @@ -252,10 +251,10 @@ <Table> <row> <cell columns='4' fill='horizontal' weightx='1.0'> - <JTextField id="fieldCellFile" onKeyReleased='cellFillChanged()'/> + <JTextField id="fieldCellFile" onKeyReleased='cellFillChanged()' decorator='boxed'/> </cell> <cell> - <JButton id="buttonCellFile" text="isisfish.common.ellipsis" onActionPerformed='cellFile()'/> + <JButton id="buttonCellFile" text="isisfish.common.ellipsis" onActionPerformed='cellFile()' decorator='boxed'/> </cell> </row> </Table> @@ -263,19 +262,19 @@ </row> <row> <cell fill='horizontal' weightx='0.3'> - <JButton id='save' enabled='false' onActionPerformed='save()'/> + <JButton id='save' enabled='false' onActionPerformed='save()' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.3'> - <JButton id='cancel'/> + <JButton id='cancel' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.3'> - <JButton id='check' text="isisfish.common.check" onActionPerformed='check()'/> + <JButton id='check' text="isisfish.common.check" onActionPerformed='check()' decorator='boxed'/> </cell> </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'/> - <fr.ifremer.isisfish.map.IsisMapBean id='cellMap' selectionMode="0" javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' fisheryRegion='{getBean()}' constraints='BorderLayout.CENTER'/> + <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' 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'/> </JPanel> </JSplitPane> </JPanel> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -83,7 +83,7 @@ <JLabel text="isisfish.gear.name" enabled='{isActif()}'/> </cell> <cell columns="2" fill='horizontal' weightx='1.0'> - <JTextField id="fieldGearName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldGearName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"Name"'/> + <JTextField id="fieldGearName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldGearName.getText())' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -115,7 +115,7 @@ <JLabel text="isisfish.gear.rangeValues" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <RangeOfValuesUI id="rangeOfValues" actif='{isActif()}' constructorParams='{this}'/> + <RangeOfValuesUI id="rangeOfValues" actif='{isActif()}' constructorParams='this'/> </cell> </row> <row> @@ -124,7 +124,7 @@ </cell> <cell columns="2" fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldGearComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldGearComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"Comment"'/> + <JTextArea id="fieldGearComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldGearComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell> </row> @@ -136,18 +136,18 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save'/> + <JButton id='save' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel'/> + <JButton id='cancel' decorator='boxed'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create'/> + <JButton id='create' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='remove'/> + <JButton id='remove' decorator='boxed'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -39,6 +39,7 @@ <script><![CDATA[ import fr.ifremer.isisfish.entities.Metier; +import fr.ifremer.isisfish.entities.GearImpl; import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; getVerifier().addCurrentPanel(this); @@ -56,7 +57,7 @@ <JPanel id='body' layout='{new BorderLayout()}'> <JTabbedPane constraints='BorderLayout.CENTER' id="gearTab" name="Gear"> <tab title='{_("isisfish.gear.title")}'><GearTabUI id="gearTabUI" constructorParams='this'/></tab> - <tab title='{_("isisfish.selectivity.title")}'><SelectivityUI id="selectivityUI" constructorParams='this'/></tab> + <tab title='{_("isisfish.selectivity.title")}'><SelectivityUI id="selectivityUI" constructorParams='this' decorator='boxed' _bean='{GearImpl.class}' _method='"PopulationSelectivity"'/></tab> </JTabbedPane> </JPanel> </fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -78,16 +78,18 @@ } } -protected void accept(ActionEvent e) { - JComponent source = (JComponent) e.getSource(); - FactorWizard wizard = new FactorWizard(this); - Class classBean = (Class)source.getClientProperty("bean"); + protected void accept(ActionEvent e) { + JComponent source = (JComponent) e.getSource(); + Class classBean = (Class)source.getClientProperty("bean"); + TopiaEntity bean = getVerifier().getEntity(classBean); + if (bean != null){ + FactorWizard wizard = new FactorWizard(this); - TopiaEntity bean = getVerifier().getEntity(classBean); - wizard.initNew(source, bean, EditorHelper.canBeContinue(source, bean)); - wizard.pack(); - wizard.setVisible(true); -} + wizard.initNew(source, bean, EditorHelper.canBeContinue(source, bean)); + wizard.pack(); + wizard.setVisible(true); + } + } ]]> </script> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -206,7 +206,7 @@ <JLabel text="isisfish.metierSeasonInfoZone.season" enabled='{isMetierSeasonInfoNotNull()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <IntervalPanel id='ip' enabled='{isMetierSeasonInfoNotNull()}'/> + <IntervalPanel id='ip' enabled='{isMetierSeasonInfoNotNull()}' decorator='boxed' _bean='{MetierImpl.class}' _method='"Interval"'/> </cell> </row> <row> @@ -215,7 +215,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.7'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JList id="metierZones" onValueChanged='metierZonesChanged()' enabled='{isMetierSeasonInfoNotNull()}'/> + <JList id="metierZones" onValueChanged='metierZonesChanged()' enabled='{isMetierSeasonInfoNotNull()}' decorator='boxed' _bean='{MetierImpl.class}' _method='"Zone"'/> </JScrollPane> </cell> </row> @@ -225,7 +225,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JTextArea id="fieldMetierSeasonZoneComment" text='{getMetierSeasonInfo() == null ? "" : jaxx.runtime.SwingUtil.getStringValue(getMetierSeasonInfo().getSeasonZoneComment())}' onKeyReleased='getMetierSeasonInfo().setSeasonZoneComment(fieldMetierSeasonZoneComment.getText())' enabled='{isMetierSeasonInfoNotNull()}' decorator='boxed' _bean='{MetierSeasonInfo.class}' _method='"SeasonZoneComment"'/> + <JTextArea id="fieldMetierSeasonZoneComment" text='{getMetierSeasonInfo() == null ? "" : jaxx.runtime.SwingUtil.getStringValue(getMetierSeasonInfo().getSeasonZoneComment())}' onKeyReleased='getMetierSeasonInfo().setSeasonZoneComment(fieldMetierSeasonZoneComment.getText())' enabled='{isMetierSeasonInfoNotNull()}' decorator='boxed'/> </JScrollPane> </cell> </row> @@ -237,18 +237,18 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save'/> + <JButton id='save' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel'/> + <JButton id='cancel' decorator='boxed'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create'/> + <JButton id='create' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='remove'/> + <JButton id='remove' decorator='boxed'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -100,7 +100,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='1.0'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JTextArea id="fieldMetierComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldMetierComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{MetierImpl.class}' _method='"Comment"'/> + <JTextArea id="fieldMetierComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldMetierComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell> </row> @@ -112,18 +112,18 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save'/> + <JButton id='save' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel'/> + <JButton id='cancel' decorator='boxed'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create'/> + <JButton id='create' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='remove'/> + <JButton id='remove' decorator='boxed'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -39,6 +39,7 @@ <script><![CDATA[ import fr.ifremer.isisfish.entities.TripType; import fr.ifremer.isisfish.entities.MetierImpl; +import fr.ifremer.isisfish.entities.MetierSeasonInfoImpl; import fr.ifremer.isisfish.entities.Metier; import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; @@ -58,7 +59,7 @@ <JTabbedPane id="metierTab" name="Metier" constraints='BorderLayout.CENTER' > <tab title='{_("isisfish.metier.title")}'><MetierTabUI id="metierTabUI" constructorParams='this'/></tab> <tab title='{_("isisfish.metierSeasonInfoZone.title")}'><MetierSeasonInfoZoneUI id="metierSeasonInfoUI" constructorParams='this'/></tab> - <tab title='{_("isisfish.metierSeasonInfoSpecies.title")}'><MetierSeasonInfoSpeciesUI id="metierSeasonSpeciesUI" constructorParams='this'/></tab> + <tab title='{_("isisfish.metierSeasonInfoSpecies.title")}'><MetierSeasonInfoSpeciesUI id="metierSeasonSpeciesUI" constructorParams='this' decorator='boxed' _bean='{MetierSeasonInfoImpl.class}' _method='"SpeciesTargetSpecies"'/></tab> </JTabbedPane> </JPanel> </fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -149,7 +149,7 @@ <JLabel text="isisfish.populationBasics.name" enabled='{isActif()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationBasicsName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldPopulationBasicsName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"Name"'/> + <JTextField id="fieldPopulationBasicsName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldPopulationBasicsName.getText())' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -157,7 +157,7 @@ <JLabel text="isisfish.populationBasics.geographicID" enabled='{isActif()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationBasicsGeographicID" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGeographicId())}' onKeyReleased='getBean().setGeographicId(fieldPopulationBasicsGeographicID.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"GeographicId"'/> + <JTextField id="fieldPopulationBasicsGeographicID" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGeographicId())}' onKeyReleased='getBean().setGeographicId(fieldPopulationBasicsGeographicID.getText())' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -165,10 +165,10 @@ <JLabel text="isisfish.populationBasics.numberGroup" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JTextField id="fieldPopulationBasicsNbClasses" text='{getBean() == null ? "" : getBean().sizePopulationGroup()}' editable="false" enabled='{isActif()}'/> + <JTextField id="fieldPopulationBasicsNbClasses" text='{getBean() == null ? "" : getBean().sizePopulationGroup()}' editable="false" enabled='{isActif()}' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id="buttonPopulationBasicsCreateClasses" text="isisfish.populationBasics.recreateClasses" onActionPerformed='createClasses()' enabled='{isActif()}'/> + <JButton id="buttonPopulationBasicsCreateClasses" text="isisfish.populationBasics.recreateClasses" onActionPerformed='createClasses()' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -176,7 +176,7 @@ <JLabel text="isisfish.populationBasics.maturityGroup" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JComboBox id="fieldPopulationBasicsMatureClass" onActionPerformed='matureClassChanged()' enabled='{isActif()}'/> + <JComboBox id="fieldPopulationBasicsMatureClass" onActionPerformed='matureClassChanged()' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MaturityGroup"'/> </cell> <cell fill='horizontal' weightx='0.5'> <JCheckBox id="fieldPopulationBasicsPlusGroup" text="isisfish.populationBasics.plusGroup" selected='{getBean().getPlusGroup()}' onActionPerformed='getBean().setPlusGroup(fieldPopulationBasicsPlusGroup.isSelected())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"PlusGroup"'/> @@ -184,7 +184,7 @@ </row> <row> <cell columns='3' fill='both' weightx='1.0'> - <JTable id='tableAgeLength' rowHeight='24' enabled='{isActif()}'/> + <JTable id='tableAgeLength' rowHeight='24' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -211,7 +211,7 @@ </cell> <cell columns='2' fill='both' weightx='1.0' weighty='0.2'> <JScrollPane> - <JTextArea id="fieldPopulationBasicsComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPopulationBasicsComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"Comment"'/> + <JTextArea id="fieldPopulationBasicsComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPopulationBasicsComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell> </row> @@ -229,18 +229,18 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save'/> + <JButton id='save' decorator='boxed' /> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel'/> + <JButton id='cancel' decorator='boxed' /> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create' onActionPerformed='create()'/> + <JButton id='create' onActionPerformed='create()' decorator='boxed' /> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='remove'/> + <JButton id='remove' decorator='boxed' /> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -103,16 +103,16 @@ <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldPopulationCapturabilityComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getCapturabilityComment())}' onKeyReleased='getBean().setCapturabilityComment(fieldPopulationCapturabilityComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"CapturabilityComment"'/> + <JTextArea id="fieldPopulationCapturabilityComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getCapturabilityComment())}' onKeyReleased='getBean().setCapturabilityComment(fieldPopulationCapturabilityComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save'/> + <JButton id='save' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel'/> + <JButton id='cancel' decorator='boxed'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -117,7 +117,7 @@ <JLabel text="isisfish.populationGroup.meanWeigth" enabled='{isPopGroupNotNull()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationGroupMeanWeight" text='{getPopulationGroup().getMeanWeight()}' editable='{false}' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"MeanWeight"'/> + <JTextField id="fieldPopulationGroupMeanWeight" text='{getPopulationGroup().getMeanWeight()}' editable='{false}' enabled='{isPopGroupNotNull()}' _bean='{PopulationGroupImpl.class}' _method='"MeanWeight"'/> </cell> </row> <row> @@ -169,7 +169,7 @@ </cell> <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> <JScrollPane> - <JTextArea id="fieldPopulationGroupComment" text='{jaxx.runtime.SwingUtil.getStringValue(getPopulationGroup().getComment())}' onKeyReleased='getPopulationGroup().setComment(fieldPopulationGroupComment.getText())' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"Comment"'/> + <JTextArea id="fieldPopulationGroupComment" text='{jaxx.runtime.SwingUtil.getStringValue(getPopulationGroup().getComment())}' onKeyReleased='getPopulationGroup().setComment(fieldPopulationGroupComment.getText())' enabled='{isPopGroupNotNull()}' decorator='boxed'/> </JScrollPane> </cell> </row> @@ -178,10 +178,10 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save'/> + <JButton id='save' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel'/> + <JButton id='cancel' decorator='boxed'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -100,13 +100,15 @@ public void refresh(){ Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); - + refreshPanel(); + } + public void refreshPanel(){ setFieldPopulationMigrationMigrationGroupChooserModel(); setFieldPopulationMigrationMigrationDepartureZoneChooserModel(); remove.setEnabled(false); setAddButton(); - + populationMigrationEmigrationTable.addMatrixListener(new MatrixPanelListener() { @Override public void matrixChanged(MatrixPanelEvent arg0) { @@ -200,7 +202,7 @@ </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationEmigrationTable' linearModel="true" matrix='{getPopInfo().getEmigrationMatrix().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"EmigrationMatrix"'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationEmigrationTable' linearModel="true" matrix='{getPopInfo().getEmigrationMatrix().copy()}' enabled='{isActif()}'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -111,6 +111,10 @@ public void refresh(){ Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); + + refreshPanel(); +} +public void refreshPanel(){ setFieldPopulationMigrationMigrationGroupChooserModel(); setFieldPopulationMigrationMigrationArrivalZoneChooserModel(); @@ -194,7 +198,7 @@ </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationImmigrationTable' linearModel="true" matrix='{getPopInfo().getImmigrationMatrix().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"ImmigrationMatrix"'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationImmigrationTable' linearModel="true" matrix='{getPopInfo().getImmigrationMatrix().copy()}' enabled='{isActif()}'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -111,7 +111,9 @@ public void refresh(){ Population population = getVerifier().getEntity(Population.class); setBean((PopulationImpl) population); - + refreshPanel(); +} +public void refreshPanel(){ setFieldPopulationMigrationMigrationGroupChooserModel(); setFieldPopulationMigrationMigrationDepartureZoneChooserModel(); setFieldPopulationMigrationMigrationArrivalZoneChooserModel(); @@ -211,7 +213,7 @@ </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationMigrationTable' linearModel="true" matrix='{getPopInfo().getMigrationMatrix().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"MigrationMatrix"'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationMigrationTable' linearModel="true" matrix='{getPopInfo().getMigrationMatrix().copy()}' enabled='{isActif()}'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -129,7 +129,7 @@ </row> <row> <cell columns='2' anchor='west'> - <JCheckBox id="fieldUseEquationMigration" selected='{getPopInfo() == null ? true : getPopInfo().getUseEquationMigration()}' text="isisfish.populationMigration.useEquation" onActionPerformed='useEquationChanged()' enabled='{isActif()}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"UseEquationMigration"'/> + <JCheckBox id="fieldUseEquationMigration" selected='{getPopInfo() == null ? true : getPopInfo().getUseEquationMigration()}' text="isisfish.populationMigration.useEquation" onActionPerformed='useEquationChanged()' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -137,9 +137,9 @@ <JPanel id="hidablePanel" layout='{new CardLayout()}'> <PopulationMigrationEquationUI id='populationMigrationEquationUI' constraints='"fieldUseEquation"' constructorParams='this'/> <JTabbedPane id="fieldUseMatrix" constraints='"fieldUseMatrix"'> - <tab title='{_("isisfish.populationMigrationMigration.title")}'><PopulationMigrationMigrationUI id="populationMigrationMigrationUI" constructorParams='this'/></tab> - <tab title='{_("isisfish.populationMigrationImmigration.title")}'><PopulationMigrationImmigrationUI id="populationMigrationImmigrationUI" constructorParams='this'/></tab> - <tab title='{_("isisfish.populationMigrationEmigration.title")}'><PopulationMigrationEmigrationUI id="populationMigrationEmigrationUI" constructorParams='this'/></tab> + <tab title='{_("isisfish.populationMigrationMigration.title")}'><PopulationMigrationMigrationUI id="populationMigrationMigrationUI" constructorParams='this' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"MigrationMatrix"'/></tab> + <tab title='{_("isisfish.populationMigrationImmigration.title")}'><PopulationMigrationImmigrationUI id="populationMigrationImmigrationUI" constructorParams='this' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"ImmigrationMatrix"'/></tab> + <tab title='{_("isisfish.populationMigrationEmigration.title")}'><PopulationMigrationEmigrationUI id="populationMigrationEmigrationUI" constructorParams='this' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"EmigrationMatrix"'/></tab> </JTabbedPane> </JPanel> </cell> @@ -150,7 +150,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane> - <JTextArea id="fieldPopulationMigrationComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getMigrationComment())}' onKeyReleased='getBean().setMigrationComment(fieldPopulationMigrationComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MigrationComment"'/> + <JTextArea id="fieldPopulationMigrationComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getMigrationComment())}' onKeyReleased='getBean().setMigrationComment(fieldPopulationMigrationComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell> </row> @@ -159,10 +159,10 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save'/> + <JButton id='save' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel'/> + <JButton id='cancel' decorator='boxed'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -121,7 +121,7 @@ <JPanel/> </cell> <cell fill='horizontal' weightx='1.0'> - <JButton id="create" text="isisfish.common.newMatrix" onActionPerformed='getAction().createRecruitmentDistribution(getBean())' enabled='{isActif()}'/> + <JButton id="create" text="isisfish.common.newMatrix" onActionPerformed='getAction().createRecruitmentDistribution(getBean())' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -130,7 +130,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.5'> <JScrollPane> - <JTextArea id="fieldPopulationRecruitmentComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getRecruitmentComment())}' onKeyReleased='getBean().setRecruitmentComment(fieldPopulationRecruitmentComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"RecruitmentComment"'/> + <JTextArea id="fieldPopulationRecruitmentComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getRecruitmentComment())}' onKeyReleased='getBean().setRecruitmentComment(fieldPopulationRecruitmentComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell> </row> @@ -142,10 +142,10 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save'/> + <JButton id='save' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel'/> + <JButton id='cancel' decorator='boxed'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -226,6 +226,7 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JCheckBox id="fieldPopulationSeasonGroupChange" text="isisfish.populationSeasons.changeGroup" selected='{getPopulationSeasonInfo().getGroupChange()}' + decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"GroupChange"' onActionPerformed='seasonGroupChanged()' enabled='{isPopSeasonInfoNotNull()}'/> </cell> </row> @@ -234,7 +235,9 @@ <JLabel text="isisfish.populationSeasons.distributionSpawning" enabled='{isPopSeasonInfoNotNull()}'/> </cell> <cell fill='both' weightx='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationSeasonReproductionDistribution' matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix()}' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"LengthChangeMatrix"'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationSeasonReproductionDistribution' + matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix()}' enabled='{isPopSeasonInfoNotNull()}' + decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"LengthChangeMatrix"'/> </cell> </row> <row> @@ -243,7 +246,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldPopulationSeasonComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getSeasonsComment())}' onKeyReleased='getBean().setSeasonsComment(fieldPopulationSeasonComment.getText())' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"SeasonsComment"'/> + <JTextArea id="fieldPopulationSeasonComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getSeasonsComment())}' onKeyReleased='getBean().setSeasonsComment(fieldPopulationSeasonComment.getText())' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed'/> </JScrollPane> </cell> </row> @@ -255,18 +258,18 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save'/> + <JButton id='save' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel'/> + <JButton id='cancel' decorator='boxed'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create'/> + <JButton id='create' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='remove'/> + <JButton id='remove' decorator='boxed'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -72,7 +72,7 @@ <PopulationEquationUI id='populationEquationUI' constructorParams='this'/> </tab> <tab title='{_("isisfish.populationZones.title")}'> - <PopulationZonesUI id='populationZoneUI' constructorParams='this'/> + <PopulationZonesUI id='populationZoneUI' constructorParams='this' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MappingZoneReproZoneRecru"'/> </tab> <tab title='{_("isisfish.populationSeasons.title")}'> <PopulationSeasonsUI id='populationSeasonsUI' constructorParams='this'/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -199,7 +199,7 @@ </row> <row> <cell columns='3' fill='both' weightx='1.0' weighty='0.5'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationMappingZoneReproZoneRecru' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MappingZoneReproZoneRecru"'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationMappingZoneReproZoneRecru' enabled='{isActif()}'/> </cell> </row> <row> 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-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -144,7 +144,7 @@ </row> <row> <cell columns='2' fill='horizontal' weightx='1.0' > - <JTextField id="fieldPortName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldPortName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PortImpl.class}' _method='"Name"'/> + <JTextField id="fieldPortName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldPortName.getText())' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -168,30 +168,30 @@ <row> <cell columns='2' fill='both' weighty='0.3' weightx='1.0' > <JScrollPane> - <JTextArea id="fieldPortComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPortComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PortImpl.class}' _method='"Comment"'/> + <JTextArea id="fieldPortComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPortComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save'/> + <JButton id='save' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel'/> + <JButton id='cancel' decorator='boxed'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create'/> + <JButton id='create' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='remove'/> + <JButton id='remove' decorator='boxed'/> </cell> </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'/> - <fr.ifremer.isisfish.map.IsisMapBean id='portMap' selectedCells='{getBean().getCell()}' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' constraints='BorderLayout.CENTER' selectionMode="1" decorator='boxed' _bean='{PortImpl.class}' _method='"Cell"'/> + <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' 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'/> </JPanel> </JSplitPane> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -96,7 +96,7 @@ <JLabel text="isisfish.setOfVessels.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldSetOfVesselsName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldSetOfVesselsName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"Name"'/> + <JTextField id="fieldSetOfVesselsName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldSetOfVesselsName.getText())' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -104,7 +104,7 @@ <JLabel text="isisfish.common.port" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldSetOfVesselsPort" onActionPerformed='portChanged()' enabled='{isActif()}'/> + <JComboBox id="fieldSetOfVesselsPort" onActionPerformed='portChanged()' enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"Port"'/> </cell> </row> <row> @@ -112,7 +112,7 @@ <JLabel text="isisfish.setOfVessels.vesselType" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldSetOfVesselsVesselType" onActionPerformed='vesselTypeChanged()' enabled='{isActif()}'/> + <JComboBox id="fieldSetOfVesselsVesselType" onActionPerformed='vesselTypeChanged()' enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"VesselType"'/> </cell> </row> <row> @@ -148,7 +148,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane> - <JTextArea id="fieldSetOfVesselsComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldSetOfVesselsComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"Comment"'/> + <JTextArea id="fieldSetOfVesselsComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldSetOfVesselsComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell> </row> @@ -160,18 +160,18 @@ <Table> <row> <cell fill='horizontal' weightx='1.0'> - <JButton id='save'/> + <JButton id='save' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JButton id='cancel'/> + <JButton id='cancel' decorator='boxed'/> </cell> </row> <row> <cell fill='horizontal' weightx='1.0'> - <JButton id='create'/> + <JButton id='create' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JButton id='remove'/> + <JButton id='remove' decorator='boxed'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -84,7 +84,7 @@ <JLabel text="isisfish.species.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' columns='2' weightx='1.0'> - <JTextField id="fieldSpeciesName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldSpeciesName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"Name"'/> + <JTextField id="fieldSpeciesName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldSpeciesName.getText())' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -128,7 +128,7 @@ </cell> <cell fill='both' columns='2' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldSpeciesComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldSpeciesComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"Comment"'/> + <JTextArea id="fieldSpeciesComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldSpeciesComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell> </row> @@ -140,18 +140,18 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save'/> + <JButton id='save' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel'/> + <JButton id='cancel' decorator='boxed'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create'/> + <JButton id='create' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='delete'/> + <JButton id='delete' decorator='boxed'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -108,10 +108,10 @@ <Table constraints='BorderLayout.SOUTH'> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save'/> + <JButton id='save' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel'/> + <JButton id='cancel' decorator='boxed'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -128,7 +128,7 @@ </row> <row> <cell columns='2' fill='horizontal' weightx='1.0'> - <JComboBox id="fieldStrategyMonthInfoTripType" onActionPerformed='getStrategyMonthInfo().setTripType((TripType)fieldStrategyMonthInfoTripType.getSelectedItem())' enabled='{isActif()}'/> + <JComboBox id="fieldStrategyMonthInfoTripType" onActionPerformed='getStrategyMonthInfo().setTripType((TripType)fieldStrategyMonthInfoTripType.getSelectedItem())' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -96,7 +96,7 @@ <JLabel text="isisfish.strategy.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldStrategyName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldStrategyName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"Name"'/> + <JTextField id="fieldStrategyName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldStrategyName.getText())' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -104,7 +104,7 @@ <JLabel text="isisfish.common.setOfVessels" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JComboBox id="fieldStrategySetOfVessels" onActionPerformed='getBean().setSetOfVessels((SetOfVessels)fieldStrategySetOfVessels.getSelectedItem())' enabled='{isActif()}'/> + <JComboBox id="fieldStrategySetOfVessels" onActionPerformed='getBean().setSetOfVessels((SetOfVessels)fieldStrategySetOfVessels.getSelectedItem())' enabled='{isActif()}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"SetOfVessels"'/> </cell> </row> <row> @@ -140,7 +140,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane> - <JTextArea id="fieldStrategyComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldStrategyComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"Comment"'/> + <JTextArea id="fieldStrategyComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldStrategyComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell> </row> @@ -152,18 +152,18 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save'/> + <JButton id='save' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel'/> + <JButton id='cancel' decorator='boxed'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create'/> + <JButton id='create' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='remove'/> + <JButton id='remove' decorator='boxed'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -81,7 +81,7 @@ <JLabel text="isisfish.tripType.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldTripTypeName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldTripTypeName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{TripTypeImpl.class}' _method='"Name"'/> + <JTextField id="fieldTripTypeName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldTripTypeName.getText())' enabled='{isActif()}' decorator='boxed'/> </cell> </row> <row> @@ -106,7 +106,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldTripTypeComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldTripTypeComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{TripTypeImpl.class}' _method='"Comment"'/> + <JTextArea id="fieldTripTypeComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldTripTypeComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell> </row> @@ -118,18 +118,18 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save'/> + <JButton id='save' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel'/> + <JButton id='cancel' decorator='boxed'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create'/> + <JButton id='create' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='delete'/> + <JButton id='delete' decorator='boxed'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -102,7 +102,7 @@ <JLabel text="isisfish.vesselType.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeName" text='{getBean().getName()}' enabled='{isActif()}' onKeyReleased='getBean().setName(fieldVesselTypeName.getText())' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Name"'/> + <JTextField id="fieldVesselTypeName" text='{getBean().getName()}' enabled='{isActif()}' onKeyReleased='getBean().setName(fieldVesselTypeName.getText())' decorator='boxed'/> </cell> </row> <row> @@ -169,7 +169,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane> - <JTextArea id="fieldVesselTypeComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldVesselTypeComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Comment"'/> + <JTextArea id="fieldVesselTypeComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldVesselTypeComment.getText())' enabled='{isActif()}' decorator='boxed'/> </JScrollPane> </cell> </row> @@ -181,18 +181,18 @@ <Table> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save'/> + <JButton id='save' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel'/> + <JButton id='cancel' decorator='boxed'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create'/> + <JButton id='create' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='delete'/> + <JButton id='delete' decorator='boxed'/> </cell> </row> </Table> 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-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-03-16 08:41:59 UTC (rev 1967) @@ -136,7 +136,7 @@ <cell columns='2' fill='horizontal' weightx='1.0'> <JTextField id="fieldZoneName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getName())}' - enabled='{isActif()}' + enabled='{isActif()}' decorator='boxed' onKeyReleased='getBean().setName(fieldZoneName.getText())'/> </cell> </row> @@ -148,7 +148,9 @@ <row> <cell columns='2' fill='both' weighty='0.7' weightx='1.0'> <JScrollPane> - <JList id="zoneCells" enabled='{isActif()}' selectedValues='{getBean().getCell().toArray()}' onMouseClicked='if ( isActif() ) { zoneCellsChange(); }' decorator='boxed' _bean='{ZoneImpl.class}' _method='"Cell"'/> + <JList id="zoneCells" enabled='{isActif()}' selectedValues='{getBean().getCell().toArray()}' + onMouseClicked='if ( isActif() ) { zoneCellsChange(); }' + decorator='boxed' _bean='{ZoneImpl.class}' _method='"Cell"'/> </JScrollPane> </cell> </row> @@ -170,18 +172,18 @@ </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='save'/> + <JButton id='save' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel'/> + <JButton id='cancel' decorator='boxed'/> </cell> </row> <row> <cell fill='horizontal' weightx='0.5'> - <JButton id='create'/> + <JButton id='create' decorator='boxed'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id='remove'/> + <JButton id='remove' decorator='boxed'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-03-16 08:41:59 UTC (rev 1967) @@ -22,6 +22,9 @@ import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.ui.input.InputAction; import fr.ifremer.isisfish.ui.input.InputOneEquationUI; +import fr.ifremer.isisfish.ui.input.PopulationMigrationEmigrationUI; +import fr.ifremer.isisfish.ui.input.PopulationMigrationImmigrationUI; +import fr.ifremer.isisfish.ui.input.PopulationMigrationMigrationUI; import fr.ifremer.isisfish.ui.widget.IntervalPanel; import java.lang.reflect.Method; import java.util.logging.Level; @@ -39,6 +42,7 @@ import org.codelutin.math.matrix.MatrixND; import org.codelutin.math.matrix.gui.MatrixPanelEditor; import org.codelutin.topia.persistence.TopiaEntity; +import fr.ifremer.isisfish.ui.input.RangeOfValuesUI; /** * @@ -101,6 +105,37 @@ ipResult.setLabelRenderer(Month.MONTH); ipResult.setModel(ip.getModel().clone()); result = ipResult; + } else if (result instanceof RangeOfValuesUI){ + RangeOfValuesUI origine = (RangeOfValuesUI)c; + RangeOfValuesUI ui = new RangeOfValuesUI(new JAXXInitialContext().add(new InputAction())); + ui.setBean(e); + ui.setActif(true); + ui.refresh(); + result = ui; + } else if (result instanceof PopulationMigrationMigrationUI){ + PopulationMigrationMigrationUI origine = (PopulationMigrationMigrationUI)c; + PopulationMigrationMigrationUI ui = new PopulationMigrationMigrationUI(new JAXXInitialContext().add(new InputAction())); + ui.setBean(origine.getBean()); + ui.setPopInfo(origine.getPopInfo()); + ui.setActif(true); + ui.refreshPanel(); + result = ui; + } else if (result instanceof PopulationMigrationEmigrationUI){ + PopulationMigrationEmigrationUI origine = (PopulationMigrationEmigrationUI)c; + PopulationMigrationEmigrationUI ui = new PopulationMigrationEmigrationUI(new JAXXInitialContext().add(new InputAction())); + ui.setBean(origine.getBean()); + ui.setPopInfo(origine.getPopInfo()); + ui.setActif(true); + ui.refreshPanel(); + result = ui; + } else if (result instanceof PopulationMigrationImmigrationUI){ + PopulationMigrationImmigrationUI origine = (PopulationMigrationImmigrationUI)c; + PopulationMigrationImmigrationUI ui = new PopulationMigrationImmigrationUI(new JAXXInitialContext().add(new InputAction())); + ui.setBean(origine.getBean()); + ui.setPopInfo(origine.getPopInfo()); + ui.setActif(true); + ui.refreshPanel(); + result = ui; } } catch (Exception ex) { Logger.getLogger(EditorHelper.class.getName()).log(Level.SEVERE, null, ex); @@ -157,6 +192,33 @@ ipResult.setLabelRenderer(Month.MONTH); ipResult.setModel(ip.getModel().clone()); result = ipResult; + }else if (result instanceof PopulationMigrationMigrationUI){ + PopulationMigrationMigrationUI origine = (PopulationMigrationMigrationUI)c; + PopulationMigrationMigrationUI ui = new PopulationMigrationMigrationUI(new JAXXInitialContext().add(new InputAction())); + ui.setBean(origine.getBean()); + ui.setPopInfo(origine.getPopInfo()); + ui.getPopInfo().setMigrationMatrix((MatrixND)value); + ui.setActif(true); + ui.refreshPanel(); + result = ui; + } else if (result instanceof PopulationMigrationEmigrationUI){ + PopulationMigrationEmigrationUI origine = (PopulationMigrationEmigrationUI)c; + PopulationMigrationEmigrationUI ui = new PopulationMigrationEmigrationUI(new JAXXInitialContext().add(new InputAction())); + ui.setBean(origine.getBean()); + ui.setPopInfo(origine.getPopInfo()); + ui.getPopInfo().setEmigrationMatrix((MatrixND)value); + ui.setActif(true); + ui.refreshPanel(); + result = ui; + } else if (result instanceof PopulationMigrationImmigrationUI){ + PopulationMigrationImmigrationUI origine = (PopulationMigrationImmigrationUI)c; + PopulationMigrationImmigrationUI ui = new PopulationMigrationImmigrationUI(new JAXXInitialContext().add(new InputAction())); + ui.setBean(origine.getBean()); + ui.setPopInfo(origine.getPopInfo()); + ui.getPopInfo().setImmigrationMatrix((MatrixND)value); + ui.setActif(true); + ui.refreshPanel(); + result = ui; } } catch (Exception ex) { Logger.getLogger(EditorHelper.class.getName()).log(Level.SEVERE, null, ex); @@ -174,10 +236,10 @@ result = ((MatrixPanelEditor)c).getMatrix(); } else if (c instanceof JComboBox){ -// ((JComboBox) result).setModel(BeanUtils.getProperty(e, fieldName)); + result = ((JComboBox) result).getSelectedItem(); } else if (c instanceof JList){ -// ((JComboBox) result).setModel(BeanUtils.getProperty(e, fieldName)); + result = ((JList) result).getSelectedValues(); } else if (c instanceof JCheckBox){ result = ((JCheckBox)c).isSelected(); @@ -186,11 +248,19 @@ result = ((JRadioButton)c).isSelected(); } else if (c instanceof InputOneEquationUI){ -// ((InputOneEquationUI) result).init(setText(BeanUtils.getProperty(e, fieldName))); + result = ((InputOneEquationUI) result).getFormule(); } else if (c instanceof IntervalPanel){ // ((IntervalPanel) result).setModel((BeanUtils.getProperty(e, fieldName))); + } else if (result instanceof PopulationMigrationMigrationUI){ + result = ((PopulationMigrationMigrationUI)c).getPopInfo().getMigrationMatrix(); + + } else if (result instanceof PopulationMigrationEmigrationUI){ + result = ((PopulationMigrationEmigrationUI)c).getPopInfo().getEmigrationMatrix(); + + } else if (result instanceof PopulationMigrationImmigrationUI){ + result = ((PopulationMigrationImmigrationUI)c).getPopInfo().getImmigrationMatrix(); } return result; } @@ -198,13 +268,7 @@ String fieldName = (String) c.getClientProperty("method"); if (c instanceof JTextComponent) { Object o = callMethod(e, fieldName); - if (Integer.class.isInstance(o)){ - return true; - } else if (Double.class.isInstance(o)){ - return true; - } else if (Long.class.isInstance(o)){ - return true; - } + return canBeContinue(c, o); } return false; } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java 2009-03-16 08:41:59 UTC (rev 1967) @@ -42,16 +42,20 @@ if (cacheSelectedIndex != -1){ pane.setSelectedIndex(cacheSelectedIndex); } - InputContentUI ui = (InputContentUI) pane.getSelectedComponent(); - if (closeUI(ui)) { - pane.setSelectedIndex(selectedIndex); + if (InputContentUI.class.isInstance(pane.getSelectedComponent())){ + InputContentUI ui = (InputContentUI) pane.getSelectedComponent(); + if (closeUI(ui)) { + pane.setSelectedIndex(selectedIndex); + } + if (InputContentUI.class.isInstance(pane.getSelectedComponent())){ + ui = (InputContentUI) pane.getSelectedComponent(); + ui.setSens(true); + ui.setLayer(true); + ui.refresh(); + cacheSelectedIndex = pane.getSelectedIndex(); + pane.addChangeListener(this); + } } - ui = (InputContentUI) pane.getSelectedComponent(); - ui.setSens(true); - ui.setLayer(true); - ui.refresh(); - cacheSelectedIndex = pane.getSelectedIndex(); - pane.addChangeListener(this); } catch (Exception ex) { Logger.getLogger(SensitivityTabbedPaneListener.class.getName()).log(Level.SEVERE, null, ex); } Modified: isis-fish/trunk/src/main/resources/sensitivity.properties =================================================================== --- isis-fish/trunk/src/main/resources/sensitivity.properties 2009-03-13 17:59:10 UTC (rev 1966) +++ isis-fish/trunk/src/main/resources/sensitivity.properties 2009-03-16 08:41:59 UTC (rev 1967) @@ -1,7 +1,6 @@ Cell.Latitude Cell.Longitude Cell.Land -Cell.Comment EffortDescription.FishingOperation EffortDescription.FishingOperationDuration EffortDescription.GearsNumberPerOperation @@ -13,68 +12,65 @@ EffortDescription.RepairAndMaintenanceGearCost EffortDescription.LandingCosts EffortDescription.OtherRunningCost -Gear.Name Gear.EffortUnit Gear.StandardisationFactor Gear.ParameterName Gear.PossibleValue -Gear.Comment -Metier.Name +Gear.PopulationSelectivity Metier.GearParameterValue -Metier.Comment -Population.Name +Metier.Interval +Metier.Zone +MetierSeasonInfo.SpeciesTargetSpecies Population.GeographicId Population.PlusGroup -Population.Comment Population.Capturability -Population.CapturabilityComment Population.MappingZoneReproZoneRecru Population.Growth Population.GrowthReverse +Population.MaturityGroup +Population.MeanWeight +Population.Price +Population.ReproductionEquation PopulationGroup.MeanWeight PopulationGroup.Price Population.NaturalDeathRateMatrix +Population.NaturalDeathRate PopulationGroup.ReproductionRate PopulationGroup.Age PopulationGroup.MinLength PopulationGroup.MaxLength -PopulationGroup.Comment +PopulationGroup.MeanWeight PopulationSeasonInfo.EmigrationMatrix PopulationSeasonInfo.ImmigrationMatrix PopulationSeasonInfo.MigrationMatrix PopulationSeasonInfo.UseEquationMigration PopulationSeasonInfo.Interval -Population.MigrationComment +PopulationSeasonInfo.LengthChangeMatrix +PopulationSeasonInfo.GroupChange Population.MonthGapBetweenReproRecrutement Population.RecruitmentDistribution -Population.RecruitmentComment StrategyMonthInfo.LengthChangeMatrix -Population.SeasonsComment -Port.Name Port.Cell -Port.Comment -SetOfVessels.Name SetOfVessels.NumberOfVessels SetOfVessels.FixedCosts -SetOfVessels.Comment -Species.Name Species.ScientificName Species.CodeRubbin Species.CodeCEE Species.AgeGroupType Species.AgeGroupType -Species.Comment +SetOfVessels.Port +SetOfVessels.VesselType +SetOfVessels.NumberOfVessels +SetOfVessels.FixedCosts +SetOfVessels.TechnicalEfficiencyEquation StrategyMonthInfo.MinInactivityDays StrategyMonthInfo.ProportionMetier -Strategy.Name Strategy.ProportionSetOfVessels Strategy.InactivityEquationUsed -Strategy.Comment -TripType.Name +Strategy.SetOfVessels +Strategy.Inactivity TripType.TripDuration TripType.MinTimeBetweenTrip -TripType.Comment -VesselType.Name VesselType.Length VesselType.Speed VesselType.MaxTripDuration @@ -82,5 +78,4 @@ VesselType.MinCrewSize VesselType.UnitFuelCostOfTravel VesselType.TripType -VesselType.Comment Zone.Cell \ No newline at end of file