Isis-fish-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
February 2009
- 6 participants
- 128 discussions
Author: sletellier
Date: 2009-02-25 09:34:37 +0000 (Wed, 25 Feb 2009)
New Revision: 1875
Modified:
isis-fish/trunk/pom.xml
Log:
Release 3.2.0.4-rc1
Modified: isis-fish/trunk/pom.xml
===================================================================
--- isis-fish/trunk/pom.xml 2009-02-24 17:25:16 UTC (rev 1874)
+++ isis-fish/trunk/pom.xml 2009-02-25 09:34:37 UTC (rev 1875)
@@ -13,7 +13,7 @@
<groupId>ifremer</groupId>
<artifactId>isis-fish</artifactId>
- <version>3.2.0.4-SNAPSHOT</version>
+ <version>3.2.0.4-rc1-SNAPSHOT</version>
<!-- POM Relationships : Inheritance : Dependencies -->
<dependencies>
1
0
r1874 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore
by chatellier＠users.labs.libre-entreprise.org 24 Feb '09
by chatellier＠users.labs.libre-entreprise.org 24 Feb '09
24 Feb '09
Author: chatellier
Date: 2009-02-24 17:25:16 +0000 (Tue, 24 Feb 2009)
New Revision: 1874
Modified:
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java
Log:
On n'a plus de cglib
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2009-02-24 16:05:43 UTC (rev 1873)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2009-02-24 17:25:16 UTC (rev 1874)
@@ -95,8 +95,6 @@
* @return l'objet config passe en parametre
*/
static public Properties addMemDatabaseConfig(Properties config, String id) {
- // On utilise pas cglib pour eviter les OutOfMemory: PermGen
- System.setProperty(Environment.BYTECODE_PROVIDER, "javassist");
config.setProperty(Environment.USER, "sa");
config.setProperty(Environment.PASS, "");
1
0
r1873 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: entities ui/input
by sletellier＠users.labs.libre-entreprise.org 24 Feb '09
by sletellier＠users.labs.libre-entreprise.org 24 Feb '09
24 Feb '09
Author: sletellier
Date: 2009-02-24 16:05:43 +0000 (Tue, 24 Feb 2009)
New Revision: 1873
Modified:
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java
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/PopulationRecruitmentUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx
Log:
Debug final
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2009-02-24 15:13:12 UTC (rev 1872)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2009-02-24 16:05:43 UTC (rev 1873)
@@ -134,8 +134,16 @@
}
eq.setName(getName());
+
+ // Fire
+ String _oldValue = eq.getContent();
+ fireOnPreWrite("content", _oldValue, content);
+
eq.setContent(content);
eq.update();
+
+ fireOnPostWrite("content", _oldValue, content);
+
} catch (TopiaException eee) {
throw new IsisFishRuntimeException(_("isisfish.error.change.equation"), eee);
}
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-02-24 15:13:12 UTC (rev 1872)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-02-24 16:05:43 UTC (rev 1873)
@@ -43,8 +43,16 @@
import org.codelutin.math.matrix.gui.MatrixPanelEvent;
import org.codelutin.math.matrix.gui.MatrixPanelListener;
-MatrixPanelListener listener = null;
+MatrixPanelListener listener = new MatrixPanelListener() {
+ @Override
+ public void matrixChanged(MatrixPanelEvent arg0) {
+ if (getBean() != null && fieldPopulationCapturability.getMatrix() != null){
+ getBean().setCapturability(fieldPopulationCapturability.getMatrix().copy());
+ }
+ }
+};
+
addPropertyChangeListener("bean", new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
@@ -68,18 +76,10 @@
setBean((PopulationImpl) population);
if (getBean() != null){
if (getBean().getCapturability() != null){
+ fieldPopulationCapturability.removeMatrixPanelListener(listener);
fieldPopulationCapturability.setMatrix(getBean().getCapturability().copy());
}
}
- listener = new MatrixPanelListener() {
-
- @Override
- public void matrixChanged(MatrixPanelEvent arg0) {
- if (getBean() != null && fieldPopulationCapturability.getMatrix() != null){
- getBean().setCapturability(fieldPopulationCapturability.getMatrix().copy());
- }
- }
- };
fieldPopulationCapturability.addMatrixListener(listener);
}
]]>
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-02-24 15:13:12 UTC (rev 1872)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-02-24 16:05:43 UTC (rev 1873)
@@ -61,6 +61,7 @@
fieldPopulationGroupMaxLength.setText("");
fieldPopulationGroupComment.setText("");
fieldPopulationGroupNaturalDeathRate.setMatrix(null);
+ setPopGroupNotNull(false);
}
if (evt.getNewValue() != null) {
// add binding on getBean()
@@ -79,7 +80,7 @@
setBean((PopulationImpl) population);
if (getBean() != null){
if (getBean().getPopulationGroup() != null){
- jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationGroupPopulationGroup,getBean().getPopulationGroup(), null, true);
+ jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationGroupPopulationGroup,getBean().getPopulationGroup(), getPopulationGroup(), true);
}
}
}
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-02-24 15:13:12 UTC (rev 1872)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-02-24 16:05:43 UTC (rev 1873)
@@ -53,7 +53,7 @@
//jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
fieldPopulationMonthGapBetweenReproRecrutement.setText("");
fieldPopulationRecruitmentComment.setText("");
- reproductionEquation.init(_("isisfish.populationRecruitment.reproductionEquation"), null, "Reproduction", "ReproductionEquation", "EquationReproductionEquation", fr.ifremer.isisfish.equation.PopulationGrowth.class);
+ reproductionEquation.init(_("isisfish.populationRecruitment.reproductionEquation"), getBean(), "Reproduction", "ReproductionEquation", "EquationReproductionEquation", fr.ifremer.isisfish.equation.PopulationGrowth.class);
}
if (evt.getNewValue() != null) {
// add binding on getBean()
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-02-24 15:13:12 UTC (rev 1872)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-02-24 16:05:43 UTC (rev 1873)
@@ -78,6 +78,7 @@
// remove previous binding on getBean()
//jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
fieldPopulationSeasonComment.setText("");
+ fieldPopulationSeasonReproductionDistribution.setMatrix(null);
}
if (evt.getNewValue() != null) {
// add binding on getBean()
1
0
r1872 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: input simulator
by sletellier＠users.labs.libre-entreprise.org 24 Feb '09
by sletellier＠users.labs.libre-entreprise.org 24 Feb '09
24 Feb '09
Author: sletellier
Date: 2009-02-24 15:13:12 +0000 (Tue, 24 Feb 2009)
New Revision: 1872
Modified:
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx
Log:
Debug final
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-02-24 14:52:00 UTC (rev 1871)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-02-24 15:13:12 UTC (rev 1872)
@@ -86,6 +86,20 @@
protected void setMatrix(){
fieldPopulationGroupNaturalDeathRate.setMatrix(((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup()));
}
+protected void groupChanged(){
+ if (fieldPopulationGroupPopulationGroup.getSelectedItem() != null){
+ setPopulationGroup((PopulationGroupImpl)fieldPopulationGroupPopulationGroup.getSelectedItem());
+ getVerifier().addCurrentEntity(getPopulationGroup());
+ setMatrix();
+ setPopGroupNotNull(true);
+ }
+ else{
+ setPopGroupNotNull(false);
+ }
+
+
+}
+
]]>
</script>
<Table id='body'>
@@ -94,7 +108,7 @@
<JLabel text="isisfish.common.populationGroup" enabled='{isActif()}'/>
</cell>
<cell columns='2' fill='horizontal' weightx='1.0'>
- <JComboBox id='fieldPopulationGroupPopulationGroup' onActionPerformed='setPopulationGroup((PopulationGroupImpl)fieldPopulationGroupPopulationGroup.getSelectedItem());getVerifier().addCurrentEntity(getPopulationGroup());setPopGroupNotNull(getPopulationGroup() != null);setMatrix();' enabled='{isActif()}'/>
+ <JComboBox id='fieldPopulationGroupPopulationGroup' onActionPerformed='groupChanged()' enabled='{isActif()}'/>
</cell>
</row>
<row>
@@ -118,7 +132,7 @@
<JLabel text="isisfish.populationGroup.naturalDeathRate" enabled='{isPopGroupNotNull()}'/>
</cell>
<cell columns='2' fill='both' weightx='1.0' weighty='0.5'>
- <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationGroupNaturalDeathRate' editable='false' matrix='{getBean() == null || getPopulationGroup() == null ? null : ((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup())}' enabled='{isPopGroupNotNull()}'/>
+ <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationGroupNaturalDeathRate' matrix='{getBean() == null || getPopulationGroup() == null ? null : ((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup())}' enabled='{isPopGroupNotNull()}'/>
</cell>
</row>
<row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-02-24 14:52:00 UTC (rev 1871)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-02-24 15:13:12 UTC (rev 1872)
@@ -413,7 +413,6 @@
</cell>
<cell fill="horizontal" weightx="1.0">
<JComboBox id="fieldSimulParamsRegion" model='{new DefaultComboBoxModel(Common.getRegionItem())}' onItemStateChanged='regionChange()'/>
- <!--JComboBox id="fieldSimulParamsRegion" model='{new DefaultComboBoxModel(Common.getRegionItem())}' onActionPerformed='regionChange()'/-->
</cell>
</row>
</Table>
1
0
r1871 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org 24 Feb '09
by sletellier＠users.labs.libre-entreprise.org 24 Feb '09
24 Feb '09
Author: sletellier
Date: 2009-02-24 14:52:00 +0000 (Tue, 24 Feb 2009)
New Revision: 1871
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/PopulationGroupUI.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/StrategyOneMonthInfoUI.jaxx
Log:
Update matrix bugs fixed
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-02-24 13:27:40 UTC (rev 1870)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-02-24 14:52:00 UTC (rev 1871)
@@ -43,7 +43,6 @@
import org.codelutin.math.matrix.gui.MatrixPanelEvent;
import org.codelutin.math.matrix.gui.MatrixPanelListener;
-
MatrixPanelListener listener = null;
addPropertyChangeListener("bean", new PropertyChangeListener() {
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-02-24 13:27:40 UTC (rev 1870)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-02-24 14:52:00 UTC (rev 1871)
@@ -45,8 +45,6 @@
import fr.ifremer.isisfish.entities.PopulationGroupImpl;
import fr.ifremer.isisfish.entities.Population;
import fr.ifremer.isisfish.entities.PopulationImpl;
-import org.codelutin.math.matrix.gui.MatrixPanelListener;
-import org.codelutin.math.matrix.gui.MatrixPanelEvent;
import org.codelutin.math.matrix.AbstractMatrixND;
import org.codelutin.math.matrix.MatrixND;
@@ -85,6 +83,9 @@
}
}
}
+protected void setMatrix(){
+ fieldPopulationGroupNaturalDeathRate.setMatrix(((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup()));
+}
]]>
</script>
<Table id='body'>
@@ -93,7 +94,7 @@
<JLabel text="isisfish.common.populationGroup" enabled='{isActif()}'/>
</cell>
<cell columns='2' fill='horizontal' weightx='1.0'>
- <JComboBox id='fieldPopulationGroupPopulationGroup' onActionPerformed='setPopulationGroup((PopulationGroupImpl)fieldPopulationGroupPopulationGroup.getSelectedItem());getVerifier().addCurrentEntity(getPopulationGroup());setPopGroupNotNull(getPopulationGroup() != null);' enabled='{isActif()}'/>
+ <JComboBox id='fieldPopulationGroupPopulationGroup' onActionPerformed='setPopulationGroup((PopulationGroupImpl)fieldPopulationGroupPopulationGroup.getSelectedItem());getVerifier().addCurrentEntity(getPopulationGroup());setPopGroupNotNull(getPopulationGroup() != null);setMatrix();' enabled='{isActif()}'/>
</cell>
</row>
<row>
@@ -117,7 +118,7 @@
<JLabel text="isisfish.populationGroup.naturalDeathRate" enabled='{isPopGroupNotNull()}'/>
</cell>
<cell columns='2' fill='both' weightx='1.0' weighty='0.5'>
- <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationGroupNaturalDeathRate' matrix='{getBean() == null || getPopulationGroup() == null ? null : ((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup())}' enabled='{isPopGroupNotNull()}'/>
+ <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationGroupNaturalDeathRate' editable='false' matrix='{getBean() == null || getPopulationGroup() == null ? null : ((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup())}' enabled='{isPopGroupNotNull()}'/>
</cell>
</row>
<row>
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-02-24 13:27:40 UTC (rev 1870)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-02-24 14:52:00 UTC (rev 1871)
@@ -47,9 +47,12 @@
import fr.ifremer.isisfish.types.Month;
import fr.ifremer.isisfish.entities.Population;
import fr.ifremer.isisfish.entities.PopulationImpl;
+import org.codelutin.math.matrix.gui.MatrixPanelEvent;
+import org.codelutin.math.matrix.gui.MatrixPanelListener;
import fr.ifremer.isisfish.ui.widget.Interval;
import fr.ifremer.isisfish.ui.widget.IntervalPanel;
+MatrixPanelListener listener = null;
protected Interval interval = null;
protected IntervalPanel ip = new IntervalPanel();
fieldPopulationSeasonInterval.add(ip, BorderLayout.CENTER);
@@ -133,6 +136,17 @@
ip.setLabelRenderer(Month.MONTH);
ip.setModel(interval);
+
+ listener = new MatrixPanelListener() {
+
+ @Override
+ public void matrixChanged(MatrixPanelEvent arg0) {
+ if (getPopulationSeasonInfo() != null && fieldPopulationSeasonReproductionDistribution.getMatrix() != null){
+ getPopulationSeasonInfo().setLengthChangeMatrix(fieldPopulationSeasonReproductionDistribution.getMatrix().copy());
+ }
+ }
+ };
+ fieldPopulationSeasonReproductionDistribution.addMatrixListener(listener);
}
protected void setInterval(){
if(getPopulationSeasonInfo() != null){
@@ -176,8 +190,12 @@
getVerifier().addCurrentEntity(getPopulationSeasonInfo());
setPopSeasonInfoNotNull(getPopulationSeasonInfo() != null);
setInterval();
+ setMatrix();
init = false;
}
+protected void setMatrix(){
+ fieldPopulationSeasonReproductionDistribution.setMatrix(getPopulationSeasonInfo().getLengthChangeMatrix());
+}
]]>
</script>
<Table id='body'>
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-02-24 13:27:40 UTC (rev 1870)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-02-24 14:52:00 UTC (rev 1871)
@@ -45,10 +45,14 @@
import fr.ifremer.isisfish.entities.StrategyMonthInfoImpl;
import fr.ifremer.isisfish.entities.Strategy;
import fr.ifremer.isisfish.entities.StrategyImpl;
+import org.codelutin.math.matrix.gui.MatrixPanelEvent;
+import org.codelutin.math.matrix.gui.MatrixPanelListener;
import fr.ifremer.isisfish.types.Month;
import fr.ifremer.isisfish.entities.TripType;
import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
+MatrixPanelListener matrixListener = null;
+
int month = 0;
PropertyChangeListener listener = null;
@@ -81,7 +85,6 @@
Strategy strategy = (Strategy)getVerifier().getEntity(Strategy.class);
setBean((StrategyImpl) strategy);
if (getBean() != null){
-// setStrategyMonthInfo((StrategyMonthInfoImpl)getBean().getStrategyMonthInfo(month));
Object[] monthInfos = getBean().getStrategyMonthInfo().toArray();
if (monthInfos.length != 0){
setStrategyMonthInfo((StrategyMonthInfoImpl) monthInfos[month]);
@@ -97,11 +100,25 @@
for (ActionListener listener : listeners){
fieldStrategyMonthInfoTripType.addActionListener(listener);
}
+ setMatrix();
}
+ matrixListener = new MatrixPanelListener() {
+
+ @Override
+ public void matrixChanged(MatrixPanelEvent arg0) {
+ if (getStrategyMonthInfo() != null && fieldStrategyMonthInfoProportion.getMatrix() != null){
+ getStrategyMonthInfo().setProportionMetier(fieldStrategyMonthInfoProportion.getMatrix().copy());
+ }
+ }
+ };
+ fieldStrategyMonthInfoProportion.addMatrixListener(matrixListener);
}
public void init(int m){
month = m;
}
+protected void setMatrix(){
+ fieldStrategyMonthInfoProportion.setMatrix(getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy());
+}
]]></script>
<Table id='body'>
<row>
1
0
r1870 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: types ui/input ui/result
by sletellier＠users.labs.libre-entreprise.org 24 Feb '09
by sletellier＠users.labs.libre-entreprise.org 24 Feb '09
24 Feb '09
Author: sletellier
Date: 2009-02-24 13:27:40 +0000 (Tue, 24 Feb 2009)
New Revision: 1870
Modified:
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Month.java
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/InputOneEquationUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.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/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/PopulationEquationUI.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/PopulationMigrationEquationUI.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/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/SelectivityUI.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/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/result/GraphBeanUIJAXX.jaxx
Log:
Upgrade to new jaxx version
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Month.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Month.java 2009-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Month.java 2009-02-24 13:27:40 UTC (rev 1870)
@@ -72,7 +72,7 @@
protected int monthNumber = 0;
- protected Month(int monthNumber) {
+ public Month(int monthNumber) {
setMonthNumber(monthNumber);
}
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-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -60,7 +60,7 @@
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
- //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
fieldCellName.setText("");
fieldCellLatitude.setText("");
fieldCellLongitude.setText("");
@@ -69,7 +69,7 @@
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
}
}
});
@@ -79,7 +79,7 @@
Cell cell = getVerifier().getEntity(Cell.class);
setBean((CellImpl) cell);
cellChanged = false;
- jaxx.runtime.swing.Utils.fillComboBox(fieldCell,getRegion().getCell(), getBean());
+ jaxx.runtime.SwingUtil.fillComboBox(fieldCell,getRegion().getCell(), getBean());
cellChanged = true;
}
protected OpenMapEvents getMapListener(){
@@ -91,7 +91,7 @@
for (Cell c : cellMap.getSelectedCells()){
if (getBean() != null){
if (!c.getTopiaId().equals(getBean().getTopiaId())){
- jaxx.runtime.swing.Utils.fillComboBox(fieldCell,getRegion().getCell(), c);
+ jaxx.runtime.SwingUtil.fillComboBox(fieldCell,getRegion().getCell(), c);
return true;
}
}
@@ -132,7 +132,7 @@
<JLabel text="isisfish.cell.name" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldCellName" text='{jaxx.runtime.Util.getStringValue(getBean().getName())}' onKeyReleased='getBean().setName(fieldCellName.getText())' enabled='{isActif()}'/>
+ <JTextField id="fieldCellName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getName())}' onKeyReleased='getBean().setName(fieldCellName.getText())' enabled='{isActif()}'/>
</cell>
</row>
<row>
@@ -167,7 +167,7 @@
<row>
<cell columns='2' fill='both' weighty='1.0' weightx='1.0'>
<JScrollPane>
- <JTextArea id="fieldCellComment" text='{jaxx.runtime.Util.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldCellComment.getText())' enabled='{isActif()}'/>
+ <JTextArea id="fieldCellComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldCellComment.getText())' enabled='{isActif()}'/>
</JScrollPane>
</cell>
</row>
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-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -51,7 +51,7 @@
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
- //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
fieldEffortDescriptionFishingOperation.setText("");
fieldEffortDescriptionFishingOperationDuration.setText("");
fieldEffortDescriptionGearsNumberPerOperation.setText("");
@@ -66,7 +66,7 @@
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
}
}
});
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-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -55,11 +55,11 @@
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
- jaxx.runtime.Util.removeDataBinding($InputContentUI0, "cellMap.fisheryRegion");
+ jaxx.runtime.SwingUtil.removeDataBinding($InputContentUI0, "cellMap.fisheryRegion");
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- jaxx.runtime.Util.applyDataBinding($InputContentUI0, "cellMap.fisheryRegion");
+ jaxx.runtime.SwingUtil.applyDataBinding($InputContentUI0, "cellMap.fisheryRegion");
}
}
});
@@ -133,7 +133,7 @@
</row>
<row>
<cell columns='3' fill='horizontal' weightx='1.0'>
- <JTextField id="fieldRegion" text='{jaxx.runtime.Util.getStringValue(getBean().getName())}' onKeyReleased='getBean().setName(fieldRegion.getText())'/>
+ <JTextField id="fieldRegion" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getName())}' onKeyReleased='getBean().setName(fieldRegion.getText())'/>
</cell>
</row>
<row>
@@ -223,7 +223,7 @@
<row>
<cell columns='3' fill='both' weightx='1.0' weighty='0.4'>
<JScrollPane>
- <JTextArea id="fieldComment" text='{jaxx.runtime.Util.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldComment.getText())'/>
+ <JTextArea id="fieldComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldComment.getText())'/>
</JScrollPane>
</cell>
</row>
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-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -50,7 +50,7 @@
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
- //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
+ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
fieldGearName.setText("");
fieldGearEffortUnit.setText("");
fieldGearStandardisationFactor.setText("");
@@ -60,7 +60,7 @@
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
}
}
});
@@ -77,7 +77,7 @@
if (getBean() != null){
if (values != null){
init = true;
- jaxx.runtime.swing.Utils.fillComboBox(fieldGearParamType, values, getBean().getPossibleValue() == null ? null : getBean().getPossibleValue().getType(), true);
+ jaxx.runtime.SwingUtil.fillComboBox(fieldGearParamType, values, getBean().getPossibleValue() == null ? null : getBean().getPossibleValue().getType(), true);
init = false;
}
}
@@ -107,7 +107,7 @@
<JLabel text="isisfish.gear.effortUnit" enabled='{isActif()}'/>
</cell>
<cell columns="2" fill='horizontal' weightx='1.0'>
- <JTextField id="fieldGearEffortUnit" text='{jaxx.runtime.Util.getStringValue(getBean().getEffortUnit())}' onKeyReleased='getBean().setEffortUnit(fieldGearEffortUnit.getText())' enabled='{isActif()}'/>
+ <JTextField id="fieldGearEffortUnit" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getEffortUnit())}' onKeyReleased='getBean().setEffortUnit(fieldGearEffortUnit.getText())' enabled='{isActif()}'/>
</cell>
</row>
<row>
@@ -123,7 +123,7 @@
<JLabel text="isisfish.gear.technicalParameter" enabled='{isActif()}'/>
</cell>
<cell columns="2" fill='horizontal' weightx='1.0'>
- <JTextField id="fieldGearParamName" text='{jaxx.runtime.Util.getStringValue(getBean().getParameterName())}' onKeyReleased='getBean().setParameterName(fieldGearParamName.getText())' enabled='{isActif()}'/>
+ <JTextField id="fieldGearParamName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getParameterName())}' onKeyReleased='getBean().setParameterName(fieldGearParamName.getText())' enabled='{isActif()}'/>
</cell>
</row>
<row>
@@ -143,7 +143,7 @@
</cell>
<cell columns="2" fill='both' weightx='1.0' weighty='1.0'>
<JScrollPane>
- <JTextArea id="fieldGearComment" text='{jaxx.runtime.Util.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldGearComment.getText())' enabled='{isActif()}'/>
+ <JTextArea id="fieldGearComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldGearComment.getText())' enabled='{isActif()}'/>
</JScrollPane>
</cell>
</row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -68,7 +68,7 @@
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
- //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
combo.setModel(new DefaultComboBoxModel());
try {
editor.open(org.codelutin.util.FileUtil.getTempFile("", ".java"));
@@ -78,7 +78,7 @@
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
setComboModel();
}
}
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-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-02-24 13:27:40 UTC (rev 1870)
@@ -237,9 +237,10 @@
noModif();
for (TopiaEntity t : currentEntities){
t.update();
+ if (log.isDebugEnabled())
+ log.debug("updating : " + t);
}
isisContext.commitTransaction();
-// rootUI.repaintNode("$root/$ports/" + t.getTopiaId());
rootUI.repaintNode(currentNode.getContextPath());
rootUI.setInfoText(_("isisfish.message.save.finished"));
} catch (TopiaException eee) {
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -62,12 +62,12 @@
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
- //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
+ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
targetFactor.init(_("isisfish.metierSeasonInfoSpecies.targetFactor"), null, "TargetFactor", null, null, fr.ifremer.isisfish.equation.TargetSpeciesTargetFactorEquation.class);
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text")
+ //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text")
}
}
});
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-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -55,22 +55,29 @@
protected Interval interval = null;
protected IntervalPanel ip = new IntervalPanel();
displayMetierSeason.add(ip, BorderLayout.CENTER);
+ boolean init = false;
ip.addPropertyChangeListener(new PropertyChangeListener() {
@Override
public void propertyChange(PropertyChangeEvent evt) {
- // Data extraction
- Season season = (Season) fieldMetierSeasonChoice.getSelectedItem();
- if (season != null){
- Month first = season.getFirstMonth();
- first.setMonthNumber(ip.getModel().getFirst());
- getMetierSeasonInfo().setFirstMonth(first);
- Month last = season.getLastMonth();
- last.setMonthNumber(ip.getModel().getLast());
- getMetierSeasonInfo().setLastMonth(last);
+ if (getMetierSeasonInfo() != null){
+ getMetierSeasonInfo().setFirstMonth(new Month(interval.getFirst()));
+ getMetierSeasonInfo().setLastMonth(new Month(interval.getLast()));
+ if (!init){
+ // getVerifier().topiaChanged();
+ }
}
}
});
+
+ save.addActionListener(new ActionListener() {
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ getVerifier().topiaSave();
+ setCombo();
+ }
+ });
create.addActionListener(new ActionListener() {
@Override
@@ -93,7 +100,7 @@
if (!isActif()){
setMetierSeasonInfoNotNull(false);
}
- getVerifier().setSaveButton(save);
+ getVerifier().setSaveButton(save, false);
getVerifier().setCancelButton(cancel);
getVerifier().setNewButton(create, "MetierSeasonInfo", false);
getVerifier().setDeleteButton(remove, false);
@@ -159,7 +166,7 @@
items.add(new Item("null", " ", null, false));
if (metierSeasonInfoList != null){
for (MetierSeasonInfo m : metierSeasonInfoList){
- items.add(new Item(m.getFirstMonth().toString() + "-" + m.getLastMonth().toString(), m.getFirstMonth().toString() + "-" + m.getLastMonth().toString(), m, false));
+ items.add(new Item(m.getFirstMonth().toString() + "-" + m.getLastMonth().toString(), m.getFirstMonth().toString() + "-" + m.getLastMonth().toString(), m, (m == getMetierSeasonInfo())));
}
}
fieldMetierSeasonChoice.setItems(items);
@@ -173,11 +180,13 @@
getMetierSeasonInfo().setZone(zones);
}
protected void seasonChanged(){
+ init = true;
setMetierSeasonInfo((MetierSeasonInfoImpl)fieldMetierSeasonChoice.getSelectedItem());
getVerifier().addCurrentEntity(getMetierSeasonInfo());
setMetierSeasonInfoNotNull(getMetierSeasonInfo() != null);
setSeason();
setMetierZone();
+ init = false;
}
]]></script>
<Table id='body'>
@@ -218,7 +227,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.Util.getStringValue(getMetierSeasonInfo().getSeasonZoneComment())}' onKeyReleased='getMetierSeasonInfo().setSeasonZoneComment(fieldMetierSeasonZoneComment.getText())' enabled='{isMetierSeasonInfoNotNull()}'/>
+ <JTextArea id="fieldMetierSeasonZoneComment" text='{getMetierSeasonInfo() == null ? "" : jaxx.runtime.SwingUtil.getStringValue(getMetierSeasonInfo().getSeasonZoneComment())}' onKeyReleased='getMetierSeasonInfo().setSeasonZoneComment(fieldMetierSeasonZoneComment.getText())' enabled='{isMetierSeasonInfoNotNull()}'/>
</JScrollPane>
</cell>
</row>
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-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -54,7 +54,7 @@
try {
if (getBean() != null){
init = true;
- jaxx.runtime.swing.Utils.fillComboBox(fieldMetierGear, getRegion().getGear(), getBean().getGear(),true);
+ jaxx.runtime.SwingUtil.fillComboBox(fieldMetierGear, getRegion().getGear(), getBean().getGear(),true);
init = false;
}
} catch (Exception ex) {
@@ -91,7 +91,7 @@
<JLabel text="isisfish.metier.rangeValues" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldMetierParam" text='{jaxx.runtime.Util.getStringValue(getBean().getGearParameterValue())}' onKeyReleased='getBean().setGearParameterValue(fieldMetierParam.getText())' enabled='{isActif()}'/>
+ <JTextField id="fieldMetierParam" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGearParameterValue())}' onKeyReleased='getBean().setGearParameterValue(fieldMetierParam.getText())' enabled='{isActif()}'/>
</cell>
</row>
<row>
@@ -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.Util.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldMetierComment.getText())' enabled='{isActif()}'/>
+ <JTextArea id="fieldMetierComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldMetierComment.getText())' enabled='{isActif()}'/>
</JScrollPane>
</cell>
</row>
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-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -53,7 +53,7 @@
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
- //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
+ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
fieldPopulationBasicsName.setText("");
fieldPopulationBasicsGeographicID.setText("");
fieldPopulationBasicsNbClasses.setText("");
@@ -65,7 +65,7 @@
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text")
+ //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text")
}
}
});
@@ -84,7 +84,7 @@
growthReverseEquation.init(_("isisfish.populationBasics.growthReverse"), getBean(), "GrowthReverse", "GrowthReverse", "EquationGrowthReverse", fr.ifremer.isisfish.equation.PopulationGrowthReverse.class);
if (getBean() != null){
if (getBean().getPopulationGroup() != null){
- jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationBasicsMatureClass, getBean().getPopulationGroup(), getBean().getMaturityGroup(), true);
+ jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationBasicsMatureClass, getBean().getPopulationGroup(), getBean().getMaturityGroup(), true);
}
setTableAgeLengthModel();
}
@@ -161,7 +161,7 @@
<JLabel text="isisfish.populationBasics.geographicID" enabled='{isActif()}'/>
</cell>
<cell columns='2' fill='horizontal' weightx='1.0'>
- <JTextField id="fieldPopulationBasicsGeographicID" text='{jaxx.runtime.Util.getStringValue(getBean().getGeographicId())}' onKeyReleased='getBean().setGeographicId(fieldPopulationBasicsGeographicID.getText())' enabled='{isActif()}'/>
+ <JTextField id="fieldPopulationBasicsGeographicID" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGeographicId())}' onKeyReleased='getBean().setGeographicId(fieldPopulationBasicsGeographicID.getText())' enabled='{isActif()}'/>
</cell>
</row>
<row>
@@ -207,7 +207,7 @@
</cell>
<cell columns='2' fill='both' weightx='1.0' weighty='0.2'>
<JScrollPane>
- <JTextArea id="fieldPopulationBasicsComment" text='{jaxx.runtime.Util.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPopulationBasicsComment.getText())' enabled='{isActif()}'/>
+ <JTextArea id="fieldPopulationBasicsComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPopulationBasicsComment.getText())' enabled='{isActif()}'/>
</JScrollPane>
</cell>
</row>
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-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -50,13 +50,13 @@
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
- //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
+ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
fieldPopulationCapturabilityComment.setText("");
fieldPopulationCapturability.setMatrix(null);
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
}
}
});
@@ -104,7 +104,7 @@
<row>
<cell columns='2' fill='both' weightx='1.0' weighty='1.0'>
<JScrollPane>
- <JTextArea id="fieldPopulationCapturabilityComment" text='{jaxx.runtime.Util.getStringValue(getBean().getCapturabilityComment())}' onKeyReleased='getBean().setCapturabilityComment(fieldPopulationCapturabilityComment.getText())' enabled='{isActif()}'/>
+ <JTextArea id="fieldPopulationCapturabilityComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getCapturabilityComment())}' onKeyReleased='getBean().setCapturabilityComment(fieldPopulationCapturabilityComment.getText())' enabled='{isActif()}'/>
</JScrollPane>
</cell>
</row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2009-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -47,14 +47,14 @@
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
- //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
+ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
naturalDeathRate.init(_("isisfish.populationEquation.naturalDeathRate"), null, "NaturalDeathRate", "NaturalDeathRate", "EquationNaturalDeathRate", fr.ifremer.isisfish.equation.PopulationNaturalDeathRate.class);
meanWeight.init(_("isisfish.populationEquation.meanWeight"), null, "MeanWeight", "MeanWeight", "EquationMeanWeight", fr.ifremer.isisfish.equation.PopulationMeanWeight.class);
price.init(_("isisfish.populationEquation.price"), null, "Price", "Price", "EquationPrice", fr.ifremer.isisfish.equation.PopulationPrice.class);
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text")
+ //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text")
}
}
});
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-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -54,7 +54,7 @@
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
- //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
+ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
fieldPopulationGroupMeanWeight.setText("");
fieldPopulationGroupPrice.setText("");
fieldPopulationGroupReproductionRate.setText("");
@@ -66,7 +66,7 @@
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
}
}
});
@@ -81,7 +81,7 @@
setBean((PopulationImpl) population);
if (getBean() != null){
if (getBean().getPopulationGroup() != null){
- jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationGroupPopulationGroup,getBean().getPopulationGroup(), null, true);
+ jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationGroupPopulationGroup,getBean().getPopulationGroup(), null, true);
}
}
}
@@ -153,7 +153,7 @@
</cell>
<cell columns='2' fill='both' weightx='1.0' weighty='0.5'>
<JScrollPane>
- <JTextArea id="fieldPopulationGroupComment" text='{jaxx.runtime.Util.getStringValue(getPopulationGroup().getComment())}' onKeyReleased='getPopulationGroup().setComment(fieldPopulationGroupComment.getText())' enabled='{isPopGroupNotNull()}'/>
+ <JTextArea id="fieldPopulationGroupComment" text='{jaxx.runtime.SwingUtil.getStringValue(getPopulationGroup().getComment())}' onKeyReleased='getPopulationGroup().setComment(fieldPopulationGroupComment.getText())' enabled='{isPopGroupNotNull()}'/>
</JScrollPane>
</cell>
</row>
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-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -62,12 +62,12 @@
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
- //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
+ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
populationMigrationEmigrationTable.setMatrix(null);
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
}
}
});
@@ -143,12 +143,12 @@
}
protected void setFieldPopulationMigrationMigrationGroupChooserModel(){
if (getBean() != null && getBean().getPopulationGroup() != null){
- jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationEmigrationGroupChooser,getBean().getPopulationGroup(), null, true);
+ jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationMigrationEmigrationGroupChooser,getBean().getPopulationGroup(), null, true);
}
}
protected void setFieldPopulationMigrationMigrationDepartureZoneChooserModel(){
if (getBean() != null && getBean().getPopulationZone() != null){
- jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationEmigrationDepartureZoneChooser,getBean().getPopulationZone(), null, true);
+ jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationMigrationEmigrationDepartureZoneChooser,getBean().getPopulationZone(), null, true);
}
}
protected void add(){
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2009-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -50,14 +50,14 @@
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
- //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
+ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
migrationEquation.init(_("isisfish.common.migration"), null, "Migration", "MigrationEquation", "MigrationEquationAsString", fr.ifremer.isisfish.equation.MigrationEquation.class);
emigrationEquation.init(_("isisfish.common.emigration"), null, "Emigration", "EmigrationEquation", "EmigrationEquationAsString", fr.ifremer.isisfish.equation.EmigrationEquation.class);
immigrationEquation.init(_("isisfish.common.immigration"), null, "Immigration", "ImmigrationEquation", "ImmigrationEquationAsString", fr.ifremer.isisfish.equation.ImmigrationEquation.class);
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text")
+ //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text")
}
}
});
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-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -62,12 +62,12 @@
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
- //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
populationMigrationImmigrationTable.setMatrix(null);
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
}
}
});
@@ -119,12 +119,12 @@
}
protected void setFieldPopulationMigrationMigrationGroupChooserModel(){
if (getBean() != null && getBean().getPopulationGroup() != null){
- jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigrationGroupChooser, getBean().getPopulationGroup(), null, true);
+ jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationMigrationImmigrationGroupChooser, getBean().getPopulationGroup(), null, true);
}
}
protected void setFieldPopulationMigrationMigrationArrivalZoneChooserModel(){
if (getBean() != null && getBean().getPopulationZone() != null){
- jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigrationArrivalZoneChooser, getBean().getPopulationZone(), null, true);
+ jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationMigrationImmigrationArrivalZoneChooser, getBean().getPopulationZone(), null, true);
}
}
protected void add(){
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-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -62,12 +62,12 @@
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
- //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
populationMigrationMigrationTable.setMatrix(null);
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
}
}
});
@@ -123,17 +123,17 @@
}
protected void setFieldPopulationMigrationMigrationGroupChooserModel(){
if (getBean() != null && getBean().getPopulationGroup() != null){
- jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationGroup(), null, true);
+ jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationGroup(), null, true);
}
}
protected void setFieldPopulationMigrationMigrationDepartureZoneChooserModel(){
if (getBean() != null && getBean().getPopulationZone() != null){
- jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationDepartureZoneChooser,getBean().getPopulationZone(), null, true);
+ jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationMigrationMigrationDepartureZoneChooser,getBean().getPopulationZone(), null, true);
}
}
protected void setFieldPopulationMigrationMigrationArrivalZoneChooserModel(){
if (getBean() != null && getBean().getPopulationZone() != null){
- jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationArrivalZoneChooser,getBean().getPopulationZone(), null, true);
+ jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationMigrationMigrationArrivalZoneChooser,getBean().getPopulationZone(), null, true);
}
}
protected void add(){
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-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -52,13 +52,13 @@
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
- //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
fieldPopulationMigrationComment.setText("");
fieldUseEquationMigration.setSelected(false);
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
}
}
});
@@ -150,7 +150,7 @@
</cell>
<cell fill='both' weightx='1.0' weighty='0.3'>
<JScrollPane>
- <JTextArea id="fieldPopulationMigrationComment" text='{jaxx.runtime.Util.getStringValue(getBean().getMigrationComment())}' onKeyReleased='getBean().setMigrationComment(fieldPopulationMigrationComment.getText())' enabled='{isActif()}'/>
+ <JTextArea id="fieldPopulationMigrationComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getMigrationComment())}' onKeyReleased='getBean().setMigrationComment(fieldPopulationMigrationComment.getText())' enabled='{isActif()}'/>
</JScrollPane>
</cell>
</row>
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-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -50,14 +50,14 @@
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
- //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
fieldPopulationMonthGapBetweenReproRecrutement.setText("");
fieldPopulationRecruitmentComment.setText("");
reproductionEquation.init(_("isisfish.populationRecruitment.reproductionEquation"), null, "Reproduction", "ReproductionEquation", "EquationReproductionEquation", fr.ifremer.isisfish.equation.PopulationGrowth.class);
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
}
}
});
@@ -128,7 +128,7 @@
</cell>
<cell fill='both' weightx='1.0' weighty='0.5'>
<JScrollPane>
- <JTextArea id="fieldPopulationRecruitmentComment" text='{jaxx.runtime.Util.getStringValue(getBean().getRecruitmentComment())}' onKeyReleased='getBean().setRecruitmentComment(fieldPopulationRecruitmentComment.getText())' enabled='{isActif()}'/>
+ <JTextArea id="fieldPopulationRecruitmentComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getRecruitmentComment())}' onKeyReleased='getBean().setRecruitmentComment(fieldPopulationRecruitmentComment.getText())' enabled='{isActif()}'/>
</JScrollPane>
</cell>
</row>
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-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -41,6 +41,7 @@
<Boolean id='popSeasonInfoNotNull' javaBean='false'/>
<script><![CDATA[
+import fr.ifremer.isisfish.entities.Season;
import fr.ifremer.isisfish.entities.PopulationSeasonInfo;
import fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl;
import fr.ifremer.isisfish.types.Month;
@@ -49,20 +50,21 @@
import fr.ifremer.isisfish.ui.widget.Interval;
import fr.ifremer.isisfish.ui.widget.IntervalPanel;
+protected Interval interval = null;
protected IntervalPanel ip = new IntervalPanel();
-protected Interval interval = new Interval();
fieldPopulationSeasonInterval.add(ip, BorderLayout.CENTER);
+boolean init = false;
ip.addPropertyChangeListener(new PropertyChangeListener() {
@Override
public void propertyChange(PropertyChangeEvent evt) {
if (getPopulationSeasonInfo() != null){
- Month first = getPopulationSeasonInfo().getFirstMonth();
- first.setMonthNumber(ip.getModel().getFirst());
- getPopulationSeasonInfo().setFirstMonth(first);
- Month last = getPopulationSeasonInfo().getLastMonth();
- last.setMonthNumber(ip.getModel().getLast());
- getPopulationSeasonInfo().setLastMonth(last);
+ getPopulationSeasonInfo().setFirstMonth(new Month(interval.getFirst()));
+ getPopulationSeasonInfo().setLastMonth(new Month(interval.getLast()));
+
+ if (!init){
+ // getVerifier().topiaChanged();
+ }
}
}
});
@@ -71,12 +73,12 @@
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
- //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
fieldPopulationSeasonComment.setText("");
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
}
}
});
@@ -99,11 +101,20 @@
}
});
+save.addActionListener(new ActionListener() {
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ getVerifier().topiaSave();
+ setCombo();
+ }
+});
+
public void refresh(){
if (!isActif()){
setPopSeasonInfoNotNull(false);
}
- getVerifier().setSaveButton(save);
+ getVerifier().setSaveButton(save, false);
getVerifier().setCancelButton(cancel);
getVerifier().setNewButton(create, "PopulationSeasonInfo", false);
getVerifier().setDeleteButton(remove, false);
@@ -111,16 +122,17 @@
setBean((PopulationImpl) population);
// Model instanciation
+ interval = new Interval();
interval.setMin(0);
interval.setMax(11);
interval.setFirst(0);
interval.setLast(2);
+ setCombo();
setInterval();
ip.setLabelRenderer(Month.MONTH);
ip.setModel(interval);
- setCombo();
}
protected void setInterval(){
if(getPopulationSeasonInfo() != null){
@@ -150,21 +162,21 @@
}
protected void setCombo(){
if (getBean() != null){
- jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationSeasonInfoChooser,getBean().getPopulationSeasonInfo(), null, true);
+ jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationSeasonInfoChooser,getBean().getPopulationSeasonInfo(), getPopulationSeasonInfo(), true);
}
}
protected void seasonGroupChanged(){
if (getPopulationSeasonInfo() != null){
getPopulationSeasonInfo().setGroupChange(fieldPopulationSeasonGroupChange.isSelected());
- System.out.println("getPopulationSeasonInfo() : " + getPopulationSeasonInfo());
}
}
protected void seasonChanged(){
+ init = true;
setPopulationSeasonInfo((PopulationSeasonInfoImpl)fieldPopulationSeasonInfoChooser.getSelectedItem());
- System.out.println("getPopulationSeasonInfo() : " + getPopulationSeasonInfo());
getVerifier().addCurrentEntity(getPopulationSeasonInfo());
setPopSeasonInfoNotNull(getPopulationSeasonInfo() != null);
setInterval();
+ init = false;
}
]]>
</script>
@@ -213,7 +225,7 @@
</cell>
<cell fill='both' weightx='1.0' weighty='1.0'>
<JScrollPane>
- <JTextArea id="fieldPopulationSeasonComment" text='{jaxx.runtime.Util.getStringValue(getBean().getSeasonsComment())}' onKeyReleased='getBean().setSeasonsComment(fieldPopulationSeasonComment.getText())' enabled='{isPopSeasonInfoNotNull()}'/>
+ <JTextArea id="fieldPopulationSeasonComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getSeasonsComment())}' onKeyReleased='getBean().setSeasonsComment(fieldPopulationSeasonComment.getText())' enabled='{isPopSeasonInfoNotNull()}'/>
</JScrollPane>
</cell>
</row>
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-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -60,11 +60,11 @@
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
- //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
}
}
});
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-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -72,13 +72,13 @@
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
- //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
fieldPortName.setText("");
fieldPortComment.setText("");
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
}
}
});
@@ -168,7 +168,7 @@
<row>
<cell columns='2' fill='both' weighty='0.3' weightx='1.0' >
<JScrollPane>
- <JTextArea id="fieldPortComment" text='{jaxx.runtime.Util.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPortComment.getText())' enabled='{isActif()}'/>
+ <JTextArea id="fieldPortComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPortComment.getText())' enabled='{isActif()}'/>
</JScrollPane>
</cell>
</row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2009-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -62,12 +62,12 @@
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
- //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
selectivityEquation.init(_("isisfish.selectivity.equation"), null, "Selectivity", null, null, fr.ifremer.isisfish.equation.SelectivityEquation.class);
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
}
}
});
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-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -53,12 +53,12 @@
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
- //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
+ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
technicalEfficiency.init(_("isisfish.setOfVessels.technicalEfficiency"), null, "TechnicalEfficiency", "TechnicalEfficiencyEquation", "EquationTechnicalEfficiency", fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEquation.class);
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
}
}
});
@@ -72,8 +72,8 @@
setBean((SetOfVesselsImpl) setOfVessels);
if (getBean() != null){
init = true;
- jaxx.runtime.swing.Utils.fillComboBox(fieldSetOfVesselsPort,getRegion().getPort(), getBean().getPort(), true);
- jaxx.runtime.swing.Utils.fillComboBox(fieldSetOfVesselsVesselType,getRegion().getVesselType(), getBean().getVesselType(), true);
+ jaxx.runtime.SwingUtil.fillComboBox(fieldSetOfVesselsPort,getRegion().getPort(), getBean().getPort(), true);
+ jaxx.runtime.SwingUtil.fillComboBox(fieldSetOfVesselsVesselType,getRegion().getVesselType(), getBean().getVesselType(), true);
init=false;
technicalEfficiency.init(_("isisfish.setOfVessels.technicalEfficiency"), getBean(), "TechnicalEfficiency", "TechnicalEfficiencyEquation", "EquationTechnicalEfficiency", fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEquation.class);
getVerifier().addCurrentPanel(technicalEfficiency);
@@ -144,7 +144,7 @@
</cell>
<cell fill='both' weightx='1.0' weighty='0.3'>
<JScrollPane>
- <JTextArea id="fieldSetOfVesselsComment" text='{jaxx.runtime.Util.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldSetOfVesselsComment.getText())' enabled='{isActif()}'/>
+ <JTextArea id="fieldSetOfVesselsComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldSetOfVesselsComment.getText())' enabled='{isActif()}'/>
</JScrollPane>
</cell>
</row>
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-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -49,7 +49,7 @@
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
- //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
fieldSpeciesName.setText("");
fieldSpeciesScientificName.setText("");
fieldSpeciesCodeRubbin.setText("");
@@ -58,7 +58,7 @@
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
}
}
});
@@ -92,7 +92,7 @@
<JLabel text="isisfish.species.scientificName" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' columns='2' weightx='1.0'>
- <JTextField id="fieldSpeciesScientificName" text='{jaxx.runtime.Util.getStringValue(getBean().getScientificName())}' onKeyReleased='getBean().setScientificName(fieldSpeciesScientificName.getText())' enabled='{isActif()}'/>
+ <JTextField id="fieldSpeciesScientificName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getScientificName())}' onKeyReleased='getBean().setScientificName(fieldSpeciesScientificName.getText())' enabled='{isActif()}'/>
</cell>
</row>
<row>
@@ -100,7 +100,7 @@
<JLabel text="isisfish.species.rubbinCode" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' columns='2' weightx='1.0'>
- <JTextField id="fieldSpeciesCodeRubbin" text='{jaxx.runtime.Util.getStringValue(getBean().getCodeRubbin())}' onKeyReleased='getBean().setCodeRubbin(fieldSpeciesCodeRubbin.getText())' enabled='{isActif()}'/>
+ <JTextField id="fieldSpeciesCodeRubbin" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getCodeRubbin())}' onKeyReleased='getBean().setCodeRubbin(fieldSpeciesCodeRubbin.getText())' enabled='{isActif()}'/>
</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.Util.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldSpeciesComment.getText())' enabled='{isActif()}'/>
+ <JTextArea id="fieldSpeciesComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldSpeciesComment.getText())' enabled='{isActif()}'/>
</JScrollPane>
</cell>
</row>
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-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -56,14 +56,14 @@
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
- //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
+ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
numberOfTrips.setText("");
fieldStrategyMonthInfoMinInactivityDays.setText("");
fieldStrategyMonthInfoProportion.setMatrix(null);
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
}
}
});
@@ -93,7 +93,7 @@
for (ActionListener listener : listeners){
fieldStrategyMonthInfoTripType.removeActionListener(listener);
}
- jaxx.runtime.swing.Utils.fillComboBox(fieldStrategyMonthInfoTripType,getRegion().getTripType(), getStrategyMonthInfo().getTripType(), true);
+ jaxx.runtime.SwingUtil.fillComboBox(fieldStrategyMonthInfoTripType,getRegion().getTripType(), getStrategyMonthInfo().getTripType(), true);
for (ActionListener listener : listeners){
fieldStrategyMonthInfoTripType.addActionListener(listener);
}
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-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -52,7 +52,7 @@
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
- //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
+ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
fieldStrategyName.setText("");
fieldStrategyProportionSetOfVessels.setText("0.0");
fieldStrategyComment.setText("");
@@ -60,7 +60,7 @@
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
}
}
});
@@ -83,7 +83,7 @@
for (ActionListener listener : listeners){
fieldStrategySetOfVessels.removeActionListener(listener);
}
- jaxx.runtime.swing.Utils.fillComboBox(fieldStrategySetOfVessels,getRegion().getSetOfVessels(), getBean().getSetOfVessels(), true);
+ jaxx.runtime.SwingUtil.fillComboBox(fieldStrategySetOfVessels,getRegion().getSetOfVessels(), getBean().getSetOfVessels(), true);
for (ActionListener listener : listeners){
fieldStrategySetOfVessels.addActionListener(listener);
}
@@ -136,7 +136,7 @@
</cell>
<cell fill='both' weightx='1.0' weighty='0.3'>
<JScrollPane>
- <JTextArea id="fieldStrategyComment" text='{jaxx.runtime.Util.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldStrategyComment.getText())' enabled='{isActif()}'/>
+ <JTextArea id="fieldStrategyComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldStrategyComment.getText())' enabled='{isActif()}'/>
</JScrollPane>
</cell>
</row>
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-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -49,7 +49,7 @@
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
- //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
fieldTripTypeName.setText("");
fieldTripTypeDuration.setText("");
fieldTripTypeMinTimeBetweenTrip.setText("");
@@ -57,7 +57,7 @@
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
}
}
});
@@ -106,7 +106,7 @@
</cell>
<cell fill='both' weightx='1.0' weighty='1.0'>
<JScrollPane>
- <JTextArea id="fieldTripTypeComment" text='{jaxx.runtime.Util.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldTripTypeComment.getText())' enabled='{isActif()}'/>
+ <JTextArea id="fieldTripTypeComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldTripTypeComment.getText())' enabled='{isActif()}'/>
</JScrollPane>
</cell>
</row>
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-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -49,7 +49,7 @@
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
- //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
fieldVesselTypeName.setText("");
fieldVesselTypeLength.setText("");
fieldVesselTypeSpeed.setText("");
@@ -62,7 +62,7 @@
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
}
}
});
@@ -169,7 +169,7 @@
</cell>
<cell fill='both' weightx='1.0' weighty='0.3'>
<JScrollPane>
- <JTextArea id="fieldVesselTypeComment" text='{jaxx.runtime.Util.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldVesselTypeComment.getText())' enabled='{isActif()}'/>
+ <JTextArea id="fieldVesselTypeComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldVesselTypeComment.getText())' enabled='{isActif()}'/>
</JScrollPane>
</cell>
</row>
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-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -65,14 +65,14 @@
}
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
-// jaxx.runtime.Util.removeDataBinding($InputContentUI0, "fieldZoneName.text", "fieldZoneComment.text");
+// jaxx.runtime.SwingUtil.removeDataBinding($InputContentUI0, "fieldZoneName.text", "fieldZoneComment.text");
fieldZoneName.setText("");
fieldZoneComment.setText("");
zoneMap.setSelectedCells((Cell)null);
}
if (evt.getNewValue() != null) {
// add binding on getBean()
- //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
}
}
});
@@ -135,7 +135,7 @@
<row>
<cell columns='2' fill='horizontal' weightx='1.0'>
<JTextField id="fieldZoneName"
- text='{jaxx.runtime.Util.getStringValue(getBean().getName())}'
+ text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getName())}'
enabled='{isActif()}'
onKeyReleased='getBean().setName(fieldZoneName.getText())'/>
</cell>
@@ -161,7 +161,7 @@
<cell columns='2' fill='both' weighty='0.3' weightx='1.0'>
<JScrollPane>
<JTextArea id="fieldZoneComment"
- text='{jaxx.runtime.Util.getStringValue(getBean().getComment())}'
+ text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}'
enabled='{isActif()}'
onKeyReleased='getBean().setComment(fieldZoneComment.getText())'/>
</JScrollPane>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUIJAXX.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUIJAXX.jaxx 2009-02-24 11:45:48 UTC (rev 1869)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUIJAXX.jaxx 2009-02-24 13:27:40 UTC (rev 1870)
@@ -91,10 +91,10 @@
protected void displayGraph(){
- jaxx.runtime.Util.assignment(chart = new JFreeChart(model.getTitle(), JFreeChart.DEFAULT_TITLE_FONT, model.getCategoryPlot(), true), "chart", fr.ifremer.isisfish.ui.result.GraphBeanUIJAXX.this);
+ jaxx.runtime.SwingUtil.assignment(chart = new JFreeChart(model.getTitle(), JFreeChart.DEFAULT_TITLE_FONT, model.getCategoryPlot(), true), "chart", fr.ifremer.isisfish.ui.result.GraphBeanUIJAXX.this);
- jaxx.runtime.Util.assignment(chartPanel = new ChartPanel(chart,true,true,true,true,true), "chartPanel", fr.ifremer.isisfish.ui.result.GraphBeanUIJAXX.this);
- jaxx.runtime.Util.assignment(graphPalette = new ChartPropertyEditPanel(chart), "graphPalette", fr.ifremer.isisfish.ui.result.GraphBeanUIJAXX.this);
+ jaxx.runtime.SwingUtil.assignment(chartPanel = new ChartPanel(chart,true,true,true,true,true), "chartPanel", fr.ifremer.isisfish.ui.result.GraphBeanUIJAXX.this);
+ jaxx.runtime.SwingUtil.assignment(graphPalette = new ChartPropertyEditPanel(chart), "graphPalette", fr.ifremer.isisfish.ui.result.GraphBeanUIJAXX.this);
//getGraphSplitPane().setDividerLocation(1.0);
1
0
r1869 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org 24 Feb '09
by sletellier＠users.labs.libre-entreprise.org 24 Feb '09
24 Feb '09
Author: sletellier
Date: 2009-02-24 11:45:48 +0000 (Tue, 24 Feb 2009)
New Revision: 1869
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/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/PopulationRecruitmentUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx
Log:
Matrix update bug fixed
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-02-24 11:37:24 UTC (rev 1868)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-02-24 11:45:48 UTC (rev 1869)
@@ -77,8 +77,7 @@
@Override
public void matrixChanged(MatrixPanelEvent arg0) {
if (getBean() != null && fieldPopulationCapturability.getMatrix() != null){
- getBean().setCapturability(fieldPopulationCapturability.getMatrix());
- System.out.println(getBean().getCapturability() + " " + fieldPopulationCapturability.getMatrix());
+ getBean().setCapturability(fieldPopulationCapturability.getMatrix().copy());
}
}
};
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-02-24 11:37:24 UTC (rev 1868)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-02-24 11:45:48 UTC (rev 1869)
@@ -136,7 +136,7 @@
public void matrixChanged(MatrixPanelEvent arg0) {
remove.setEnabled(populationMigrationEmigrationTable.getTable().getSelectedRow() != -1);
if (popInfo != null){
- popInfo.setMigrationMatrix(populationMigrationEmigrationTable.getMatrix());
+ popInfo.setMigrationMatrix(populationMigrationEmigrationTable.getMatrix().copy());
}
}
});
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-02-24 11:37:24 UTC (rev 1868)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-02-24 11:45:48 UTC (rev 1869)
@@ -100,7 +100,7 @@
@Override
public void matrixChanged(MatrixPanelEvent arg0) {
if (getPopInfo() != null){
- getPopInfo().setImmigrationMatrix(populationMigrationImmigrationTable.getMatrix());
+ getPopInfo().setImmigrationMatrix(populationMigrationImmigrationTable.getMatrix().copy());
}
}
});
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-02-24 11:37:24 UTC (rev 1868)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-02-24 11:45:48 UTC (rev 1869)
@@ -100,7 +100,7 @@
@Override
public void matrixChanged(MatrixPanelEvent arg0) {
if (getPopInfo() != null){
- getPopInfo().setMigrationMatrix(populationMigrationMigrationTable.getMatrix());
+ getPopInfo().setMigrationMatrix(populationMigrationMigrationTable.getMatrix().copy());
}
}
};
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-02-24 11:37:24 UTC (rev 1868)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-02-24 11:45:48 UTC (rev 1869)
@@ -67,7 +67,7 @@
public void matrixChanged(MatrixPanelEvent arg0) {
if (getBean() != null){
if (fieldPopulationRecruitmentDistribution.getMatrix() != null){
- getBean().setRecruitmentDistribution(fieldPopulationRecruitmentDistribution.getMatrix());
+ getBean().setRecruitmentDistribution(fieldPopulationRecruitmentDistribution.getMatrix().copy());
}
}
}
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-02-24 11:37:24 UTC (rev 1868)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2009-02-24 11:45:48 UTC (rev 1869)
@@ -82,7 +82,7 @@
fieldPopulationMappingZoneReproZoneRecru.addMatrixListener(listener);
}
protected void fieldPopulationMappingZoneReproZoneRecruChanged(){
- getBean().setMappingZoneReproZoneRecru(fieldPopulationMappingZoneReproZoneRecru.getMatrix());
+ getBean().setMappingZoneReproZoneRecru(fieldPopulationMappingZoneReproZoneRecru.getMatrix().copy());
}
protected void setFieldPopulationMappingZoneReproZoneRecru(){
if (getBean() != null){
1
0
Author: tchemit
Date: 2009-02-24 11:37:24 +0000 (Tue, 24 Feb 2009)
New Revision: 1868
Modified:
isis-fish/trunk/pom.xml
Log:
passage en jaxx 1.2-SNAPSHOT
Modified: isis-fish/trunk/pom.xml
===================================================================
--- isis-fish/trunk/pom.xml 2009-02-24 11:34:08 UTC (rev 1867)
+++ isis-fish/trunk/pom.xml 2009-02-24 11:37:24 UTC (rev 1868)
@@ -345,7 +345,7 @@
<labs.project>isis-fish</labs.project>
<!-- Custom version -->
- <jaxx.version>1.1</jaxx.version>
+ <jaxx.version>1.2-SNAPSHOT</jaxx.version>
<topia.version>2.1.3</topia.version>
<topia.service.version>1.0.2</topia.service.version>
<lutinmatrix.version>1.2</lutinmatrix.version>
@@ -435,6 +435,10 @@
<goal>generate</goal>
</goals>
<configuration>
+ <extraImports>
+ <value>jaxx.runtime.SwingUtil</value>
+ <value>static jaxx.runtime.Util.getStringValue</value>
+ </extraImports>
<addSourcesToClassPath>true</addSourcesToClassPath>
<addProjectClassPath>true</addProjectClassPath>
</configuration>
1
0
r1867 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org 24 Feb '09
by sletellier＠users.labs.libre-entreprise.org 24 Feb '09
24 Feb '09
Author: sletellier
Date: 2009-02-24 11:34:08 +0000 (Tue, 24 Feb 2009)
New Revision: 1867
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/PopulationCapturabilityUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx
Log:
Debug final
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-02-24 10:57:50 UTC (rev 1866)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-02-24 11:34:08 UTC (rev 1867)
@@ -55,33 +55,22 @@
protected Interval interval = null;
protected IntervalPanel ip = new IntervalPanel();
displayMetierSeason.add(ip, BorderLayout.CENTER);
- ip.addPropertyChangeListener("first", new PropertyChangeListener() {
+ ip.addPropertyChangeListener(new PropertyChangeListener() {
@Override
public void propertyChange(PropertyChangeEvent evt) {
- // Data extraction
- Season season = (Season) fieldMetierSeasonChoice.getSelectedItem();
- if (season != null){
- Month first = season.getFirstMonth();
- first.setMonthNumber(ip.getModel().getFirst());
- season.setFirstMonth(first);
- }
- }
- });
- ip.addPropertyChangeListener("last", new PropertyChangeListener() {
-
- @Override
- public void propertyChange(PropertyChangeEvent evt) {
// Data extraction
Season season = (Season) fieldMetierSeasonChoice.getSelectedItem();
if (season != null){
+ Month first = season.getFirstMonth();
+ first.setMonthNumber(ip.getModel().getFirst());
+ getMetierSeasonInfo().setFirstMonth(first);
Month last = season.getLastMonth();
last.setMonthNumber(ip.getModel().getLast());
- season.setLastMonth(last);
+ getMetierSeasonInfo().setLastMonth(last);
}
}
});
-
create.addActionListener(new ActionListener() {
@Override
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-02-24 10:57:50 UTC (rev 1866)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-02-24 11:34:08 UTC (rev 1867)
@@ -43,17 +43,8 @@
import org.codelutin.math.matrix.gui.MatrixPanelEvent;
import org.codelutin.math.matrix.gui.MatrixPanelListener;
-MatrixPanelListener listener = new MatrixPanelListener() {
- @Override
- public void matrixChanged(MatrixPanelEvent arg0) {
- if (getBean() != null){
- if (fieldPopulationCapturability.getMatrix() != null){
- getBean().setCapturability(fieldPopulationCapturability.getMatrix());
- }
- }
- }
-};
+MatrixPanelListener listener = null;
addPropertyChangeListener("bean", new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
@@ -81,6 +72,16 @@
fieldPopulationCapturability.setMatrix(getBean().getCapturability().copy());
}
}
+ listener = new MatrixPanelListener() {
+
+ @Override
+ public void matrixChanged(MatrixPanelEvent arg0) {
+ if (getBean() != null && fieldPopulationCapturability.getMatrix() != null){
+ getBean().setCapturability(fieldPopulationCapturability.getMatrix());
+ System.out.println(getBean().getCapturability() + " " + fieldPopulationCapturability.getMatrix());
+ }
+ }
+ };
fieldPopulationCapturability.addMatrixListener(listener);
}
]]>
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-02-24 10:57:50 UTC (rev 1866)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-02-24 11:34:08 UTC (rev 1867)
@@ -52,7 +52,7 @@
protected IntervalPanel ip = new IntervalPanel();
protected Interval interval = new Interval();
fieldPopulationSeasonInterval.add(ip, BorderLayout.CENTER);
-ip.addPropertyChangeListener("first", new PropertyChangeListener() {
+ip.addPropertyChangeListener(new PropertyChangeListener() {
@Override
public void propertyChange(PropertyChangeEvent evt) {
@@ -60,15 +60,6 @@
Month first = getPopulationSeasonInfo().getFirstMonth();
first.setMonthNumber(ip.getModel().getFirst());
getPopulationSeasonInfo().setFirstMonth(first);
- }
- }
-});
-
- ip.addPropertyChangeListener("last", new PropertyChangeListener() {
-
- @Override
- public void propertyChange(PropertyChangeEvent evt) {
- if (getPopulationSeasonInfo() != null){
Month last = getPopulationSeasonInfo().getLastMonth();
last.setMonthNumber(ip.getModel().getLast());
getPopulationSeasonInfo().setLastMonth(last);
@@ -163,12 +154,14 @@
}
}
protected void seasonGroupChanged(){
- if (getPopulationSeasonInfo() == null){
+ if (getPopulationSeasonInfo() != null){
getPopulationSeasonInfo().setGroupChange(fieldPopulationSeasonGroupChange.isSelected());
+ System.out.println("getPopulationSeasonInfo() : " + getPopulationSeasonInfo());
}
}
protected void seasonChanged(){
setPopulationSeasonInfo((PopulationSeasonInfoImpl)fieldPopulationSeasonInfoChooser.getSelectedItem());
+ System.out.println("getPopulationSeasonInfo() : " + getPopulationSeasonInfo());
getVerifier().addCurrentEntity(getPopulationSeasonInfo());
setPopSeasonInfoNotNull(getPopulationSeasonInfo() != null);
setInterval();
1
0
r1866 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors
by chatellier＠users.labs.libre-entreprise.org 24 Feb '09
by chatellier＠users.labs.libre-entreprise.org 24 Feb '09
24 Feb '09
Author: chatellier
Date: 2009-02-24 10:57:50 +0000 (Tue, 24 Feb 2009)
New Revision: 1866
Modified:
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/ContinuousDomain.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/DiscreteDomain.java
Log:
Update factors classes.
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/ContinuousDomain.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/ContinuousDomain.java 2009-02-24 10:33:31 UTC (rev 1865)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/ContinuousDomain.java 2009-02-24 10:57:50 UTC (rev 1866)
@@ -66,6 +66,34 @@
}
/**
+ * @return the minBound
+ */
+ public E getMinBound() {
+ return minBound;
+ }
+
+ /**
+ * @param minBound the minBound to set
+ */
+ public void setMinBound(E minBound) {
+ this.minBound = minBound;
+ }
+
+ /**
+ * @return the maxBound
+ */
+ public E getMaxBound() {
+ return maxBound;
+ }
+
+ /**
+ * @param maxBound the maxBound to set
+ */
+ public void setMaxBound(E maxBound) {
+ this.maxBound = maxBound;
+ }
+
+ /**
* {@inheritDoc}.
*
* In continuous domain, just return identifier
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/DiscreteDomain.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/DiscreteDomain.java 2009-02-24 10:33:31 UTC (rev 1865)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/factors/DiscreteDomain.java 2009-02-24 10:57:50 UTC (rev 1866)
@@ -20,6 +20,7 @@
import java.io.Serializable;
import java.util.SortedMap;
+import java.util.TreeMap;
import org.apache.commons.lang.builder.ToStringBuilder;
@@ -52,7 +53,7 @@
* Contructor.
*/
public DiscreteDomain() {
-
+ values = new TreeMap<Serializable, E>();
}
/**
1
0