Author: echatellier Date: 2012-04-03 16:19:01 +0200 (Tue, 03 Apr 2012) New Revision: 3672 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3672 Log: Add comment field on variables. Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV40V41.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties trunk/src/main/xmi/isis-fish.zargo Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV40V41.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV40V41.java 2012-04-03 13:31:36 UTC (rev 3671) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV40V41.java 2012-04-03 14:19:01 UTC (rev 3672) @@ -68,6 +68,7 @@ "TOPIACREATEDATE DATE, " + "ENTITYID VARCHAR(255) NOT NULL, " + "NAME LONGVARCHAR, " + + "COMMENT LONGVARCHAR, " + "TYPE LONGVARCHAR, " + "DOUBLEVALUE DOUBLE, " + "MATRIXVALUE_NAME VARCHAR(255), " + Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx 2012-04-03 13:31:36 UTC (rev 3671) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx 2012-04-03 14:19:01 UTC (rev 3672) @@ -101,7 +101,7 @@ </cell> </row> <row> - <cell columns="2" fill="both" weightx='1.0' weighty='1.0'> + <cell columns="2" fill="both" weightx='1.0' weighty='4'> <CardLayout id="variableTypeLayout" /> <JPanel id="variableTypePanel" layout="{variableTypeLayout}"> @@ -158,6 +158,23 @@ </cell> </row> <row> + <cell fill="horizontal"> + <JLabel text="isisfish.variables.comment" + enabled='{isActive() && getVariable() != null}'/> + </cell> + <cell fill="both" weighty='1'> + <JScrollPane> + <JTextArea id="variableComment" rows="3" + text="{jaxx.runtime.SwingUtil.getStringValue(getVariable().getComment())}" + enabled='{isActive() && getVariable() != null}' decorator='boxed' /> + <javax.swing.text.Document + initializer="variableComment.getDocument()" + onInsertUpdate='getVariable().setComment(variableComment.getText())' + onRemoveUpdate='getVariable().setComment(variableComment.getText())' /> + </JScrollPane> + </cell> + </row> + <row> <cell anchor="west"> <JButton text="isisfish.variables.deletevariable" onActionPerformed="getVarHandler().deleteVariable(this)" Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2012-04-03 13:31:36 UTC (rev 3671) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2012-04-03 14:19:01 UTC (rev 3672) @@ -619,9 +619,7 @@ isisfish.month.october=october isisfish.month.september=september isisfish.params.changeLogLev=Change from level '%1$s' to level '%2$s' -isisfish.params.clearFilter=Clear filter isisfish.params.description=Description -isisfish.params.filter=Filter isisfish.params.loadOldSimulation=Load old simulation isisfish.params.nopopulation=No selected population isisfish.params.numberYear=Number of year @@ -968,10 +966,10 @@ isisfish.ui.script.communityvcs=Community VCS isisfish.ui.script.officialvcs=Official VCS isisfish.variables.addvariable=Add +isisfish.variables.comment= isisfish.variables.defaultname=VarName isisfish.variables.deletevariable=Delete isisfish.variables.double.value=Real value \: -isisfish.variables.equation.value=Equation \: isisfish.variables.matrix.value=Matrix \: isisfish.variables.savevariable=Save isisfish.variables.tabtitle=Variables Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2012-04-03 13:31:36 UTC (rev 3671) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2012-04-03 14:19:01 UTC (rev 3672) @@ -619,9 +619,7 @@ isisfish.month.october=octobre isisfish.month.september=septembre isisfish.params.changeLogLev=Passe du niveau '%1$s' au niveau '%2$s' -isisfish.params.clearFilter=Remise à zéro du filtre isisfish.params.description=Description -isisfish.params.filter=Filtrer isisfish.params.loadOldSimulation=Charger une ancienne simulation isisfish.params.nopopulation=Aucune population sélectionnée isisfish.params.numberYear=Nombre d'années @@ -968,10 +966,10 @@ isisfish.ui.script.communityvcs=VCS Communauté isisfish.ui.script.officialvcs=VCS Officiel isisfish.variables.addvariable=Ajouter +isisfish.variables.comment=Commentaire \: isisfish.variables.defaultname=VarName isisfish.variables.deletevariable=Supprimer isisfish.variables.double.value=Valeur réelle \: -isisfish.variables.equation.value=Equation isisfish.variables.matrix.value=Matrice isisfish.variables.savevariable=Sauver isisfish.variables.tabtitle=Variables Modified: trunk/src/main/xmi/isis-fish.zargo =================================================================== (Binary files differ)