Author: tchemit Date: 2013-09-25 16:49:08 +0200 (Wed, 25 Sep 2013) New Revision: 1225 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1225 Log: always allow to create a new root species/bethos batch Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css 2013-09-25 14:22:24 UTC (rev 1224) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css 2013-09-25 14:49:08 UTC (rev 1225) @@ -267,6 +267,5 @@ text: "tutti.editBenthosBatch.action.createBatch"; toolTipText: "tutti.editBenthosBatch.action.createBatch.tip"; i18nMnemonic: "tutti.editBenthosBatch.action.createBatch.mnemonic"; - enabled: {model.isCreateBatchEnabled()}; _help: {"tutti.editBenthosBatch.action.createBatch.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-09-25 14:22:24 UTC (rev 1224) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-09-25 14:49:08 UTC (rev 1225) @@ -453,8 +453,6 @@ protected void beforeOpenPopup(int rowIndex, int columnIndex) { super.beforeOpenPopup(rowIndex, columnIndex); - boolean enableAdd = true; - boolean enableRename = false; boolean enableSplit = false; boolean enableChangeSampleCategory = false; @@ -587,7 +585,6 @@ } } BenthosBatchUIModel model = getModel(); - model.setCreateBatchEnabled(enableAdd); model.setSplitBatchEnabled(enableSplit); model.setChangeSampleCategoryEnabled(enableChangeSampleCategory); model.setRemoveBatchEnabled(enableRemove); @@ -596,9 +593,8 @@ model.setCreateMelagEnabled(enableCreateMelag); model.setEditFrequenciesEnabled(enableEditFrequencies); - if (log.isInfoEnabled()) { + if (log.isDebugEnabled()) { StringBuilder builder = new StringBuilder("actions for (" + rowIndex + "," + columnIndex + "):"); - builder.append("\nenableAdd: ").append(enableAdd); builder.append("\nenableSplit: ").append(enableSplit); builder.append("\nenableChangeSampleCategory: ").append(enableChangeSampleCategory); builder.append("\nenableRemove: ").append(enableRemove); @@ -606,7 +602,7 @@ builder.append("\nenableRename: ").append(enableRename); builder.append("\nenableCreateMelag: ").append(enableCreateMelag); builder.append("\nenableEditFrequencies: ").append(enableEditFrequencies); - log.info(builder.toString()); + log.debug(builder.toString()); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java 2013-09-25 14:22:24 UTC (rev 1224) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java 2013-09-25 14:49:08 UTC (rev 1225) @@ -47,8 +47,6 @@ public static final String PROPERTY_TABLE_VIEW_MODE = "tableViewMode"; - public static final String PROPERTY_CREATE_BATCH_ENABLED = "createBatchEnabled"; - public static final String PROPERTY_SPLIT_BATCH_ENABLED = "splitBatchEnabled"; public static final String PROPERTY_CHANGE_SAMPLE_CATEGORY_ENABLED = "changeSampleCategoryEnabled"; @@ -74,13 +72,6 @@ public static final String PROPERTY_LEAF_NUMBER = "leafNumber"; /** - * Can user create a new species batch ? - * - * @since 0.3 - */ - protected boolean createBatchEnabled; - - /** * Can user split a selected species batch ? * * @since 0.3 @@ -304,15 +295,6 @@ firePropertyChange(PROPERTY_LEAF_NUMBER, oldValue, leafNumber); } - public boolean isCreateBatchEnabled() { - return createBatchEnabled; - } - - public void setCreateBatchEnabled(boolean createBatchEnabled) { - this.createBatchEnabled = createBatchEnabled; - firePropertyChange(PROPERTY_CREATE_BATCH_ENABLED, null, createBatchEnabled); - } - public boolean isSplitBatchEnabled() { return splitBatchEnabled; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css 2013-09-25 14:22:24 UTC (rev 1224) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css 2013-09-25 14:49:08 UTC (rev 1225) @@ -276,6 +276,5 @@ text: "tutti.editSpeciesBatch.action.createBatch"; toolTipText: "tutti.editSpeciesBatch.action.createBatch.tip"; i18nMnemonic: "tutti.editSpeciesBatch.action.createBatch.mnemonic"; - enabled: {model.isCreateBatchEnabled()}; _help: {"tutti.editSpeciesBatch.action.createBatch.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-09-25 14:22:24 UTC (rev 1224) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-09-25 14:49:08 UTC (rev 1225) @@ -456,8 +456,6 @@ protected void beforeOpenPopup(int rowIndex, int columnIndex) { super.beforeOpenPopup(rowIndex, columnIndex); - boolean enableAdd = true; - boolean enableRename = false; boolean enableSplit = false; boolean enableChangeSampleCategory = false; @@ -590,7 +588,6 @@ } } SpeciesBatchUIModel model = getModel(); - model.setCreateBatchEnabled(enableAdd); model.setSplitBatchEnabled(enableSplit); model.setChangeSampleCategoryEnabled(enableChangeSampleCategory); model.setRemoveBatchEnabled(enableRemove); @@ -601,7 +598,6 @@ if (log.isInfoEnabled()) { StringBuilder builder = new StringBuilder("actions for (" + rowIndex + "," + columnIndex + "):"); - builder.append("\nenableAdd: ").append(enableAdd); builder.append("\nenableSplit: ").append(enableSplit); builder.append("\nenableChangeSampleCategory: ").append(enableChangeSampleCategory); builder.append("\nenableRemove: ").append(enableRemove); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java 2013-09-25 14:22:24 UTC (rev 1224) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java 2013-09-25 14:49:08 UTC (rev 1225) @@ -45,8 +45,6 @@ private static final long serialVersionUID = 1L; - public static final String PROPERTY_CREATE_BATCH_ENABLED = "createBatchEnabled"; - public static final String PROPERTY_SPLIT_BATCH_ENABLED = "splitBatchEnabled"; public static final String PROPERTY_CHANGE_SAMPLE_CATEGORY_ENABLED = "changeSampleCategoryEnabled"; @@ -74,13 +72,6 @@ public static final String PROPERTY_LEAF_NUMBER = "leafNumber"; /** - * Can user create a new species batch ? - * - * @since 0.3 - */ - protected boolean createBatchEnabled; - - /** * Can user split a selected species batch ? * * @since 0.3 @@ -286,15 +277,6 @@ firePropertyChange(PROPERTY_LEAF_NUMBER, oldValue, leafNumber); } - public boolean isCreateBatchEnabled() { - return createBatchEnabled; - } - - public void setCreateBatchEnabled(boolean createBatchEnabled) { - this.createBatchEnabled = createBatchEnabled; - firePropertyChange(PROPERTY_CREATE_BATCH_ENABLED, null, createBatchEnabled); - } - public boolean isSplitBatchEnabled() { return splitBatchEnabled; }