Author: kmorin Date: 2013-02-03 23:03:03 +0100 (Sun, 03 Feb 2013) New Revision: 314 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/314 Log: disable weight if not a leaf Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-02-03 17:12:00 UTC (rev 313) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-02-03 22:03:03 UTC (rev 314) @@ -159,12 +159,16 @@ @Override public boolean onHideTab(int currentIndex, int newIndex) { - AbstractTuttiBeanUIModel model = getModel(); - boolean result = model.isValid(); - if (result && model.isModify()) { - save(); - } - return result; + //FIXME 20130203 kmorin: cannot change tab if model is modified + // (I do not even know why it is set to modified and have no time + // before the demo) +// AbstractTuttiBeanUIModel model = getModel(); +// boolean result = model.isValid(); +// if (result && model.isModify()) { +// save(); +// } +// return result; + return true; } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java 2013-02-03 17:12:00 UTC (rev 313) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java 2013-02-03 22:03:03 UTC (rev 314) @@ -249,7 +249,7 @@ propertyName); if (result) { - if (frequencyCols.contains(propertyName)) { + if (frequencyCols.contains(propertyName) || WEIGHT.equals(propertyName)) { // must have filled a species to edit this column SpeciesBatchRowModel entry = getEntry(rowIndex);