Author: sletellier
Date: 2009-03-23 14:19:22 +0000 (Mon, 23 Mar 2009)
New Revision: 2024
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/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/PopulationSeasonsUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx
Log:
Using JAXXMatrixEditor
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-03-23 14:19:21 UTC (rev 2023)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-03-23 14:19:22 UTC (rev 2024)
@@ -92,7 +92,7 @@
</row>
<row>
<cell columns='2' fill='both' weightx='1.0'>
- <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationCapturability' matrix='{getBean().getCapturability() == null ? null : getBean().getCapturability().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"Capturability"'/>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationCapturability' matrix='{getBean().getCapturability() == null ? null : getBean().getCapturability().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"Capturability"'/>
</cell>
</row>
<row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-03-23 14:19:21 UTC (rev 2023)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-03-23 14:19:22 UTC (rev 2024)
@@ -133,7 +133,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()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"NaturalDeathRateMatrix"'/>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationGroupNaturalDeathRate' matrix='{getBean() == null || getPopulationGroup() == null ? null : ((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup())}' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"NaturalDeathRateMatrix"'/>
</cell>
</row>
<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-03-23 14:19:21 UTC (rev 2023)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-03-23 14:19:22 UTC (rev 2024)
@@ -202,7 +202,7 @@
</row>
<row columns='4'>
<cell fill='both' weightx='1.0' weighty='1.0'>
- <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationEmigrationTable' linearModel="true" matrix='{getPopInfo().getEmigrationMatrix().copy()}' enabled='{isActif()}'/>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationEmigrationTable' linearModel="true" matrix='{getPopInfo().getEmigrationMatrix().copy()}' enabled='{isActif()}'/>
</cell>
</row>
<row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-03-23 14:19:21 UTC (rev 2023)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-03-23 14:19:22 UTC (rev 2024)
@@ -198,7 +198,7 @@
</row>
<row columns='4'>
<cell fill='both' weightx='1.0' weighty='1.0'>
- <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationImmigrationTable' linearModel="true" matrix='{getPopInfo().getImmigrationMatrix().copy()}' enabled='{isActif()}'/>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationImmigrationTable' linearModel="true" matrix='{getPopInfo().getImmigrationMatrix().copy()}' enabled='{isActif()}'/>
</cell>
</row>
<row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-03-23 14:19:21 UTC (rev 2023)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-03-23 14:19:22 UTC (rev 2024)
@@ -213,7 +213,7 @@
</row>
<row columns='4'>
<cell fill='both' weightx='1.0' weighty='1.0'>
- <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationMigrationTable' linearModel="true" matrix='{getPopInfo().getMigrationMatrix().copy()}' enabled='{isActif()}'/>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationMigrationTable' linearModel='{true}' matrix='{getPopInfo().getMigrationMatrix().copy()}' enabled='{isActif()}'/>
</cell>
</row>
<row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-03-23 14:19:21 UTC (rev 2023)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-03-23 14:19:22 UTC (rev 2024)
@@ -113,7 +113,7 @@
<JLabel text="isisfish.populationRecruitment.recruitmentDistribution" enabled='{isActif()}'/>
</cell>
<cell fill='both' weightx='1.0'>
- <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationRecruitmentDistribution' matrix='{getBean().getRecruitmentDistribution() == null ? null : getBean().getRecruitmentDistribution().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"RecruitmentDistribution"'/>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationRecruitmentDistribution' matrix='{getBean().getRecruitmentDistribution() == null ? null : getBean().getRecruitmentDistribution().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"RecruitmentDistribution"'/>
</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-03-23 14:19:21 UTC (rev 2023)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-03-23 14:19:22 UTC (rev 2024)
@@ -235,7 +235,7 @@
<JLabel text="isisfish.populationSeasons.distributionSpawning" enabled='{isPopSeasonInfoNotNull()}'/>
</cell>
<cell fill='both' weightx='1.0'>
- <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationSeasonReproductionDistribution'
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationSeasonReproductionDistribution'
matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix()}' enabled='{isPopSeasonInfoNotNull()}'
decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"LengthChangeMatrix"'/>
</cell>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2009-03-23 14:19:21 UTC (rev 2023)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2009-03-23 14:19:22 UTC (rev 2024)
@@ -165,7 +165,7 @@
</row>
<row>
<cell columns='3' fill='both' weightx='1.0' weighty='0.5'>
- <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationMappingZoneReproZoneRecru' enabled='{isActif()}'/>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationMappingZoneReproZoneRecru' enabled='{isActif()}'/>
</cell>
</row>
</Table>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-03-23 14:19:21 UTC (rev 2023)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-03-23 14:19:22 UTC (rev 2024)
@@ -149,7 +149,7 @@
</row>
<row>
<cell columns='2' fill='both' weightx='1.0' weighty='1.0'>
- <org.codelutin.math.matrix.gui.MatrixPanelEditor id="fieldStrategyMonthInfoProportion" linearModelShowDefault='{true}' linearModel='{true}' matrix='{getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"ProportionMetier"'/>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id="fieldStrategyMonthInfoProportion" linearModelShowDefault='{true}' linearModel='{true}' matrix='{getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"ProportionMetier"'/>
</cell>
</row>
</Table>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-03-23 14:19:21 UTC (rev 2023)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-03-23 14:19:22 UTC (rev 2024)
@@ -48,7 +48,9 @@
import jaxx.runtime.JAXXInitialContext;
import jaxx.runtime.swing.JAXXList;
import org.codelutin.math.matrix.MatrixND;
-import org.codelutin.math.matrix.gui.MatrixPanelEditor;
+import org.codelutin.math.matrix.gui.MatrixEditor;
+import org.codelutin.math.matrix.gui.JAXXMatrixEditor;
+import org.codelutin.math.matrix.gui.JAXXMatrixEditor;
import org.codelutin.topia.persistence.TopiaEntity;
import fr.ifremer.isisfish.ui.input.RangeOfValuesUI;
import fr.ifremer.isisfish.ui.input.SelectivityEditorUI;
@@ -58,6 +60,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.swing.JPanel;
+import org.codelutin.math.matrix.gui.MatrixEditor;
/**
*
@@ -77,9 +80,9 @@
if (result instanceof JTextField) {
((JTextComponent) result).setText(String.valueOf(callMethod(e, fieldName)));
- } else if (result instanceof MatrixPanelEditor){
- MatrixPanelEditor ui = (MatrixPanelEditor) c;
- MatrixPanelEditor matrix = new MatrixPanelEditor();
+ } else if (result instanceof MatrixEditor){
+ MatrixEditor ui = (MatrixEditor) c;
+ JAXXMatrixEditor matrix = new JAXXMatrixEditor();
matrix.setMatrix((MatrixND)callMethod(e, fieldName));
matrix.setLinearModel(ui.isLinearModel());
matrix.setLinearModelShowDefault(ui.isLinearModelShowDefault());
@@ -198,7 +201,7 @@
ui.setMethodSet(origine.getMethodSet());
ui.setBean(e);
result = ui;
- } else if (c instanceof MatrixPanelEditor){
+ } else if (c instanceof MatrixEditor){
MatrixContinuousPanel matrixPanel = new MatrixContinuousPanel();
matrixPanel.setMatrix((MatrixND)callMethod(e, fieldName));
continuousPanel = matrixPanel.getDefaultContinuousPanel();
@@ -242,7 +245,7 @@
ui.setTable();
result = ui;
- } else if (c instanceof MatrixPanelEditor){
+ } else if (c instanceof MatrixEditor){
MatrixContinuousPanel panel = new MatrixContinuousPanel();
MatrixContinuousDomain matrixDomain = (MatrixContinuousDomain)domain;
panel.setMatrix(matrixDomain.getMatrix());
@@ -274,13 +277,13 @@
} else if (result instanceof RangeOfValuesUI){
result = new JTextField(value.toString());
- } else if (result instanceof MatrixPanelEditor){
- MatrixPanelEditor ui = (MatrixPanelEditor) c;
- MatrixPanelEditor matrix = new MatrixPanelEditor();
+ } else if (result instanceof MatrixEditor){
+ MatrixEditor ui = (MatrixEditor) c;
+ JAXXMatrixEditor matrix = new JAXXMatrixEditor();
matrix.setMatrix((MatrixND)value);
matrix.setLinearModel(ui.isLinearModel());
matrix.setLinearModelShowDefault(ui.isLinearModelShowDefault());
- result = ui;
+ result = matrix;
} else if (result instanceof JComboBox){
JComboBox combo = (JComboBox)c;
JComboBox comboResult = new JComboBox();
@@ -387,8 +390,8 @@
} else if (c instanceof JTable){
// ((JTable) result).setText(BeanUtils.getProperty(e, fieldName));
- } else if (c instanceof MatrixPanelEditor){
- result = ((MatrixPanelEditor)c).getMatrix();
+ } else if (c instanceof JAXXMatrixEditor){
+ result = ((JAXXMatrixEditor)c).getMatrix();
} else if (c instanceof JComboBox){
result = ((JComboBox) c).getSelectedItem();
@@ -455,7 +458,7 @@
return canBeContinue(c, o);
} else if (c instanceof InputOneEquationUI){
return true;
- } else if (c instanceof MatrixPanelEditor){
+ } else if (c instanceof JAXXMatrixEditor){
return true;
} else if (c instanceof RangeOfValuesUI){
RangeOfValuesUI ui = (RangeOfValuesUI)c;
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx 2009-03-23 14:19:21 UTC (rev 2023)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx 2009-03-23 14:19:22 UTC (rev 2024)
@@ -36,9 +36,7 @@
<script><![CDATA[
import org.codelutin.math.matrix.MatrixND;
-import org.codelutin.math.matrix.gui.MatrixPanelEditor;
-
-
+import org.codelutin.math.matrix.gui.JAXXMatrixEditor;
]]>
</script>
<Table id='content' constraints='BorderLayout.CENTER'>
@@ -53,7 +51,7 @@
</cell>
<cell fill='both' weightx='1' weighty='1'>
<JScrollPane>
- <MatrixPanelEditor id='componentPanel' matrix='{getMatrix()}' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/>
+ <JAXXMatrixEditor id='componentPanel' constructorParams='getMatrix(), false' matrix='{getMatrix()}' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/>
</JScrollPane>
</cell>
</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-03-23 14:19:21 UTC (rev 2023)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-03-23 14:19:22 UTC (rev 2024)
@@ -47,7 +47,7 @@
import fr.ifremer.isisfish.entities.Strategy;
import fr.ifremer.isisfish.entities.Population;
import fr.ifremer.isisfish.rule.Rule;
-import org.codelutin.math.matrix.gui.MatrixPanelEditor;
+import org.codelutin.math.matrix.gui.JAXXMatrixEditor;
import javax.swing.table.DefaultTableModel;
import java.text.ParseException;
import java.util.logging.Level;
@@ -564,7 +564,7 @@
<cell columns="4" fill="both" weightx="1.0" weighty="0.6">
<JTabbedPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'>
<tab title='{_("isisfish.params.populationNumbers")}'>
- <org.codelutin.math.matrix.gui.MatrixPanelEditor id="simulParamsNumbers" name="isisfish.params.populationNumbers"/>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id="simulParamsNumbers" name="isisfish.params.populationNumbers"/>
</tab>
<tab title='{_("isisfish.params.ruleParameters")}'>
<JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'>
