Author: sletellier
Date: 2009-02-18 09:40:10 +0000 (Wed, 18 Feb 2009)
New Revision: 1827
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/FisheryRegionUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java
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/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/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/PopulationRecruitmentUI.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/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/ZoneUI.jaxx
Log:
Fix bugs
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-18 09:12:21 UTC (rev 1826)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-02-18 09:40:10 UTC (rev 1827)
@@ -76,12 +76,16 @@
SetOfVessels setOfVessels = getVerifier().getEntity(SetOfVessels.class);
setBean((SetOfVesselsImpl) setOfVessels);
if (getBean() != null){
- fieldEffortDescriptionMetierList.fillList(getRegion().getMetier(), (Object)null);
+ if (getRegion().getMetier() != null){
+ fieldEffortDescriptionMetierList.fillList(getRegion().getMetier(), (Object)null);
+ }
setEffortDescriptionEffortDescriptionList();
}
}
protected void setEffortDescriptionEffortDescriptionList(){
- fieldEffortDescriptionEffortDescriptionList.fillList(getBean().getPossibleMetiers(), (Object)null);
+ if (getBean().getPossibleMetiers() != null){
+ fieldEffortDescriptionEffortDescriptionList.fillList(getBean().getPossibleMetiers(), (Object)null);
+ }
}
protected void add(){
Object value = fieldEffortDescriptionMetierList.getSelectedValue();
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-18 09:12:21 UTC (rev 1826)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-02-18 09:40:10 UTC (rev 1827)
@@ -47,8 +47,22 @@
protected OMToolSet toolSet = new OMToolSet();
+toolSet.setupListeners(cellMap);
+toolMap.add((Component)toolSet);
setButtonTitle(_("isisfish.input.continueCells"));
setNextPath("$root/$cells");
+addPropertyChangeListener("bean", new PropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent evt) {
+ if (evt.getOldValue() != null || evt.getNewValue() == null) {
+ // remove previous binding on getBean()
+ jaxx.runtime.Util.removeDataBinding($InputContentUI0, "cellMap.fisheryRegion");
+ }
+ if (evt.getNewValue() != null) {
+ // add binding on getBean()
+ jaxx.runtime.Util.applyDataBinding($InputContentUI0, "cellMap.fisheryRegion");
+ }
+ }
+});
public void refresh(){
getVerifier().setSaveButton(save, false);
getVerifier().setCancelButton(cancel);
@@ -57,8 +71,6 @@
setBean((FisheryRegionImpl)region);
if (region != null){
setFieldMapfilesModel(getBean());
- toolSet.setupListeners(cellMap);
- toolMap.add((Component)toolSet);
}
}
protected void setFieldMapfilesModel(FisheryRegion region){
@@ -100,7 +112,7 @@
}
protected void save(){
setInfoText(_("isisfish.message.checking.cell"));
- getContextValue(InputAction.class).saveFisheryRegion(getBean(), "FisheryRegion");
+ getContextValue(InputAction.class).saveFisheryRegion(getBean());
getVerifier().setEditable(false);
getParentContainer(InputUI.class).setTreeModel();
getParentContainer(InputUI.class).setFieldCurrentRegionModel();
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-02-18 09:12:21 UTC (rev 1826)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-02-18 09:40:10 UTC (rev 1827)
@@ -1002,7 +1002,7 @@
// FIXME todo loadCellFile
}
- public void saveFisheryRegion(FisheryRegion fisheryRegion, String type) {
+ public void saveFisheryRegion(FisheryRegion fisheryRegion) {
if (log.isTraceEnabled()) {
log.trace("save called");
}
@@ -1052,9 +1052,7 @@
// toutes les mailles restantes dans la liste sont des mailles en trop
// on les supprimes
-// frame.setInfoText(_("isisfish.message.remove.unnecessary.cells"));
-// frame.setProgressMin(0);
-// frame.setProgressMax(cells.size());
+
progresscpt = 0;
for (Cell cell : cells) {
// FIXME il faudrait aussi rechercher les objets dependants
@@ -1063,14 +1061,8 @@
// ces objets. Si ce n'est pas le cas, on sort tout de suite
// avant le commit
cellPS.delete(cell);
-// frame.setProgressValue(++progresscpt);
}
-
-// frame.setInfoText(_("isisfish.message.commit"));
isisContext.commitTransaction();
-// frame.refreshView("inputFisheryRegion");
-
-// frame.setInfoText(_("isisfish.message.save.finished"));
} catch (Exception eee) {
log.error(_("isisfish.error.save.region"), eee);
showMsgBox(eee);
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-18 09:12:21 UTC (rev 1826)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-02-18 09:40:10 UTC (rev 1827)
@@ -38,6 +38,8 @@
<String id='lblText' javaBean='null'/>
+ <org.codelutin.topia.persistence.TopiaEntity id='bean' javaBean='null'/>
+
<script><![CDATA[
import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
import fr.ifremer.isisfish.entities.Formule;
@@ -53,13 +55,32 @@
import jaxx.runtime.swing.Item;
protected Class clazz;
-protected TopiaEntity bean;
+//protected TopiaEntity bean;
protected String methodGet;
protected String methodSet;
protected String name;
protected Equation selectedEquation;
protected DocumentListener listener = null;
+
+addPropertyChangeListener("bean", new PropertyChangeListener() {
+ 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");
+ combo.setModel(new DefaultComboBoxModel());
+ try {
+ editor.open(org.codelutin.util.FileUtil.getTempFile("", ".java"));
+ } catch (IOException ex) {
+ Logger.getLogger(InputOneEquationUI.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ }
+ if (evt.getNewValue() != null) {
+ // add binding on getBean()
+ //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+ }
+ }
+});
start();
protected void start(){
if (listener == null){
@@ -85,7 +106,8 @@
public void init(String lblText, TopiaEntity bean, String name, String methodGet, String methodSet, Class c){
editor.getCurrentEditor().removeDocumentListener(listener);
setLblText(lblText);
- this.bean = bean;
+// this.bean = bean;
+ setBean(bean);
this.methodGet = methodGet;
this.methodSet = methodSet;
this.name = name;
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-18 09:12:21 UTC (rev 1826)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-02-18 09:40:10 UTC (rev 1827)
@@ -154,10 +154,10 @@
boolean doDelete;
ArrayList<TopiaEntity> allWillBeRemoved = new ArrayList<TopiaEntity>();
for (TopiaEntity te : currentEntities){
- allWillBeRemoved.add(te);
if (te.getComposite() != null){
allWillBeRemoved.addAll(te.getComposite());
}
+ allWillBeRemoved.add(te);
}
if (allWillBeRemoved.size() > 0) {
String text = _(
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-18 09:12:21 UTC (rev 1826)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-02-18 09:40:10 UTC (rev 1827)
@@ -56,6 +56,20 @@
import org.codelutin.topia.TopiaContext;
import javax.swing.table.TableCellEditor;
+addPropertyChangeListener("bean", new PropertyChangeListener() {
+ 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("");
+ 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")
+ }
+ }
+});
+
public void refresh() {
getVerifier().setSaveButton(save);
getVerifier().setCancelButton(cancel);
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-18 09:12:21 UTC (rev 1826)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-02-18 09:40:10 UTC (rev 1827)
@@ -43,6 +43,7 @@
import java.util.logging.Logger;
import java.util.logging.Level;
+ protected boolean init = false;
public void refresh() {
getVerifier().setSaveButton(save);
getVerifier().setCancelButton(cancel);
@@ -52,12 +53,18 @@
setBean((MetierImpl) metier);
try {
if (getBean() != null){
+ init = true;
jaxx.runtime.swing.Utils.fillComboBox(fieldMetierGear, getRegion().getGear(), getBean().getGear());
+ init = false;
}
} catch (Exception ex) {
Logger.getLogger(MetierTabUI.class.getName()).log(Level.SEVERE, null, ex);
}
}
+ protected void gearChanged(){
+ if (!init)
+ getBean().setGear((Gear)fieldMetierGear.getSelectedItem());
+ }
]]></script>
<Table id='bady'>
<row>
@@ -76,7 +83,7 @@
<JLabel text="isisfish.common.gear" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JComboBox id="fieldMetierGear" onActionPerformed='getBean().setGear((Gear)fieldMetierGear.getSelectedItem())' enabled='{isActif()}'/>
+ <JComboBox id="fieldMetierGear" onActionPerformed='gearChanged()' enabled='{isActif()}'/>
</cell>
</row>
<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-18 09:12:21 UTC (rev 1826)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-02-18 09:40:10 UTC (rev 1827)
@@ -59,6 +59,8 @@
fieldPopulationBasicsNbClasses.setText("");
fieldPopulationBasicsComment.setText("");
fieldPopulationBasicsMatureClass.setSelectedItem(null);
+ growthEquation.init(_("isisfish.populationBasics.growth"), null, "Growth", "Growth", "EquationGrowth", fr.ifremer.isisfish.equation.PopulationGrowth.class);
+ growthReverseEquation.init(_("isisfish.populationBasics.growthReverse"), null, "GrowthReverse", "GrowthReverse", "EquationGrowthReverse", fr.ifremer.isisfish.equation.PopulationGrowthReverse.class);
}
if (evt.getNewValue() != null) {
// add binding on getBean()
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-18 09:12:21 UTC (rev 1826)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-02-18 09:40:10 UTC (rev 1827)
@@ -67,7 +67,9 @@
@Override
public void matrixChanged(MatrixPanelEvent arg0) {
if (getBean() != null){
- getBean().setCapturability(fieldPopulationCapturability.getMatrix());
+ if (fieldPopulationCapturability.getMatrix() != null){
+ getBean().setCapturability(fieldPopulationCapturability.getMatrix());
+ }
}
}
});
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-18 09:12:21 UTC (rev 1826)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2009-02-18 09:40:10 UTC (rev 1827)
@@ -43,6 +43,21 @@
import fr.ifremer.isisfish.entities.Population;
import fr.ifremer.isisfish.entities.PopulationImpl;
+addPropertyChangeListener("bean", new PropertyChangeListener() {
+ 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("");
+ 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")
+ }
+ }
+});
public void refresh(){
getVerifier().setSaveButton(save);
getVerifier().setCancelButton(cancel);
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-18 09:12:21 UTC (rev 1826)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-02-18 09:40:10 UTC (rev 1827)
@@ -87,12 +87,12 @@
});
}
protected void setFieldPopulationMigrationMigrationGroupChooserModel(){
- if (getBean() != null){
+ if (getBean() != null && getBean().getPopulationGroup() != null){
jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationEmigrationGroupChooser,getBean().getPopulationGroup(), null);
}
}
protected void setFieldPopulationMigrationMigrationDepartureZoneChooserModel(){
- if (getBean() != null){
+ if (getBean() != null && getBean().getPopulationZone() != null){
jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationEmigrationDepartureZoneChooser,getBean().getPopulationZone(), null);
}
}
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-18 09:12:21 UTC (rev 1826)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2009-02-18 09:40:10 UTC (rev 1827)
@@ -46,6 +46,21 @@
import fr.ifremer.isisfish.entities.PopulationImpl;
import fr.ifremer.isisfish.entities.Formule;
+addPropertyChangeListener("bean", new PropertyChangeListener() {
+ 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("");
+ 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")
+ }
+ }
+});
public void init(PopulationSeasonInfo pi){
setPopInfo((PopulationSeasonInfoImpl)pi);
}
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-18 09:12:21 UTC (rev 1826)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-02-18 09:40:10 UTC (rev 1827)
@@ -89,12 +89,12 @@
}
}
protected void setFieldPopulationMigrationMigrationGroupChooserModel(){
- if (getBean() != null){
- jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigrationArrivalZoneChooser,getBean().getPopulationGroup(), null);
+ if (getBean() != null && getBean().getPopulationGroup() != null){
+ jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigrationArrivalZoneChooser,getBean().getPopulationGroup(), null);
}
}
protected void setFieldPopulationMigrationMigrationArrivalZoneChooserModel(){
- if (getBean() != null){
+ if (getBean() != null && getBean().getPopulationZone() != null){
jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigrationArrivalZoneChooser,getBean().getPopulationZone(), null);
}
}
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-18 09:12:21 UTC (rev 1826)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-02-18 09:40:10 UTC (rev 1827)
@@ -91,17 +91,17 @@
}
}
protected void setFieldPopulationMigrationMigrationGroupChooserModel(){
- if (getBean() != null){
+ if (getBean() != null && getBean().getPopulationGroup() != null){
jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationGroup(), null);
}
}
protected void setFieldPopulationMigrationMigrationDepartureZoneChooserModel(){
- if (getBean() != null){
+ if (getBean() != null && getBean().getPopulationZone() != null){
jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationZone(), null);
}
}
protected void setFieldPopulationMigrationMigrationArrivalZoneChooserModel(){
- if (getBean() != null){
+ if (getBean() != null && getBean().getPopulationZone() != null){
jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationZone(), null);
}
}
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-18 09:12:21 UTC (rev 1826)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-02-18 09:40:10 UTC (rev 1827)
@@ -51,6 +51,7 @@
//jaxx.runtime.Util.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()
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-18 09:12:21 UTC (rev 1826)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-02-18 09:40:10 UTC (rev 1827)
@@ -61,8 +61,8 @@
boolean portChanged = true;
portMap.setFisheryRegion(getRegion());
-portMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION);
-portMap.setActiveMouseMode(new SelectMouseMode());
+//portMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION);
+//portMap.setActiveMouseMode(new SelectMouseMode());
toolSet.setupListeners(portMap);
toolMap.add((Component)toolSet);
setMapListener();
@@ -191,7 +191,7 @@
</Table>
<JPanel id='map' layout='{new BorderLayout()}'>
<fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' constraints='BorderLayout.NORTH'/>
- <fr.ifremer.isisfish.map.IsisMapBean id='portMap' selectedCells='{getBean().getCell()}' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' constraints='BorderLayout.CENTER'/>
+ <fr.ifremer.isisfish.map.IsisMapBean id='portMap' selectedCells='{getBean().getCell()}' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' constraints='BorderLayout.CENTER' selectionMode="1"/>
</JPanel>
</JSplitPane>
</cell>
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-18 09:12:21 UTC (rev 1826)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2009-02-18 09:40:10 UTC (rev 1827)
@@ -56,6 +56,20 @@
import fr.ifremer.isisfish.entities.Metier;
import fr.ifremer.isisfish.entities.MetierImpl;
+addPropertyChangeListener("bean", new PropertyChangeListener() {
+ 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");
+ 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");
+ }
+ }
+});
+
public void refresh(){
getVerifier().setSaveButton(save);
getVerifier().setCancelButton(cancel);
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-18 09:12:21 UTC (rev 1826)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-02-18 09:40:10 UTC (rev 1827)
@@ -53,10 +53,7 @@
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("");
- fieldSetOfVesselsName.setText("");
- fieldSetOfVesselsNumberOfVessels.setText("");
- fieldSetOfVesselsFixedCosts.setText("");
- fieldSetOfVesselsComment.setText("");
+ technicalEfficiency.init(_("isisfish.setOfVessels.technicalEfficiency"), null, "TechnicalEfficiency", "TechnicalEfficiencyEquation", "EquationTechnicalEfficiency", fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEquation.class);
}
if (evt.getNewValue() != null) {
// add binding on getBean()
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-18 09:12:21 UTC (rev 1826)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-02-18 09:40:10 UTC (rev 1827)
@@ -83,8 +83,10 @@
if (getBean() != null){
// setStrategyMonthInfo((StrategyMonthInfoImpl)getBean().getStrategyMonthInfo(month));
Object[] monthInfos = getBean().getStrategyMonthInfo().toArray();
- setStrategyMonthInfo((StrategyMonthInfoImpl) monthInfos[month]);
- getVerifier().addCurrentEntity(getStrategyMonthInfo());
+ if (monthInfos.length != 0){
+ setStrategyMonthInfo((StrategyMonthInfoImpl) monthInfos[month]);
+ getVerifier().addCurrentEntity(getStrategyMonthInfo());
+ }
}
if (getStrategyMonthInfo() != null){
ActionListener[] listeners = fieldStrategyMonthInfoTripType.getActionListeners();
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-18 09:12:21 UTC (rev 1826)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-02-18 09:40:10 UTC (rev 1827)
@@ -56,6 +56,7 @@
fieldStrategyName.setText("");
fieldStrategyProportionSetOfVessels.setText("0.0");
fieldStrategyComment.setText("");
+ strategyInactivity.init("isisfish.strategy.inactivity", null, "Inactivity", "InactivityEquation", "EquationInactivity", fr.ifremer.isisfish.equation.StrategyInactivityEquation.class);
}
if (evt.getNewValue() != null) {
// add binding on getBean()
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-18 09:12:21 UTC (rev 1826)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-02-18 09:40:10 UTC (rev 1827)
@@ -86,6 +86,7 @@
setBean((ZoneImpl) zone);
if (getBean() != null){
setZoneCells();
+ zoneMap.setSelectedCells(getBean().getCell());
}
}
protected void setZoneCells(){
