March 2013 - Tutti-commits - mailman.cloud.codelutin.com

r544 - trunk/src/update
by tchemit＠users.forge.codelutin.com 05 Mar '13

05 Mar '13

Author: tchemit Date: 2013-03-05 19:08:59 +0100 (Tue, 05 Mar 2013) New Revision: 544 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/544 Log: fix db update url Modified: trunk/src/update/update-tutti.properties Modified: trunk/src/update/update-tutti.properties =================================================================== --- trunk/src/update/update-tutti.properties 2013-03-05 12:48:12 UTC (rev 543) +++ trunk/src/update/update-tutti.properties 2013-03-05 18:08:59 UTC (rev 544) @@ -51,5 +51,5 @@ ################################################################################ db.version=@dbVersion@ -db.url=zip:http://appup.tutti.nuiton.org/tutti/auth/tutti-db-@dbVersion@.zip +db.url=zip:http://appup.nuiton.org/tutti/auth/tutti-db-@dbVersion@.zip db.auth=true \ No newline at end of file

1 0

r543 - tags/tutti-1.0.2/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation
by kmorin＠users.forge.codelutin.com 05 Mar '13

05 Mar '13

Author: kmorin Date: 2013-03-05 13:48:12 +0100 (Tue, 05 Mar 2013) New Revision: 543 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/543 Log: last minute bug fix Modified: tags/tutti-1.0.2/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java Modified: tags/tutti-1.0.2/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java =================================================================== --- tags/tutti-1.0.2/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-03-05 12:42:52 UTC (rev 542) +++ tags/tutti-1.0.2/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-03-05 12:48:12 UTC (rev 543) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -454,12 +454,15 @@ HydrologyTabUI hydrologyTab = ui.getHydrologyTabContent(); hydrologyTab.getHandler().reset(bean); - Integer objectId = Integer.valueOf(editFishingOperationUIModel.getObjectId()); + String id = editFishingOperationUIModel.getObjectId(); + if (id != null) { + Integer objectId = Integer.valueOf(id); - List<Attachment> attachments = - getContext().getPersistenceService().getAllAttachments(objectId); + List<Attachment> attachments = + getContext().getPersistenceService().getAllAttachments(objectId); - editFishingOperationUIModel.addAllAttachment(attachments); + editFishingOperationUIModel.addAllAttachment(attachments); + } editFishingOperationUIModel.setModify(false); handler.getFishingOperationMonitor().clearModified();

1 0

r542 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation
by kmorin＠users.forge.codelutin.com 05 Mar '13

05 Mar '13

Author: kmorin Date: 2013-03-05 13:42:52 +0100 (Tue, 05 Mar 2013) New Revision: 542 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/542 Log: refs #2075 [TECH] Action longue (probl?\195?\168me de cin?\195?\169matique) nothing happens when the users tries to create a new operation and no operation was previously selected Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-03-05 12:36:20 UTC (rev 541) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-03-05 12:42:52 UTC (rev 542) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -454,12 +454,15 @@ HydrologyTabUI hydrologyTab = ui.getHydrologyTabContent(); hydrologyTab.getHandler().reset(bean); - Integer objectId = Integer.valueOf(editFishingOperationUIModel.getObjectId()); + String id = editFishingOperationUIModel.getObjectId(); + if (id != null) { + Integer objectId = Integer.valueOf(id); - List<Attachment> attachments = - getContext().getPersistenceService().getAllAttachments(objectId); + List<Attachment> attachments = + getContext().getPersistenceService().getAllAttachments(objectId); - editFishingOperationUIModel.addAllAttachment(attachments); + editFishingOperationUIModel.addAllAttachment(attachments); + } editFishingOperationUIModel.setModify(false); handler.getFishingOperationMonitor().clearModified();

1 0

r541 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by tchemit＠users.forge.codelutin.com 05 Mar '13

05 Mar '13

Author: tchemit Date: 2013-03-05 13:36:20 +0100 (Tue, 05 Mar 2013) New Revision: 541 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/541 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-05 12:36:12 UTC (rev 540) +++ trunk/pom.xml 2013-03-05 12:36:20 UTC (rev 541) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.0.2</version> + <version>1.1-SNAPSHOT</version> <modules> <module>tutti-persistence</module> @@ -89,12 +89,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.0.2</url> + <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.0.2 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.0.2 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-03-05 12:36:12 UTC (rev 540) +++ trunk/tutti-persistence/pom.xml 2013-03-05 12:36:20 UTC (rev 541) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.0.2</version> + <version>1.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-03-05 12:36:12 UTC (rev 540) +++ trunk/tutti-service/pom.xml 2013-03-05 12:36:20 UTC (rev 541) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.0.2</version> + <version>1.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-03-05 12:36:12 UTC (rev 540) +++ trunk/tutti-ui-swing/pom.xml 2013-03-05 12:36:20 UTC (rev 541) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.0.2</version> + <version>1.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r540 - tags
by tchemit＠users.forge.codelutin.com 05 Mar '13

05 Mar '13

Author: tchemit Date: 2013-03-05 13:36:12 +0100 (Tue, 05 Mar 2013) New Revision: 540 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/540 Log: [maven-release-plugin] copy for tag tutti-1.0.2 Added: tags/tutti-1.0.2/

1 0

r539 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by tchemit＠users.forge.codelutin.com 05 Mar '13

05 Mar '13

Author: tchemit Date: 2013-03-05 13:36:04 +0100 (Tue, 05 Mar 2013) New Revision: 539 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/539 Log: [maven-release-plugin] prepare release tutti-1.0.2 Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-05 12:32:36 UTC (rev 538) +++ trunk/pom.xml 2013-03-05 12:36:04 UTC (rev 539) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.0.2</version> <modules> <module>tutti-persistence</module> @@ -89,12 +89,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.0.2</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.0.2 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.0.2 </developerConnection> </scm> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-03-05 12:32:36 UTC (rev 538) +++ trunk/tutti-persistence/pom.xml 2013-03-05 12:36:04 UTC (rev 539) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.0.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-03-05 12:32:36 UTC (rev 538) +++ trunk/tutti-service/pom.xml 2013-03-05 12:36:04 UTC (rev 539) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.0.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-03-05 12:32:36 UTC (rev 538) +++ trunk/tutti-ui-swing/pom.xml 2013-03-05 12:36:04 UTC (rev 539) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.0.2</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r538 - in trunk/tutti-ui-swing/src/main: filtered-resources java/fr/ifremer/tutti/ui/swing/content/cruise java/fr/ifremer/tutti/ui/swing/util java/fr/ifremer/tutti/ui/swing/util/action
by tchemit＠users.forge.codelutin.com 05 Mar '13

05 Mar '13

Author: tchemit Date: 2013-03-05 13:32:36 +0100 (Tue, 05 Mar 2013) New Revision: 538 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/538 Log: - fix attachment enable when cruise is created - change some log levels - make error panel always use the loading action ui ui as parent Modified: trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java Modified: trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2013-03-05 12:28:40 UTC (rev 537) +++ trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2013-03-05 12:32:36 UTC (rev 538) @@ -32,7 +32,7 @@ # tutti levels log4j.logger.fr.ifremer.tutti=INFO log4j.logger.fr.ifremer.tutti.ui.swing.util=WARN -log4j.logger.fr.ifremer.tutti.ui.swing.util.action=DEBUG +#log4j.logger.fr.ifremer.tutti.ui.swing.util.action=DEBUG log4j.appender.file=org.apache.log4j.RollingFileAppender log4j.appender.file.file=${tutti.log.file} Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-03-05 12:28:40 UTC (rev 537) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-03-05 12:32:36 UTC (rev 538) @@ -212,5 +212,5 @@ } #attachmentsButton { - enabled: {model.getObjectId() != null}; + enabled: {model.getId() != null}; } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java 2013-03-05 12:28:40 UTC (rev 537) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java 2013-03-05 12:32:36 UTC (rev 538) @@ -66,6 +66,7 @@ if (TuttiEntities.isNew(bean)) { saved = persistenceService.createCruise(bean); + model.setId(saved.getId()); } else { saved = persistenceService.saveCruise(bean); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java 2013-03-05 12:28:40 UTC (rev 537) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java 2013-03-05 12:32:36 UTC (rev 538) @@ -68,7 +68,7 @@ cause, null, null); pane.setErrorInfo(info); pane.setErrorReporter(this); - JXErrorPane.showDialog(context.getMainUI(), pane); + JXErrorPane.showDialog(context.getActionUI(), pane); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-03-05 12:28:40 UTC (rev 537) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-03-05 12:32:36 UTC (rev 538) @@ -120,8 +120,8 @@ // udpate global label AbstractTuttiAction action = (AbstractTuttiAction) evt.getNewValue(); - if (log.isInfoEnabled()) { - log.info("Action to use: " + action); + if (log.isDebugEnabled()) { + log.debug("Action to use: " + action); } if (action == null || action.isFailed()) { @@ -144,8 +144,8 @@ ProgressionModel oldValue = (ProgressionModel) evt.getOldValue(); ProgressionModel newValue = (ProgressionModel) evt.getNewValue(); - if (log.isInfoEnabled()) { - log.info("progression model: " + newValue); + if (log.isDebugEnabled()) { + log.debug("progression model: " + newValue); } if (oldValue != null) { oldValue.removePropertyChangeListener(progressionListener);

1 0

r537 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing: config content/operation/catches content/operation/catches/species content/operation/catches/species/frequency util util/editor
by tchemit＠users.forge.codelutin.com 05 Mar '13

05 Mar '13

Author: tchemit Date: 2013-03-05 13:28:40 +0100 (Tue, 05 Mar 2013) New Revision: 537 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/537 Log: prepare release Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategoryComponent.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/frequency/FrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-03-05 12:11:44 UTC (rev 536) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-03-05 12:28:40 UTC (rev 537) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java 2013-03-05 12:11:44 UTC (rev 536) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java 2013-03-05 12:28:40 UTC (rev 537) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java 2013-03-05 12:11:44 UTC (rev 536) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java 2013-03-05 12:28:40 UTC (rev 537) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-03-05 12:11:44 UTC (rev 536) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-03-05 12:28:40 UTC (rev 537) @@ -8,15 +8,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -261,4 +261,4 @@ #computeSpeciesBatchButton { _tuttiAction: {ComputeWeightsAction.class}; -} \ No newline at end of file +} Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java 2013-03-05 12:11:44 UTC (rev 536) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java 2013-03-05 12:28:40 UTC (rev 537) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategoryComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategoryComponent.java 2013-03-05 12:11:44 UTC (rev 536) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategoryComponent.java 2013-03-05 12:28:40 UTC (rev 537) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% 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-03-05 12:11:44 UTC (rev 536) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css 2013-03-05 12:28:40 UTC (rev 537) @@ -8,15 +8,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/FrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/FrequencyCellComponent.java 2013-03-05 12:11:44 UTC (rev 536) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/FrequencyCellComponent.java 2013-03-05 12:28:40 UTC (rev 537) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-03-05 12:11:44 UTC (rev 536) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-03-05 12:28:40 UTC (rev 537) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java 2013-03-05 12:11:44 UTC (rev 536) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java 2013-03-05 12:28:40 UTC (rev 537) @@ -11,15 +11,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java 2013-03-05 12:11:44 UTC (rev 536) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java 2013-03-05 12:28:40 UTC (rev 537) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L%

1 0

r536 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/config java/fr/ifremer/tutti/ui/swing/content/operation/catches java/fr/ifremer/tutti/ui/swing/content/operation/catches/species java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency java/fr/ifremer/tutti/ui/swing/util java/fr/ifremer/tutti/ui/swing/util/editor resources/i18n
by kmorin＠users.forge.codelutin.com 05 Mar '13

05 Mar '13

Author: kmorin Date: 2013-03-05 13:11:44 +0100 (Tue, 05 Mar 2013) New Revision: 536 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/536 Log: - fixes #2005 [CAPTURE] Especes - poids total vrac observ?\195?\169 peu diff?\195?\169rent du poids calcul?\195?\169 - add computed data color in config Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategoryComponent.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/frequency/FrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditor.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-03-05 11:36:05 UTC (rev 535) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-03-05 12:11:44 UTC (rev 536) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -188,6 +188,10 @@ return applicationConfig.getOptionAsFile(TuttiApplicationConfigOption.UI_CONFIG_FILE.getKey()); } + public Float getDifferenceRateBetweenSortedAndTotalWeights() { + return applicationConfig.getOptionAsFloat(TuttiApplicationConfigOption.TOTAL_SORTED_WEIGHTS_DIFFERENCE_RATE.getKey()); + } + public boolean isAutoPopupNumberEditor() { return applicationConfig.getOptionAsBoolean(TuttiApplicationConfigOption.AUTO_POPUP_NUMBER_EDITOR.getKey()); } @@ -232,6 +236,10 @@ return applicationConfig.getOptionAsColor(TuttiApplicationConfigOption.COLOR_ROW_TO_CONFIRM.getKey()); } + public Color getColorComputedWeights() { + return applicationConfig.getOptionAsColor(TuttiApplicationConfigOption.COLOR_COMPUTED_WEIGHTS.getKey()); + } + public KeyStroke getShortcutClosePopup() { return applicationConfig.getOptionAsKeyStroke(TuttiApplicationConfigOption.SHORTCUT_CLOSE_POPUP.getKey()); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java 2013-03-05 11:36:05 UTC (rev 535) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java 2013-03-05 12:11:44 UTC (rev 536) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -79,6 +79,13 @@ File.class ), + TOTAL_SORTED_WEIGHTS_DIFFERENCE_RATE( + "tutti.weights.rate.difference.totalAndSorted", + n_("tutti.weights.rate.difference.totalAndSorted.description"), + "1.0", + Float.class + ), + PROGRAM_ID( "tutti.programId", n_("tutti.option.programId.description"), @@ -142,6 +149,13 @@ Color.class ), + COLOR_COMPUTED_WEIGHTS( + "tutti.ui.color.computedWeights", + n_("tutti.option.ui.color.computedWeights.description"), + Color.BLUE.toString(), + Color.class + ), + SHORTCUT_CLOSE_POPUP( "tutti.ui.shortcut.closePopup", n_("tutti.option.ui.shortcut.closePopup.description"), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java 2013-03-05 11:36:05 UTC (rev 535) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java 2013-03-05 12:11:44 UTC (rev 536) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -99,7 +99,8 @@ CALLBACK_APPLICATION) .addOption(TuttiServiceConfigOption.DATA_DIRECTORY) .addOption(TuttiServiceConfigOption.SITE_URL) - .addOption(TuttiApplicationConfigOption.UI_CONFIG_FILE); + .addOption(TuttiApplicationConfigOption.UI_CONFIG_FILE) + .addOption(TuttiApplicationConfigOption.TOTAL_SORTED_WEIGHTS_DIFFERENCE_RATE); // UI @@ -110,6 +111,7 @@ .addOption(TuttiApplicationConfigOption.COLOR_ROW_READ_ONLY) .addOption(TuttiApplicationConfigOption.COLOR_CELL_WITH_VALUE) .addOption(TuttiApplicationConfigOption.COLOR_ROW_TO_CONFIRM) + .addOption(TuttiApplicationConfigOption.COLOR_COMPUTED_WEIGHTS) .addOption(TuttiApplicationConfigOption.DATE_FORMAT) .addOption(TuttiApplicationConfigOption.COORDINATE_EDITOR_TYPE); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java 2013-03-05 11:36:05 UTC (rev 535) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java 2013-03-05 12:11:44 UTC (rev 536) @@ -31,6 +31,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyRowModel; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; +import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -51,10 +52,6 @@ protected String errorMessage; - protected String errorTitle; - - protected Component errorComponent; - public ComputeWeightsAction(EditCatchesUIHandler handler) { super(handler, "generate", @@ -68,47 +65,46 @@ EditCatchesUIModel model = getModel(); computeSpeciesBatches(); - Float speciesTotalSortedWeight = model.getSpeciesTotalSortedComputedWeight(); - Float speciesTotalUnsortedWeight = model.getSpeciesTotalUnsortedComputedWeight(); - EditCatchesUI ui = getUI(); + if (errorMessage == null) { + Float speciesTotalSortedWeight = model.getSpeciesTotalSortedComputedWeight(); + Float speciesTotalUnsortedWeight = model.getSpeciesTotalUnsortedComputedWeight(); - model.setCatchTotalSortedComputedWeight(speciesTotalSortedWeight); - model.setCatchTotalUnsortedComputedWeight(speciesTotalUnsortedWeight); + EditCatchesUI ui = getUI(); - Float totalWeight = model.getCatchTotalWeight(); - Float rejectedWeight = model.getCatchTotalRejectedWeight(); + model.setCatchTotalSortedComputedWeight(speciesTotalSortedWeight); + model.setCatchTotalUnsortedComputedWeight(speciesTotalUnsortedWeight); - if (rejectedWeight == null && totalWeight != null) { - if (!totalWeight.equals(speciesTotalUnsortedWeight - + speciesTotalSortedWeight)) { - errorMessage = _("tutti.action.computeWeights.error.incoherentTotal"); - errorTitle = _("tutti.action.computeWeights.error.incoherentTotal.title"); - errorComponent = ui.getCatchTotalWeightField(); + Float totalWeight = model.getCatchTotalWeight(); + Float rejectedWeight = model.getCatchTotalRejectedWeight(); - } else { + if (rejectedWeight == null && totalWeight != null) { + if (!totalWeight.equals(speciesTotalUnsortedWeight + + speciesTotalSortedWeight)) { + errorMessage = _("tutti.action.computeWeights.error.incoherentTotal"); - model.setCatchTotalRejectedComputedWeight(totalWeight - - speciesTotalUnsortedWeight - - speciesTotalSortedWeight); - } + } else { - } else if (totalWeight == null) { - if (rejectedWeight == null) { - rejectedWeight = 0f; - model.setCatchTotalRejectedComputedWeight(0f); - } - model.setCatchTotalComputedWeight(speciesTotalUnsortedWeight - + speciesTotalSortedWeight - + rejectedWeight); + model.setCatchTotalRejectedComputedWeight(totalWeight + - speciesTotalUnsortedWeight + - speciesTotalSortedWeight); + } - } else if (rejectedWeight != null - && !totalWeight.equals(speciesTotalUnsortedWeight - + speciesTotalSortedWeight - + rejectedWeight)) { - errorMessage = _("tutti.action.computeWeights.error.incoherentTotal"); - errorTitle = _("tutti.action.computeWeights.error.incoherentTotal.title"); - errorComponent = ui.getCatchTotalWeightField(); + } else if (totalWeight == null) { + if (rejectedWeight == null) { + rejectedWeight = 0f; + model.setCatchTotalRejectedComputedWeight(0f); + } + model.setCatchTotalComputedWeight(speciesTotalUnsortedWeight + + speciesTotalSortedWeight + + rejectedWeight); + + } else if (rejectedWeight != null + && !totalWeight.equals(speciesTotalUnsortedWeight + + speciesTotalSortedWeight + + rejectedWeight)) { + errorMessage = _("tutti.action.computeWeights.error.incoherentTotal"); + } } } @@ -128,17 +124,13 @@ EditCatchesUI ui = getUI(); List<SpeciesBatchRowModel> roots = getUI().getSpeciesTabContent().getModel().getRows(); - for (SpeciesBatchRowModel row : roots) { + for (int i = 0 ; i < roots.size() ; i++) { + SpeciesBatchRowModel row = roots.get(i); if (row.isBatchRoot()) { Float weight = computeSpeciesBatch(row); if (weight == null) { - JOptionPane.showMessageDialog( - speciesUI, - _("tutti.dialog.catches.species.computeWeight.error.message"), - _("tutti.dialog.catches.species.computeWeight.error.title"), - JOptionPane.ERROR_MESSAGE); - totalSortedWeight = null; - totalUnsortedWeight = null; + errorMessage = _("tutti.action.computeWeights.error.noWeight"); + AbstractSelectTableAction.doSelectCell(speciesUI.getTable(), i, 1); break; } if (persistenceService.isSortedQualitativeValue(row.getSortedUnsortedCategory().getCategoryValue())) { @@ -149,45 +141,57 @@ } } - Number inertWeight = model.getSpeciesTotalInertWeight(); - if (inertWeight != null) { - totalSortedWeight += inertWeight.floatValue(); - } else { - model.setSpeciesTotalInertWeight(0f); - } + if (errorMessage == null) { + Number inertWeight = model.getSpeciesTotalInertWeight(); + if (inertWeight != null) { + totalSortedWeight += inertWeight.floatValue(); + } else { + model.setSpeciesTotalInertWeight(0f); + } - Number livingNotItemizedWeight = model.getSpeciesTotalLivingNotItemizedWeight(); - if (livingNotItemizedWeight != null) { - totalSortedWeight += livingNotItemizedWeight.floatValue(); - } else { - model.setSpeciesTotalLivingNotItemizedWeight(0f); - } + Number livingNotItemizedWeight = model.getSpeciesTotalLivingNotItemizedWeight(); + if (livingNotItemizedWeight != null) { + totalSortedWeight += livingNotItemizedWeight.floatValue(); + } else { + model.setSpeciesTotalLivingNotItemizedWeight(0f); + } - model.setSpeciesTotalSampleSortedComputedWeight(totalSortedWeight); + model.setSpeciesTotalSampleSortedComputedWeight(totalSortedWeight); - Float speciesTotalSortedWeight = model.getSpeciesTotalSortedWeight(); - if (speciesTotalSortedWeight == null) { - speciesTotalSortedWeight = totalSortedWeight; - model.setSpeciesTotalSortedComputedWeight(totalSortedWeight); + Float speciesTotalSortedWeight = model.getSpeciesTotalSortedWeight(); + Float rate = getConfig().getDifferenceRateBetweenSortedAndTotalWeights(); + if (speciesTotalSortedWeight == null) { + speciesTotalSortedWeight = totalSortedWeight; + model.setSpeciesTotalSortedComputedWeight(totalSortedWeight); - } else if (speciesTotalSortedWeight < totalSortedWeight) { - errorMessage = _("tutti.action.computeWeights.error.incoherentSpeciesTotalSorted"); - errorTitle = _("tutti.action.computeWeights.error.incoherentSpeciesTotalSorted.title"); - errorComponent = ui.getSpeciesTotalSortedWeightField(); + } else if (speciesTotalSortedWeight < totalSortedWeight) { + errorMessage = _("tutti.action.computeWeights.error.incoherentSpeciesTotalSorted"); - } else if (speciesTotalSortedWeight < 1.05 * totalSortedWeight) { - // TODO Si le "Poids total VRAC" est saisi est que sa valeur - // est supérieure de moins de x% (x en configuration) - // du "Poids total Vrac trié", demander confirmation que - // le "Poids total VRAC" est bien une valeur observée - // sinon la remplacer par le "Poids total Vrac trié" - } + } else if (speciesTotalSortedWeight < (1 + rate / 100) * totalSortedWeight) { + // Si le "Poids total VRAC" est saisi est que sa valeur + // est supérieure de moins de x% (x en configuration) + // du "Poids total Vrac trié", demander confirmation que + // le "Poids total VRAC" est bien une valeur observée + // sinon la remplacer par le "Poids total Vrac trié" + int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), + _("tutti.action.computeWeights.replaceTotalSortedWeight.message", rate), + _("tutti.action.computeWeights.replaceTotalSortedWeight.title"), + JOptionPane.YES_NO_OPTION, + JOptionPane.QUESTION_MESSAGE); - model.setSpeciesTotalUnsortedComputedWeight(totalUnsortedWeight); + if (answer == JOptionPane.NO_OPTION) { + model.setSpeciesTotalSortedWeight(null); + speciesTotalSortedWeight = totalSortedWeight; + model.setSpeciesTotalSortedComputedWeight(totalSortedWeight); + } + } - Float totalWeight = totalUnsortedWeight + speciesTotalSortedWeight; - model.setSpeciesTotalComputedWeight(totalWeight); + model.setSpeciesTotalUnsortedComputedWeight(totalUnsortedWeight); + Float totalWeight = totalUnsortedWeight + speciesTotalSortedWeight; + model.setSpeciesTotalComputedWeight(totalWeight); + } + speciesUI.getTable().repaint(); } @@ -221,8 +225,6 @@ } else if (categoryWeight < sum) { errorMessage = _("tutti.action.computeWeights.error.incoherentParentCategoryWeight"); - errorTitle = _("tutti.action.computeWeights.error.incoherentParentCategoryWeight.title"); - errorComponent = null; } else { boolean subSample = categoryWeight > sum; @@ -258,8 +260,6 @@ if (categoryWeight == null && rowWeight != null) { errorMessage = _("tutti.action.computeWeights.error.incoherentRowWeightCategory"); - errorTitle = _("tutti.action.computeWeights.error.incoherentRowWeightCategory.title"); - errorComponent = null; } else if (categoryWeight == null && frequencyWeight != null) { // if the category weight is null and the frequencies have a weight, @@ -274,16 +274,12 @@ // weight, then set the weight of the sample if (categoryWeight != null && frequencyWeight > categoryWeight) { errorMessage = _("tutti.action.computeWeights.error.incoherentCategoryWeight"); - errorTitle = _("tutti.action.computeWeights.error.incoherentCategoryWeight.title"); - errorComponent = null; } else if (rowWeight == null) { row.setComputedWeight(frequencyWeight); } else if (!rowWeight.equals(frequencyWeight)) { errorMessage = _("tutti.action.computeWeights.error.incoherentRowWeightFrequency"); - errorTitle = _("tutti.action.computeWeights.error.incoherentRowWeightFrequency.title"); - errorComponent = null; } result = categoryWeight; @@ -302,17 +298,11 @@ @Override protected void releaseAction() { if (errorMessage != null) { - JOptionPane.showMessageDialog( - getUI(), - errorMessage, - errorTitle, - JOptionPane.ERROR_MESSAGE); + error = new Exception(errorMessage); + } else { + super.releaseAction(); } - if (errorComponent != null) { - errorComponent.requestFocus(); - } errorMessage = null; - errorComponent = null; } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-03-05 11:36:05 UTC (rev 535) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-03-05 12:11:44 UTC (rev 536) @@ -8,15 +8,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -38,6 +38,7 @@ useFloat: true; numberPattern: {DECIMAL3_PATTERN}; decimalNumber: 3; + computedDataColor: {handler.getConfig().getColorComputedWeights()}; } #catchTable { @@ -136,7 +137,7 @@ #speciesTotalSortedWeightField { text: {getStringValue(model.getSpeciesTotalSortedWeight() != null ? - String.format("%.3f", model.getSpeciesTotalSortedWeight()) : + String.format("%.3f", model.getSpeciesTotalSortedWeight()) : model.getSpeciesTotalSortedComputedWeight() != null ? String.format("%.3f", model.getSpeciesTotalSortedComputedWeight()) : null)}; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java 2013-03-05 11:36:05 UTC (rev 535) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java 2013-03-05 12:11:44 UTC (rev 536) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -117,11 +117,8 @@ // remove all rows from the model getModel().getRows().removeAll(rowToRemove); - // refresh table from parent batch row index to the end - tableModel.fireTableDataChanged(); + if (!getModel().getRows().isEmpty()) { - if (tableModel.getRowCount() > 0) { - // select first row AbstractSelectTableAction.doSelectCell(table, 0, 0); } else { @@ -129,6 +126,9 @@ table.clearSelection(); } + // refresh table from parent batch row index to the end + tableModel.fireTableDataChanged(); + if (table.isEditing()) { // but no edit it Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategoryComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategoryComponent.java 2013-03-05 11:36:05 UTC (rev 535) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategoryComponent.java 2013-03-05 12:11:44 UTC (rev 536) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -52,8 +52,11 @@ */ public class SampleCategoryComponent { - public static <C extends Serializable> TableCellRenderer newRender(TableCellRenderer renderer, Decorator<C> decorator) { - return new SampleCategoryRenderer<C>(renderer, decorator); + public static <C extends Serializable> TableCellRenderer newRender( + TableCellRenderer renderer, + Decorator<C> decorator, + Color computedDataColor) { + return new SampleCategoryRenderer<C>(renderer, decorator, computedDataColor); } public static <C extends Serializable> TableCellEditor newEditor(Decorator<C> decorator) { @@ -196,10 +199,14 @@ protected final Decorator<C> categoryDecorator; + protected final Color computedWeightColor; + public SampleCategoryRenderer(TableCellRenderer delegate, - Decorator<C> categoryDecorator) { + Decorator<C> categoryDecorator, + Color computedWeightColor) { this.delegate = delegate; this.categoryDecorator = categoryDecorator; + this.computedWeightColor = computedWeightColor; } @Override @@ -236,8 +243,8 @@ text += String.format("%.3f", computedNumber); } else { - String blue = Integer.toHexString(Color.BLUE.getRGB()).substring(2); - text += "" + + String color = Integer.toHexString(computedWeightColor.getRGB()).substring(2); + text += "" + String.format("%.3f", computedNumber) + ""; } } else { 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-03-05 11:36:05 UTC (rev 535) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css 2013-03-05 12:11:44 UTC (rev 536) @@ -8,15 +8,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -38,6 +38,7 @@ useFloat: true; numberPattern: {DECIMAL3_PATTERN}; decimalNumber: 3; + computedDataColor: {handler.getConfig().getColorComputedWeights()}; } #speciesTotalWeightLabel { 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-03-05 11:36:05 UTC (rev 535) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-03-05 12:11:44 UTC (rev 536) @@ -550,6 +550,8 @@ Decorator<CaracteristicQualitativeValue> caracteristicDecorator = getDecorator(CaracteristicQualitativeValue.class, null); + Color computedDataColor = getConfig().getColorComputedWeights(); + { // Species column addColumnToModel(columnModel, @@ -602,17 +604,17 @@ addColumnToModel(columnModel, TuttiComputedOrNotDataTableCell.newEditor( - Float.class, false, true, 3), + Float.class, false, true, 3, computedDataColor), TuttiComputedOrNotDataTableCell.newRender( - defaultRenderer, true, 3), + defaultRenderer, true, 3, computedDataColor), SpeciesBatchTableModel.WEIGHT); } { // Number column (from frequencies) addColumnToModel(columnModel, - FrequencyCellComponent.newEditor(ui), - FrequencyCellComponent.newRender(), + FrequencyCellComponent.newEditor(ui, computedDataColor), + FrequencyCellComponent.newRender(computedDataColor), SpeciesBatchTableModel.COMPUTED_NUMBER); } @@ -1152,7 +1154,9 @@ TableCellRenderer defaultRenderer) { addColumnToModel(columnModel, SampleCategoryComponent.newEditor(decorator), - SampleCategoryComponent.newRender(defaultRenderer, decorator), + SampleCategoryComponent.newRender(defaultRenderer, + decorator, + getConfig().getColorComputedWeights()), columnIdentifier); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/FrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/FrequencyCellComponent.java 2013-03-05 11:36:05 UTC (rev 535) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/FrequencyCellComponent.java 2013-03-05 12:11:44 UTC (rev 536) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -64,13 +64,16 @@ public static final String ROW_INDEX = "rowIndex"; + protected Color computedDataColor; + /** Logger. */ private static final Log log = LogFactory.getLog(FrequencyCellComponent.class); - public FrequencyCellComponent() { + public FrequencyCellComponent(Color computedDataColor) { setHorizontalAlignment(CENTER); setIcon(SwingUtil.createActionIcon("show-frequency")); + this.computedDataColor = computedDataColor; } public void setComputedOrNotText(TuttiComputedOrNotData<Integer> data) { @@ -83,7 +86,7 @@ && data.getComputedData() != null && data.getComputedData() != 0) { - String blue = Integer.toHexString(Color.BLUE.getRGB()).substring(2); + String blue = Integer.toHexString(computedDataColor.getRGB()).substring(2); text = "<html>" + data.getComputedData() + "</html>"; } else { @@ -92,12 +95,12 @@ setText(text); } - public static TableCellRenderer newRender() { - return new FrequencyCellRenderer(); + public static TableCellRenderer newRender(Color computedDataColor) { + return new FrequencyCellRenderer(computedDataColor); } - public static TableCellEditor newEditor(SpeciesBatchUI ui) { - return new FrequencyCellEditor(ui); + public static TableCellEditor newEditor(SpeciesBatchUI ui, Color computedDataColor) { + return new FrequencyCellEditor(ui, computedDataColor); } public static class FrequencyCellEditor extends AbstractCellEditor implements TableCellEditor { @@ -120,9 +123,9 @@ protected Integer columnIndex; - public FrequencyCellEditor(SpeciesBatchUI ui) { + public FrequencyCellEditor(SpeciesBatchUI ui, Color computedDataColor) { this.ui = ui; - component = new FrequencyCellComponent(); + component = new FrequencyCellComponent(computedDataColor); component.setBorder(new LineBorder(Color.BLACK)); component.addKeyListener(new KeyAdapter() { @Override @@ -274,8 +277,8 @@ protected final FrequencyCellComponent component; - public FrequencyCellRenderer() { - component = new FrequencyCellComponent(); + public FrequencyCellRenderer(Color computedDataColor) { + component = new FrequencyCellComponent(computedDataColor); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-03-05 11:36:05 UTC (rev 535) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-03-05 12:11:44 UTC (rev 536) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -337,7 +337,7 @@ jTextField.setFont(font); jTextField.setEditable(!computed); jTextField.setEnabled(!computed); - jTextField.setDisabledTextColor(Color.BLUE); + jTextField.setDisabledTextColor(getConfig().getColorComputedWeights()); } } else if (component instanceof AbstractButton) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditor.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditor.jaxx 2013-03-05 11:36:05 UTC (rev 535) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditor.jaxx 2013-03-05 12:11:44 UTC (rev 536) @@ -8,15 +8,15 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public + + You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/gpl-3.0.html>. #L% @@ -25,12 +25,15 @@ <import> fr.ifremer.tutti.ui.swing.util.TuttiComputedOrNotData + java.awt.Color </import> <String id='property' javaBean='TuttiComputedOrNotData.PROPERTY_DATA'/> <TuttiComputedOrNotData id='bean' genericType='?' javaBean='null'/> + <Color id='computedDataColor' javaBean='null'/> +  <TuttiComputedOrNotDataEditorHandler id='handler' constructorParams='this'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java 2013-03-05 11:36:05 UTC (rev 535) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataEditorHandler.java 2013-03-05 12:11:44 UTC (rev 536) @@ -11,15 +11,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -64,7 +64,7 @@ TuttiComputedOrNotData bean = (TuttiComputedOrNotData) editor.getBean(); if (bean != null) { - bean.addPropertyChangeListener(TuttiComputedOrNotData.PROPERTY_COMPUTED_DATA, l); + bean.addPropertyChangeListener(l); } editor.addPropertyChangeListener(TuttiComputedOrNotDataEditor.PROPERTY_BEAN, new PropertyChangeListener() { @@ -72,12 +72,12 @@ TuttiComputedOrNotData bean = (TuttiComputedOrNotData) evt.getOldValue(); if (bean != null) { - bean.removePropertyChangeListener(TuttiComputedOrNotData.PROPERTY_COMPUTED_DATA, l); + bean.removePropertyChangeListener(l); } bean = (TuttiComputedOrNotData) evt.getNewValue(); if (bean != null) { - bean.addPropertyChangeListener(TuttiComputedOrNotData.PROPERTY_COMPUTED_DATA, l); + bean.addPropertyChangeListener(l); } } }); @@ -116,7 +116,7 @@ if (bean != null && editor.getModel() == null) { JTextField tf = editor.getTextField(); tf.setFont(TuttiUI.TEXTFIELD_COMPUTED_FONT); - tf.setForeground(Color.BLUE); + tf.setForeground(((TuttiComputedOrNotDataEditor) editor).getComputedDataColor()); String modelText; Number computedData = bean.getComputedData(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java 2013-03-05 11:36:05 UTC (rev 535) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java 2013-03-05 12:11:44 UTC (rev 536) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -54,20 +54,24 @@ public static TableCellRenderer newRender(TableCellRenderer renderer, boolean useFloat, - Integer decimalNumber) { + Integer decimalNumber, + Color computedDataColor) { return new TuttiComputedOrNotDataTableCellRenderer(renderer, useFloat, - decimalNumber); + decimalNumber, + computedDataColor); } public static TableCellEditor newEditor(Class type, boolean useSign, boolean useFloat, - Integer decimalNumber) { + Integer decimalNumber, + Color computedDataColor) { return new TuttiComputedOrNotDataTableCellEditor(type, useSign, - useFloat, decimalNumber); + useFloat, decimalNumber, + computedDataColor); } public static class TuttiComputedOrNotDataTableCellEditor @@ -84,9 +88,11 @@ public TuttiComputedOrNotDataTableCellEditor(Class type, boolean useSign, boolean useFloat, - Integer decimalNumber) { + Integer decimalNumber, + Color computedDataColor) { numberEditor = new TuttiComputedOrNotDataEditor(); + numberEditor.setComputedDataColor(computedDataColor); numberEditor.getTextField().setHorizontalAlignment(SwingConstants.RIGHT); numberEditor.getTextField().addFocusListener(this); numberEditor.getTextField().addAncestorListener(this); @@ -178,16 +184,20 @@ protected Integer decimalNumber; + protected Color computedDataColor; + protected boolean useFloat; public TuttiComputedOrNotDataTableCellRenderer( TableCellRenderer delegate, boolean useFloat, - Integer decimalNumber) { + Integer decimalNumber, + Color computedDataColor) { this.delegate = delegate; this.useFloat = useFloat; this.decimalNumber = decimalNumber; + this.computedDataColor = computedDataColor; } public Component getTableCellRendererComponent(JTable table, @@ -204,7 +214,7 @@ if (dataValue == null) { dataValue = data.getComputedData(); font = TuttiUI.TEXTFIELD_COMPUTED_FONT; - foreground = Color.BLUE; + foreground = computedDataColor; } else { font = TuttiUI.TEXTFIELD_NORMAL_FONT; Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-03-05 11:36:05 UTC (rev 535) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-03-05 12:11:44 UTC (rev 536) @@ -44,6 +44,9 @@ tutti.action.computeWeights.error.incoherentSpeciesTotalSorted.title=Incohérence tutti.action.computeWeights.error.incoherentTotal=Le poids total de la capture ne correspond pas à la somme des poids totaux Vrac, Hors Vrac et non triés tutti.action.computeWeights.error.incoherentTotal.title=Incohérence +tutti.action.computeWeights.error.noWeight=Un lot n'a pas de poids +tutti.action.computeWeights.replaceTotalSortedWeight.message=Le Poids total VRAC saisi est supérieur de moins de %s%% au Poids total Vrac trié.%nEst-ce bien une valeur observée ? Si non, la valeur sera remplacée par le poids calculé. +tutti.action.computeWeights.replaceTotalSortedWeight.title=Poids total VRAC peu différent du Poids total Vrac trié tutti.action.computeWeights.tip=Elever les poids tutti.action.configuration=Configuration tutti.action.configuration.tip=Configurer Tutti @@ -391,6 +394,7 @@ tutti.option.protocolId.description=Identifiant du dernier protocole utilisé tutti.option.ui.autoPopupNumberEditor.description=Toujours afficher le pavé numérique lors de l'édition d'un nombre tutti.option.ui.color.cellWithValue.description=Couleur d'une cellule avec des données +tutti.option.ui.color.computedWeights.description=Couleur des données calculées tutti.option.ui.color.rowInvalid.description=Ligne invalide tutti.option.ui.color.rowReadOnly.description=Cellule non éditable tutti.option.ui.color.rowToConfirm.description=Ligne à confirmer @@ -577,3 +581,4 @@ tutti.validator.warning.longitude.minute.outOfBounds=La minute de la latitude doit être comprise entre 0 et 60 tutti.validator.warning.longitude.outOfBounds=La Latitude doit être comprise entre -180.0 et 180.0 tutti.validator.warning.longitude.second.outOfBounds=La seconde de la longitude doit être comprise entre 0 et 60 +tutti.weights.rate.difference.totalAndSorted.description=Pourcentage de différence entre les Poids totaux VRAC triés et les poids totaux VRAC en dessous duquel on demande confirmation sur la saisie.

1 0

r535 - trunk
by tchemit＠users.forge.codelutin.com 05 Mar '13

05 Mar '13

Author: tchemit Date: 2013-03-05 12:36:05 +0100 (Tue, 05 Mar 2013) New Revision: 535 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/535 Log: prepare release (use last stable version of libs) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-05 10:45:23 UTC (rev 534) +++ trunk/pom.xml 2013-03-05 11:36:05 UTC (rev 535) @@ -122,7 +122,7 @@  - <nuitonUtilsVersion>2.6.10-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.10</nuitonUtilsVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> <eugenePluginVersion>2.6.1</eugenePluginVersion> @@ -130,13 +130,13 @@ <h2Version>1.3.168</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <jaxxVersion>2.5.11-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.5.11</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.7</xworkVersion> <slf4jVersion>1.7.2</slf4jVersion> - <adagioVersion>3.3.4-SNAPSHOT</adagioVersion> + <adagioVersion>3.3.4</adagioVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion>

1 0