r343 - in trunk/tutti-ui-swing: . src/main/assembly src/main/assembly/full src/main/java/fr/ifremer/tutti/ui/swing src/main/java/fr/ifremer/tutti/ui/swing/config src/main/java/fr/ifremer/tutti/ui/swing/content/operation src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency src/main/java/fr/ifremer/tutti/ui/swing/content/oper
Author: tchemit Date: 2013-02-06 02:52:42 +0100 (Wed, 06 Feb 2013) New Revision: 343 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/343 Log: - reformat code + add svn properties + license header - make db update works - change configuration (but still need to save at correct location) Modified: trunk/tutti-ui-swing/pom.xml trunk/tutti-ui-swing/src/main/assembly/full/tutti.bat trunk/tutti-ui-swing/src/main/assembly/full/tutti.sh trunk/tutti-ui-swing/src/main/assembly/i18n.xml trunk/tutti-ui-swing/src/main/assembly/standalone.xml trunk/tutti-ui-swing/src/main/assembly/tutti-full-component.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/ImportTemporaryReferentialAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/UpdateReferentialAction.java 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/content/operation/AttachmentsAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/ImportCasinoAction.java 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/RenameSpeciesBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUIHandler.java 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/SpeciesFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties trunk/tutti-ui-swing/src/main/resources/icons/action-species.gif trunk/tutti-ui-swing/src/main/resources/icons/action-temporary-referential-import.png trunk/tutti-ui-swing/src/main/resources/icons/action-update-referential.png trunk/tutti-ui-swing/src/main/resources/log4j.properties Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/pom.xml 2013-02-06 01:52:42 UTC (rev 343) @@ -386,7 +386,7 @@ <executions> <execution> <id>get-linux-i586-jre</id> - <phase>process-classes</phase> + <phase>prepare-package</phase> <goals> <goal>unpack</goal> </goals> @@ -529,6 +529,9 @@ <descriptor> src/main/assembly/standalone.xml </descriptor> + <descriptor> + src/main/assembly/i18n.xml + </descriptor> </descriptors> </configuration> </execution> Modified: trunk/tutti-ui-swing/src/main/assembly/full/tutti.bat =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/full/tutti.bat 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/assembly/full/tutti.bat 2013-02-06 01:52:42 UTC (rev 343) @@ -14,7 +14,7 @@ copy tutti-app\update.bat . call update.bat del update.bat -call tutti-app\launch.bat --option tutti.launch.mode full +call tutti-app\launch.bat --option tutti.launch.mode full --option tutti.application.basedir $REP --option tutti.data.directory $REP/data --option tutti.update.application.url file:///home/tchemit/.tutti/update-tutti.properties if errorlevel 88 goto start cd %OLDDIR% Modified: trunk/tutti-ui-swing/src/main/assembly/full/tutti.sh =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/full/tutti.sh 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/assembly/full/tutti.sh 2013-02-06 01:52:42 UTC (rev 343) @@ -16,7 +16,10 @@ cp $TUTTI_HOME/update.sh . ./update.sh rm -fv update.sh - ./tutti/launch.sh --option tutti.launch.mode full + ./tutti/launch.sh --option tutti.launch.mode full \ + --option tutti.application.basedir $REP \ + --option tutti.data.directory $REP/data \ + --option tutti.update.application.url file:///home/tchemit/.tutti/update-tutti.properties exitcode=$? if [ ! "$exitcode" -eq "88" ]; then Modified: trunk/tutti-ui-swing/src/main/assembly/i18n.xml =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/i18n.xml 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/assembly/i18n.xml 2013-02-06 01:52:42 UTC (rev 343) @@ -1,3 +1,26 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + 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 + 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 + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" @@ -23,7 +46,7 @@ <outputDirectory/> <filtered>true</filtered> <includes> - <include>versopn.appup</include> + <include>version.appup</include> </includes> </fileSet> Property changes on: trunk/tutti-ui-swing/src/main/assembly/i18n.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/assembly/standalone.xml =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/standalone.xml 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/assembly/standalone.xml 2013-02-06 01:52:42 UTC (rev 343) @@ -63,7 +63,7 @@ <include>launch.bat</include> <include>update.sh</include> <include>update.bat</include> - <include>tutti.config</include> + <!--<include>tutti.config</include>--> <include>version.appup</include> </includes> </fileSet> Modified: trunk/tutti-ui-swing/src/main/assembly/tutti-full-component.xml =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/tutti-full-component.xml 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/assembly/tutti-full-component.xml 2013-02-06 01:52:42 UTC (rev 343) @@ -70,6 +70,7 @@ <excludes> <exclude>*.sh</exclude> <exclude>*.bat</exclude> + <exclude>tutti.config</exclude> </excludes> </fileSet> @@ -91,5 +92,23 @@ </includes> </fileSet> + <fileSet> + <directory>target/classes/META-INF</directory> + <outputDirectory>i18n</outputDirectory> + <includes> + <include>tutti-i18n*.properties</include> + </includes> + </fileSet> + + <fileSet> + <directory>src/main/assembly/min</directory> + <outputDirectory>i18n</outputDirectory> + <filtered>true</filtered> + <includes> + <include>version.appup</include> + </includes> + </fileSet> + + </fileSets> </component> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/ImportTemporaryReferentialAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/ImportTemporaryReferentialAction.java 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/ImportTemporaryReferentialAction.java 2013-02-06 01:52:42 UTC (rev 343) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * 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 + * 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 + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/ImportTemporaryReferentialAction.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-02-06 01:52:42 UTC (rev 343) @@ -110,27 +110,49 @@ public static void updateTutti(TuttiUIContext context) { TuttiApplicationConfig config = context.getConfig(); + File current = config.getTuttiBasedir(); if (current == null || !current.exists()) { // can not update application if (log.isWarnEnabled()) { - log.warn("No application directory defined, skip updates."); + log.warn("No application base directory defined, skip updates."); } } else { String url = config.getUpdateUrl(); + File dest = new File(config.getTuttiBasedir(), "NEW"); + if (log.isInfoEnabled()) { - log.info(String.format("Try to update jre or application (current application location: %s), using update url: %s", current, url)); + log.info(String.format("Try to update jre, i18N or tutti (current application location: %s), using update url: %s", current, url)); } ApplicationUpdater up = new ApplicationUpdater(); - File dest = new File(config.getTuttiBasedir(), "NEW"); + TuttiApplicationUpdaterCallBack callback = + new TuttiApplicationUpdaterCallBack(context); + + callback.setTypes(TuttiApplicationUpdaterCallBack.UpdateType.JRE, + TuttiApplicationUpdaterCallBack.UpdateType.I18N, + TuttiApplicationUpdaterCallBack.UpdateType.TUTTI); up.update(url, current, dest, false, - new TuttiApplicationUpdaterCallBack(context)); + callback); + + current = config.getDataDirectory(); + if (log.isInfoEnabled()) { + log.info(String.format("Try to update database (current data direction location: %s), using update url: %s", current, url)); + } + + callback.setTypes(TuttiApplicationUpdaterCallBack.UpdateType.DB); + up.update(url, + current, + dest, + false, + callback); + + } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2013-02-06 01:52:42 UTC (rev 343) @@ -57,11 +57,13 @@ protected final TuttiUIContext context; - protected final UpdateType[] types; + protected UpdateType[] types; - public TuttiApplicationUpdaterCallBack(TuttiUIContext context, - UpdateType... types) { + public TuttiApplicationUpdaterCallBack(TuttiUIContext context) { this.context = context; + } + + public void setTypes(UpdateType... types) { this.types = types; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/UpdateReferentialAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/UpdateReferentialAction.java 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/UpdateReferentialAction.java 2013-02-06 01:52:42 UTC (rev 343) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * 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 + * 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 + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.config.TuttiApplicationConfig; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/UpdateReferentialAction.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL 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-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-02-06 01:52:42 UTC (rev 343) @@ -40,6 +40,7 @@ import javax.swing.KeyStroke; import java.awt.Color; import java.io.File; +import java.io.IOException; import java.net.URL; import java.util.Locale; import java.util.Set; @@ -139,8 +140,30 @@ return serviceConfig; } + protected File configFile; + + protected File getConfigFile() { + if (configFile == null) { + File dir = getTuttiBasedir(); + if (dir == null || !dir.exists()) { + dir = new File(applicationConfig.getUserConfigDirectory()); + } + configFile = new File(dir, applicationConfig.getConfigFileName()); + } + return configFile; + } + public void save() { - applicationConfig.saveForUser(optionKeyToNotSave); + + File file = getConfigFile(); + if (log.isInfoEnabled()) { + log.info("Save configuration at: " + file); + } + try { + applicationConfig.save(file, false, optionKeyToNotSave); + } catch (IOException e) { + throw new RuntimeException("Could notsave configuration at " + file, e); + } } @Override @@ -200,7 +223,7 @@ public Color getColorCellWithValue() { return applicationConfig.getOptionAsColor(TuttiApplicationConfigOption.COLOR_CELL_WITH_VALUE.getKey()); } - + public Color getColorRowToConfirm() { return applicationConfig.getOptionAsColor(TuttiApplicationConfigOption.COLOR_ROW_TO_CONFIRM.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-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java 2013-02-06 01:52:42 UTC (rev 343) @@ -77,7 +77,7 @@ TUTTI_UPDATE_URL( "tutti.update.application.url", n_("tutti.option.update.url.description"), - null, + "http://appup.forge.codelutin.com/tutti/update-tutti.properties", String.class, true, false Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AttachmentsAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AttachmentsAction.java 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AttachmentsAction.java 2013-02-06 01:52:42 UTC (rev 343) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * 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 + * 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 + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.AbstractTuttiAction; import java.awt.event.ActionEvent; @@ -7,7 +31,6 @@ import static org.nuiton.i18n.I18n._; /** - * * @author kmorin <kmorin@codelutin.com> * @since 1.0 */ @@ -33,5 +56,5 @@ public boolean isEnabled() { return false; } - + } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-02-06 01:52:42 UTC (rev 343) @@ -52,20 +52,20 @@ import fr.ifremer.tutti.ui.swing.util.TabHandler; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import jaxx.runtime.validator.swing.SwingValidator; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.time.DateUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.swing.JOptionPane; +import javax.swing.JTabbedPane; import java.awt.Color; -import java.awt.Component; import java.awt.event.ActionEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.Date; import java.util.List; -import javax.swing.JOptionPane; -import javax.swing.JTabbedPane; -import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.time.DateUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * Handler for UI {@link EditFishingOperationUI}. @@ -85,9 +85,9 @@ private final FishingOperationsUI parentUi; private final PersistenceService persistenceService; - + /** - * listener to set the same end date as the start date + * listener to set the same end date as the start date * when the user changes it only (remove this listener before selecting the * fishing operation) */ @@ -102,7 +102,7 @@ } } - + }; /** @@ -207,7 +207,7 @@ }); model.addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_FISHING_OPERATION_VALID, new PropertyChangeListener() { - + @Override public void propertyChange(PropertyChangeEvent evt) { Boolean valid = (Boolean) evt.getNewValue(); @@ -443,9 +443,9 @@ boolean empty = bean == null; EditFishingOperationUIModel model = getModel(); - + model.removePropertyChangeListener(EditFishingOperationUIModel.PROPERTY_GEAR_SHOOTING_START_DATE, startDateListener); - + if (empty || !bean.equals(model.getFishingOperation()) || isAModelModified()) { if (empty) { bean = new FishingOperation(); @@ -507,7 +507,7 @@ model.setModify(false); fishingOperationMonitor.clearModified(); - + model.addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_GEAR_SHOOTING_START_DATE, startDateListener); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-02-06 01:52:42 UTC (rev 343) @@ -35,6 +35,7 @@ import fr.ifremer.tutti.persistence.spatial.SexagecimalPosition; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.editor.CoordinateEditorType; +import org.nuiton.util.DateUtil; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -43,7 +44,6 @@ import java.util.List; import static org.nuiton.i18n.I18n.n_; -import org.nuiton.util.DateUtil; /** * Model for UI {@link EditFishingOperationUI}. @@ -709,7 +709,7 @@ protected FishingOperation newEntity() { return fishingOperation; } - + public boolean isDateInCruise(Date date) { return DateUtil.between(date, cruise.getBeginDate(), cruise.getEndDate()); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx 2013-02-06 01:52:42 UTC (rev 343) @@ -56,7 +56,6 @@ initializer='getContextValue(FishingOperationsUIModel.class)'/> - <Table fill='both' id='topPanel' constraints='BorderLayout.NORTH'> <!-- FishingOperations fishingOperation --> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-02-06 01:52:42 UTC (rev 343) @@ -60,10 +60,10 @@ private final FishingOperationsUI ui; private final PersistenceService persistenceService; - + private static final ExecutorService executorService = Executors.newSingleThreadExecutor(); - + private static final Timer t = new Timer(); protected SelectFishingOperationAction selectFishingOperationAction; @@ -292,6 +292,6 @@ // FishingOperation operation = getModel().getSelectedFishingOperation(); // selectFishingOperation(operation); // } - - + + } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/ImportCasinoAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/ImportCasinoAction.java 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/ImportCasinoAction.java 2013-02-06 01:52:42 UTC (rev 343) @@ -53,7 +53,7 @@ protected void doAction(ActionEvent event) throws Exception { //TODO } - + @Override public boolean isEnabled() { return false; 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-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-02-06 01:52:42 UTC (rev 343) @@ -36,10 +36,10 @@ import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.JXTitledPanel; import javax.swing.JPanel; import javax.swing.JTabbedPane; -import org.jdesktop.swingx.JXTitledPanel; import static org.nuiton.i18n.I18n._; @@ -284,18 +284,18 @@ tuttiUi = ui.getSpeciesTabCreateBatch(); titlePanel = ui.getSpeciesTabCreateBatchReminderLabel(); title = "tutti.title.createBatch"; - + } else if (SPLIT_BATCH_CARD.equals(card)) { tuttiUi = ui.getSpeciesTabSplitBatch(); titlePanel = ui.getSpeciesTabSplitBatchReminderLabel(); title = "tutti.title.splitBatch"; - + } else if (EDIT_FREQUENCY_CARD.equals(card)) { tuttiUi = ui.getSpeciesTabFrequencyEditor(); titlePanel = ui.getSpeciesTabFrequencyEditorReminderLabel(); title = "tutti.title.editFrequency"; } - + if (tuttiUi != null) { registerValidators(tuttiUi.getHandler().getValidator()); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RenameSpeciesBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RenameSpeciesBatchAction.java 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RenameSpeciesBatchAction.java 2013-02-06 01:52:42 UTC (rev 343) @@ -26,19 +26,15 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ifremer.tutti.persistence.TuttiPersistence; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.AbstractTuttiAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.JXTable; import java.awt.event.ActionEvent; -import java.util.HashSet; import java.util.List; -import javax.swing.JDialog; -import javax.swing.JOptionPane; -import org.jdesktop.swingx.JXTable; import static org.nuiton.i18n.I18n._; @@ -54,7 +50,7 @@ /** Logger. */ private static final Log log = LogFactory.getLog(RenameSpeciesBatchAction.class); - + protected Species selectedSpecies; public RenameSpeciesBatchAction(SpeciesBatchUIHandler handler) { @@ -65,20 +61,20 @@ _("tutti.action.renameSpeciesBatch.tip"), false ); - + } @Override protected boolean prepareAction(ActionEvent event) { boolean result = super.prepareAction(event); - + SpeciesBatchUIHandler handler = getHandler(); SpeciesBatchUIModel model = handler.getModel(); List<Species> speciesList = Lists.newArrayList(model.getAllSpecies()); speciesList.removeAll(Sets.newHashSet(model.getSpeciesUsed().values())); - + selectedSpecies = getHandler().openAddSpeciesDialog(_("tutti.title.selectSpecies"), speciesList); - + result &= selectedSpecies != null; return result; } @@ -86,11 +82,11 @@ @Override protected void doAction(ActionEvent event) { SpeciesBatchUIHandler handler = getHandler(); - + SpeciesBatchTableModel tableModel = handler.getTableModel(); JXTable table = handler.getTable(); SpeciesBatchRowModel row = tableModel.getEntry(table.getSelectedRow()); - + PersistenceService persistenceService = getContext().getService(PersistenceService.class); persistenceService.changeSpeciesBatchSpecies(row.getId(), selectedSpecies); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.jaxx 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.jaxx 2013-02-06 01:52:42 UTC (rev 343) @@ -43,10 +43,10 @@ ]]></script> <SelectSpeciesUIHandler id='handler' - initializer='getContextValue(SelectSpeciesUIHandler.class)'/> + initializer='getContextValue(SelectSpeciesUIHandler.class)'/> <SelectSpeciesUIModel id='model' - initializer='getContextValue(SelectSpeciesUIModel.class)'/> + initializer='getContextValue(SelectSpeciesUIModel.class)'/> <BeanComboBox id='speciesCombo' constraints='BorderLayout.CENTER' constructorParams='this' genericType='Species'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUIHandler.java 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUIHandler.java 2013-02-06 01:52:42 UTC (rev 343) @@ -29,7 +29,6 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.TuttiUI; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.CreateSpeciesBatchUI; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; 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-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-02-06 01:52:42 UTC (rev 343) @@ -58,9 +58,6 @@ import fr.ifremer.tutti.ui.swing.util.editor.AttachmentCellComponent; import fr.ifremer.tutti.ui.swing.util.editor.LongTextCellComponent; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; -import java.awt.Color; -import java.awt.Component; -import java.awt.Dimension; import jaxx.runtime.JAXXUtil; import jaxx.runtime.SwingUtil; import jaxx.runtime.context.JAXXContextEntryDef; @@ -69,6 +66,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; +import org.jdesktop.swingx.decorator.ComponentAdapter; +import org.jdesktop.swingx.decorator.HighlightPredicate; +import org.jdesktop.swingx.decorator.Highlighter; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import org.nuiton.util.decorator.Decorator; @@ -76,6 +76,9 @@ import javax.swing.RowFilter; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumnModel; +import java.awt.Color; +import java.awt.Component; +import java.awt.Dimension; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.Serializable; @@ -83,9 +86,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.jdesktop.swingx.decorator.ComponentAdapter; -import org.jdesktop.swingx.decorator.HighlightPredicate; -import org.jdesktop.swingx.decorator.Highlighter; import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; @@ -638,28 +638,28 @@ Highlighter attachmentHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( new HighlightPredicate() { - public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { - int rowIndex = adapter.convertRowIndexToModel(adapter.row); - SpeciesBatchRowModel row = getTableModel().getEntry(rowIndex); - return row.getSpeciesToConfirm(); - } - - }, toConfirmColor); + public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { + int rowIndex = adapter.convertRowIndexToModel(adapter.row); + SpeciesBatchRowModel row = getTableModel().getEntry(rowIndex); + return row.getSpeciesToConfirm(); + } + + }, toConfirmColor); table.addHighlighter(attachmentHighlighter); - + initBatchTable(table, columnModel, tableModel); - + // paint the cell in dark orange if the row is to confirm and the cell is not editable attachmentHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( new HighlightPredicate() { - public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { - int rowIndex = adapter.convertRowIndexToModel(adapter.row); - SpeciesBatchRowModel row = getTableModel().getEntry(rowIndex); - return row.getSpeciesToConfirm() && !adapter.isEditable(); - } - - }, toConfirmColor.darker()); + public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { + int rowIndex = adapter.convertRowIndexToModel(adapter.row); + SpeciesBatchRowModel row = getTableModel().getEntry(rowIndex); + return row.getSpeciesToConfirm() && !adapter.isEditable(); + } + + }, toConfirmColor.darker()); table.addHighlighter(attachmentHighlighter); getModel().addPropertyChangeListener(SpeciesBatchUIModel.PROPERTY_TABLE_VIEW_MODE, new PropertyChangeListener() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-02-06 01:52:42 UTC (rev 343) @@ -51,6 +51,7 @@ import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; +import javax.swing.JTextField; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.beans.PropertyChangeEvent; @@ -58,7 +59,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import javax.swing.JTextField; /** * @author tchemit <chemit@codelutin.com> @@ -210,7 +210,7 @@ Float step = (Float) ui.getRafaleStepField().getModel(); applyRafaleStep(step); - + //select text JTextField field = (JTextField) e.getSource(); field.selectAll(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesAction.java 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesAction.java 2013-02-06 01:52:42 UTC (rev 343) @@ -33,7 +33,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.SwingUtilities; import java.awt.event.ActionEvent; import java.util.List; @@ -53,7 +52,7 @@ private static final Log log = LogFactory.getLog(AddSpeciesAction.class); protected List<Species> allSpecies; - + protected Species selectedSpecies; public AddSpeciesAction(CreateSpeciesBatchUIHandler handler) { @@ -77,9 +76,9 @@ List<Species> availableSpecies = handler.getModel().getAvailableSpecies(); List<Species> species = Lists.newArrayList(allSpecies); species.removeAll(availableSpecies); - + selectedSpecies = getHandler().openAddSpeciesDialog(_("tutti.title.selectSpecies"), species); - + result &= selectedSpecies != null; return result; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-02-06 01:52:42 UTC (rev 343) @@ -24,7 +24,6 @@ * #L% */ -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SelectSpeciesUIModel; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import fr.ifremer.tutti.persistence.TuttiPersistence; @@ -38,6 +37,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SelectSpeciesUI; +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SelectSpeciesUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel; import fr.ifremer.tutti.ui.swing.util.Cancelable; import jaxx.runtime.SwingUtil; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-02-06 01:52:42 UTC (rev 343) @@ -269,7 +269,7 @@ addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.SEX_ENABLED, table); addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.MATURITY_ENABLED, table); addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.AGE_ENABLED, table); - + addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.CALCIFY_SAMPLE_ENABLED, table); EditProtocolSpeciesTableModel tableModel = Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java 2013-02-06 01:52:42 UTC (rev 343) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.referential; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * 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 + * 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 + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java 2013-02-06 01:52:42 UTC (rev 343) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.referential; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * 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 + * 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 + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java 2013-02-06 01:52:42 UTC (rev 343) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.referential; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * 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 + * 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 + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java 2013-02-06 01:52:42 UTC (rev 343) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.referential; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * 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 + * 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 + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java 2013-02-06 01:52:42 UTC (rev 343) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.referential; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * 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 + * 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 + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java 2013-02-06 01:52:42 UTC (rev 343) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.referential; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * 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 + * 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 + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java 2013-02-06 01:52:42 UTC (rev 343) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.referential; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * 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 + * 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 + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java 2013-02-06 01:52:42 UTC (rev 343) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.referential; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * 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 + * 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 + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-02-06 01:52:42 UTC (rev 343) @@ -47,6 +47,7 @@ import org.jdesktop.swingx.autocomplete.ComboBoxCellEditor; import org.jdesktop.swingx.autocomplete.ObjectToStringConverter; import org.jdesktop.swingx.decorator.ComponentAdapter; +import org.jdesktop.swingx.decorator.HighlightPredicate; import org.jdesktop.swingx.decorator.Highlighter; import org.jdesktop.swingx.table.TableColumnExt; import org.nuiton.util.decorator.Decorator; @@ -74,7 +75,6 @@ import java.util.Enumeration; import java.util.List; import java.util.Set; -import org.jdesktop.swingx.decorator.HighlightPredicate; import static org.nuiton.i18n.I18n._; @@ -299,14 +299,14 @@ new HighlightPredicate.AndHighlightPredicate( new HighlightPredicate.IdentifierHighlightPredicate(SpeciesBatchTableModel.COMMENT), new HighlightPredicate.NotHighlightPredicate(new HighlightPredicate.EqualsHighlightPredicate()) - ), cellWithValueColor); + ), cellWithValueColor); table.addHighlighter(commentHighlighter); Highlighter attachmentHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( new HighlightPredicate.AndHighlightPredicate( new HighlightPredicate.IdentifierHighlightPredicate(SpeciesBatchTableModel.ATTACHMENTS), new HighlightPredicate.NotHighlightPredicate(new HighlightPredicate.EqualsHighlightPredicate()) - ), cellWithValueColor); + ), cellWithValueColor); table.addHighlighter(attachmentHighlighter); // paint in a special color inValid rows @@ -556,7 +556,7 @@ @Override public void keyPressed(KeyEvent e) { TableCellEditor editor = table.getCellEditor(); - + int keyCode = e.getKeyCode(); if (keyCode == KeyEvent.VK_LEFT || (keyCode == KeyEvent.VK_TAB && e.isShiftDown())) { @@ -565,7 +565,7 @@ editor.stopCellEditing(); } previousCellAction.actionPerformed(null); - + } else if (//e.getKeyCode() == KeyEvent.VK_ENTER || keyCode == KeyEvent.VK_RIGHT || keyCode == KeyEvent.VK_TAB) { @@ -574,14 +574,14 @@ editor.stopCellEditing(); } nextCellAction.actionPerformed(null); - + } else if (keyCode == KeyEvent.VK_UP) { e.consume(); if (editor != null) { editor.stopCellEditing(); } previousRowAction.actionPerformed(null); - + } else if (keyCode == KeyEvent.VK_DOWN) { e.consume(); if (editor != null) { 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-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-06 01:52:42 UTC (rev 343) @@ -421,10 +421,10 @@ tutti.title.noSelectedCruise=Pas de campagne sélectionné tutti.title.noSelectedProgram=Pas de série de campagne sélectionné tutti.title.noSelectedProtocol=Pas de protocol sélectionné +tutti.title.selectSpecies=Choisissez une espèce tutti.title.selectedCruise=Campagne %s tutti.title.selectedProgram=Série de campagne %s tutti.title.selectedProtocol=Protocole %s -tutti.title.selectSpecies=Choisissez une espèce tutti.title.splitBatch=Catégorisation du lot tutti.title.validate.operations=Validation des opérations de pêches (%s) tutti.to.be.done=< A FAIRE > Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-species.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-temporary-referential-import.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-update-referential.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/resources/log4j.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/log4j.properties 2013-02-06 00:47:07 UTC (rev 342) +++ trunk/tutti-ui-swing/src/main/resources/log4j.properties 2013-02-06 01:52:42 UTC (rev 343) @@ -41,5 +41,5 @@ log4j.logger.fr.ifremer.tutti.ui.swing.AbstractTuttiUIHandler=WARN log4j.logger.fr.ifremer.tutti.ui.swing.util.table=WARN log4j.logger.org.nuiton.util=WARN -log4j.logger.org.nuiton.util.ApplicationUpdater=DEBUG +#log4j.logger.org.nuiton.util.ApplicationUpdater=DEBUG #log4j.logger.jaxx.runtime.swing.editor.bean.BeanComboBox=DEBUG
participants (1)
-
tchemit＠users.forge.codelutin.com