Author: sletellier Date: 2009-01-30 12:28:41 +0000 (Fri, 30 Jan 2009) New Revision: 1765 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 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 Log: Debug final Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-01-30 12:08:08 UTC (rev 1764) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-01-30 12:28:41 UTC (rev 1765) @@ -295,7 +295,6 @@ @Override public void propertyChange(PropertyChangeEvent evt) { topiaChanged(); - System.out.println(evt.getSource()); } }); this.currentEntities.add(currentEntity); 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-01-30 12:08:08 UTC (rev 1764) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2009-01-30 12:28:41 UTC (rev 1765) @@ -39,18 +39,18 @@ public void refresh() { getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); - strategyJanuary.init(Month.JANUARY); - strategyFebuary.init(Month.FEBRUARY); - strategyMarch.init(Month.MARCH); - strategyApril.init(Month.APRIL); - strategyMay.init(Month.MAY); - strategyJune.init(Month.JUNE); - strategyJuly.init(Month.JULY); - strategyAugust.init(Month.AUGUST); - strategySeptember.init(Month.SEPTEMBER); - strategyOctober.init(Month.OCTOBER); - strategyNovember.init(Month.NOVEMBER); - strategyDecember.init(Month.DECEMBER); + strategyJanuary.init(0); + strategyFebuary.init(1); + strategyMarch.init(2); + strategyApril.init(3); + strategyMay.init(4); + strategyJune.init(5); + strategyJuly.init(6); + strategyAugust.init(7); + strategySeptember.init(8); + strategyOctober.init(9); + strategyNovember.init(10); + strategyDecember.init(11); getVerifier().addCurrentPanel(strategyJanuary, strategyFebuary, strategyMarch, strategyApril, strategyMay, strategyJune, strategyJuly, strategyAugust, strategySeptember, strategyOctober, strategyNovember, strategyDecember); } ]]></script> 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-01-30 12:08:08 UTC (rev 1764) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-01-30 12:28:41 UTC (rev 1765) @@ -49,7 +49,7 @@ import fr.ifremer.isisfish.entities.TripType; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; -Month month = null; +int month = 0; PropertyChangeListener listener = null; addPropertyChangeListener("bean", new PropertyChangeListener() { @@ -71,7 +71,9 @@ @Override public void propertyChange(PropertyChangeEvent evt) { if (fieldStrategyMonthInfoProportion.getMatrix() != null){ - getStrategyMonthInfo().setProportionMetier(fieldStrategyMonthInfoProportion.getMatrix()); + if (fieldStrategyMonthInfoProportion.getMatrix() != null){ + getStrategyMonthInfo().setProportionMetier(fieldStrategyMonthInfoProportion.getMatrix()); + } } } }); @@ -79,14 +81,16 @@ Strategy strategy = (Strategy)getVerifier().getEntity(Strategy.class); setBean((StrategyImpl) strategy); if (getBean() != null){ - setStrategyMonthInfo((StrategyMonthInfoImpl)getBean().getStrategyMonthInfo(month)); +// setStrategyMonthInfo((StrategyMonthInfoImpl)getBean().getStrategyMonthInfo(month)); + Object[] monthInfos = getBean().getStrategyMonthInfo().toArray(); + setStrategyMonthInfo((StrategyMonthInfoImpl) monthInfos[month]); getVerifier().addCurrentEntity(getStrategyMonthInfo()); } if (getStrategyMonthInfo() != null){ jaxx.runtime.swing.Utils.fillComboBox(fieldStrategyMonthInfoTripType,getRegion().getTripType(), getStrategyMonthInfo().getTripType()); } } -public void init(Month m){ +public void init(int m){ month = m; } ]]></script>