Author: echatellier Date: 2012-02-17 17:37:27 +0100 (Fri, 17 Feb 2012) New Revision: 3613 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3613 Log: Add factor support for variables. Modified: branches/4.1/src/main/java/fr/ifremer/isisfish/entities/VariableImpl.java branches/4.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java branches/4.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx branches/4.1/src/main/resources/sensitivity.properties Modified: branches/4.1/src/main/java/fr/ifremer/isisfish/entities/VariableImpl.java =================================================================== --- branches/4.1/src/main/java/fr/ifremer/isisfish/entities/VariableImpl.java 2012-02-17 15:36:52 UTC (rev 3612) +++ branches/4.1/src/main/java/fr/ifremer/isisfish/entities/VariableImpl.java 2012-02-17 16:37:27 UTC (rev 3613) @@ -27,7 +27,9 @@ import static org.nuiton.i18n.I18n._; +import org.apache.commons.beanutils.BeanUtils; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.IsisFishRuntimeException; @@ -113,4 +115,19 @@ } } + @Override + public String toString() { + + String result = null; + try { + TopiaEntity entity = getTopiaContext().findByTopiaId(getEntityId()); + result = BeanUtils.getProperty(entity, "name"); + } catch (Exception ex) { + result = entityId; + } + + result += "." + name; + return result; + } + } //VariableImpl Modified: branches/4.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java =================================================================== --- branches/4.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java 2012-02-17 15:36:52 UTC (rev 3612) +++ branches/4.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java 2012-02-17 16:37:27 UTC (rev 3613) @@ -149,6 +149,8 @@ JList variableList = view.getVariablesList(); Variable variable = (Variable)variableList.getSelectedValue(); view.setVariable(variable); + view.getSaveVerifier().addCurrentEntity(variable); + /*if (variable != null) { view.getVariableNameField().setText(variable.getName()); Modified: branches/4.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx =================================================================== --- branches/4.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx 2012-02-17 15:36:52 UTC (rev 3612) +++ branches/4.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx 2012-02-17 16:37:27 UTC (rev 3613) @@ -105,7 +105,8 @@ <cell fill="horizontal" weightx='1.0' anchor="northeast" weighty='1.0'> <JTextField id="variableDoubleValue" decorator='boxed' text="{String.valueOf(getVariable().getDoubleValue())}" - enabled='{isActive() && getVariable() != null}' /> + enabled='{isActive() && getVariable() != null}' + _sensitivityBean='{fr.ifremer.isisfish.entities.Variable.class}' _sensitivityMethod='"DoubleValue"' /> </cell> </row> </Table> @@ -123,6 +124,7 @@ <org.nuiton.math.matrix.gui.MatrixPanelEditor id="matrixPanel" enabled='{isActive() && getVariable() != null}' matrix="{getVariable().getMatrixValue() != null ? getVariable().getMatrixValue().copy() : null}" + _sensitivityBean='{fr.ifremer.isisfish.entities.Variable.class}' _sensitivityMethod='"MatrixValue"' dimensionEdit='true' decorator='boxed' /> </cell> </row> Modified: branches/4.1/src/main/resources/sensitivity.properties =================================================================== --- branches/4.1/src/main/resources/sensitivity.properties 2012-02-17 15:36:52 UTC (rev 3612) +++ branches/4.1/src/main/resources/sensitivity.properties 2012-02-17 16:37:27 UTC (rev 3613) @@ -64,6 +64,9 @@ TargetSpecies.targetFactorEquation TripType.minTimeBetweenTrip TripType.tripDuration +Variable.doubleValue +Variable.equationValue +Variable.matrixValue VesselType.activityRange VesselType.length VesselType.maxTripDuration