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

r595 - trunk
by kmorin＠users.forge.codelutin.com 12 Mar '13

12 Mar '13

Author: kmorin Date: 2013-03-12 19:24:26 +0100 (Tue, 12 Mar 2013) New Revision: 595 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/595 Log: use last jaxx snapshot Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-12 15:24:29 UTC (rev 594) +++ trunk/pom.xml 2013-03-12 18:24:26 UTC (rev 595) @@ -129,7 +129,7 @@ <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <licensePluginVersion>1.4</licensePluginVersion> - <jaxxVersion>2.5.13</jaxxVersion> + <jaxxVersion>2.5.14-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.7</xworkVersion>

1 0

r594 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content
by tchemit＠users.forge.codelutin.com 12 Mar '13

12 Mar '13

Author: tchemit Date: 2013-03-12 16:24:29 +0100 (Tue, 12 Mar 2013) New Revision: 594 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/594 Log: fixes #2126: [AIDE] Le composant d'aide en ligne n'est pas mise ?\195?\160 jour au d?\195?\169marrage de l'application Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java 2013-03-12 13:54:49 UTC (rev 593) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java 2013-03-12 15:24:29 UTC (rev 594) @@ -84,7 +84,8 @@ callback.setTypes(TuttiApplicationUpdaterCallBack.UpdateType.JRE, TuttiApplicationUpdaterCallBack.UpdateType.I18N, - TuttiApplicationUpdaterCallBack.UpdateType.TUTTI); + TuttiApplicationUpdaterCallBack.UpdateType.TUTTI, + TuttiApplicationUpdaterCallBack.UpdateType.HELP); up.update(url, current, dest,

1 0

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

12 Mar '13

Author: tchemit Date: 2013-03-12 14:54:49 +0100 (Tue, 12 Mar 2013) New Revision: 593 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/593 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-12 13:54:41 UTC (rev 592) +++ trunk/pom.xml 2013-03-12 13:54:49 UTC (rev 593) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.0.3</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.3</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.3 + 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.3 + 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-12 13:54:41 UTC (rev 592) +++ trunk/tutti-persistence/pom.xml 2013-03-12 13:54:49 UTC (rev 593) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.0.3</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-12 13:54:41 UTC (rev 592) +++ trunk/tutti-service/pom.xml 2013-03-12 13:54:49 UTC (rev 593) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.0.3</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-12 13:54:41 UTC (rev 592) +++ trunk/tutti-ui-swing/pom.xml 2013-03-12 13:54:49 UTC (rev 593) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.0.3</version> + <version>1.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r592 - tags
by tchemit＠users.forge.codelutin.com 12 Mar '13

12 Mar '13

Author: tchemit Date: 2013-03-12 14:54:41 +0100 (Tue, 12 Mar 2013) New Revision: 592 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/592 Log: [maven-release-plugin] copy for tag tutti-1.0.3 Added: tags/tutti-1.0.3/

1 0

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

12 Mar '13

Author: tchemit Date: 2013-03-12 14:54:33 +0100 (Tue, 12 Mar 2013) New Revision: 591 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/591 Log: [maven-release-plugin] prepare release tutti-1.0.3 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-12 13:37:25 UTC (rev 590) +++ trunk/pom.xml 2013-03-12 13:54:33 UTC (rev 591) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.0.3</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.3</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.3 </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.3 </developerConnection> </scm> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-03-12 13:37:25 UTC (rev 590) +++ trunk/tutti-persistence/pom.xml 2013-03-12 13:54:33 UTC (rev 591) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.0.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-03-12 13:37:25 UTC (rev 590) +++ trunk/tutti-service/pom.xml 2013-03-12 13:54:33 UTC (rev 591) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.0.3</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-03-12 13:37:25 UTC (rev 590) +++ trunk/tutti-ui-swing/pom.xml 2013-03-12 13:54:33 UTC (rev 591) @@ -21,16 +21,14 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.0.3</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r590 - trunk
by tchemit＠users.forge.codelutin.com 12 Mar '13

12 Mar '13

Author: tchemit Date: 2013-03-12 14:37:25 +0100 (Tue, 12 Mar 2013) New Revision: 590 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/590 Log: use last stable fo jaxx Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-12 13:29:55 UTC (rev 589) +++ trunk/pom.xml 2013-03-12 13:37:25 UTC (rev 590) @@ -129,7 +129,7 @@ <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <licensePluginVersion>1.4</licensePluginVersion> - <jaxxVersion>2.5.13-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.5.13</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.7</xworkVersion>

1 0

r589 - in trunk/tutti-ui-swing/src/main: assembly java/fr/ifremer/tutti/ui/swing/util/editor
by tchemit＠users.forge.codelutin.com 12 Mar '13

12 Mar '13

Author: tchemit Date: 2013-03-12 14:29:55 +0100 (Tue, 12 Mar 2013) New Revision: 589 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/589 Log: - fix help bundle - fix vessel cell editor Modified: trunk/tutti-ui-swing/src/main/assembly/help.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java Modified: trunk/tutti-ui-swing/src/main/assembly/help.xml =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/help.xml 2013-03-12 13:21:51 UTC (rev 588) +++ trunk/tutti-ui-swing/src/main/assembly/help.xml 2013-03-12 13:29:55 UTC (rev 589) @@ -26,7 +26,7 @@ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> - <id>i18n</id> + <id>help</id> <formats> <format>zip</format> </formats> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java 2013-03-12 13:21:51 UTC (rev 588) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java 2013-03-12 13:29:55 UTC (rev 589) @@ -90,7 +90,9 @@ super(new JComboBox()); final BeanFilterableComboBox<Vessel> component = new BeanFilterableComboBox<Vessel>(); + component.setI18nPrefix("tutti.property."); component.setShowReset(true); + setClickCountToStart(1); editorComponent = component; delegate = new DefaultCellEditor.EditorDelegate() {

1 0

r588 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service
by tchemit＠users.forge.codelutin.com 12 Mar '13

12 Mar '13

Author: tchemit Date: 2013-03-12 14:21:51 +0100 (Tue, 12 Mar 2013) New Revision: 588 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/588 Log: fix import Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-03-12 13:18:01 UTC (rev 587) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-03-12 13:21:51 UTC (rev 588) @@ -55,7 +55,7 @@ import fr.ifremer.tutti.persistence.service.TuttiPersistenceServiceLocator; import fr.ifremer.tutti.service.config.TuttiServiceConfig; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;

1 0

r587 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-service/src/main/java/fr/ifremer/tutti/service tutti-service/src/main/java/fr/ifremer/tutti/service/config tutti-service/src/main/java/fr/ifremer/tutti/service/referential tutti-ui-swing/src/main/java/fr/ifremer/
by tchemit＠users.forge.codelutin.com 12 Mar '13

12 Mar '13

Author: tchemit Date: 2013-03-12 14:18:01 +0100 (Tue, 12 Mar 2013) New Revision: 587 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/587 Log: reformat code + optimize imports Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiIOUtil.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigProvider.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/AttachementObjectTypeEnum.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigProvider.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/AbstractChangeLocaleAction.java 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/catches/EditCatchesUI.jaxx 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/SampleCategoryComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx 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/util/AbstractTuttiUIHandler.java 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/VesselTableCell.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiIOUtil.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiIOUtil.java 2013-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiIOUtil.java 2013-03-12 13:18:01 UTC (rev 587) @@ -85,7 +85,8 @@ throw new TuttiTechnicalException(errorMessage, e); } } - public static void forceDeleteOnExit(File dir, String errorMessage) { + + public static void forceDeleteOnExit(File dir, String errorMessage) { try { FileUtils.forceDeleteOnExit(dir); } catch (IOException e) { Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigProvider.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigProvider.java 2013-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigProvider.java 2013-03-12 13:18:01 UTC (rev 587) @@ -24,8 +24,8 @@ * #L% */ +import org.nuiton.util.config.ApplicationConfigProvider; import org.nuiton.util.config.ConfigActionDef; -import org.nuiton.util.config.ApplicationConfigProvider; import org.nuiton.util.config.ConfigOptionDef; import java.util.Locale; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/AttachementObjectTypeEnum.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/AttachementObjectTypeEnum.java 2013-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/AttachementObjectTypeEnum.java 2013-03-12 13:18:01 UTC (rev 587) @@ -30,7 +30,7 @@ /** * Define all usable {@link ObjectType} in {@link Attachment}. - * + * <p/> * <strong>Note: </strong>This enumeration implements {@link TuttiEnumerationFile.TuttiEnumerable}, * so all values must be synched to the enumeration file and before usage we * must be invoke the {@link TuttiEnumerationFile#init()} method. Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-03-12 13:18:01 UTC (rev 587) @@ -27,7 +27,6 @@ import fr.ifremer.tutti.persistence.TuttiPersistenceServiceImplementor; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Program; -import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Country; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-03-12 13:18:01 UTC (rev 587) @@ -43,8 +43,6 @@ import org.nuiton.util.decorator.DecoratorProvider; import java.io.Serializable; -import org.apache.commons.lang3.StringUtils; -import org.nuiton.util.StringUtil; import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; @@ -197,7 +195,7 @@ Object result; if ("surveyCode".equals(token)) { result = _("tutti.propety.no.species.speciesCode"); - + } else { result = super.onNullValue(bean, token); } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigProvider.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigProvider.java 2013-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigProvider.java 2013-03-12 13:18:01 UTC (rev 587) @@ -24,8 +24,8 @@ * #L% */ +import org.nuiton.util.config.ApplicationConfigProvider; import org.nuiton.util.config.ConfigActionDef; -import org.nuiton.util.config.ApplicationConfigProvider; import org.nuiton.util.config.ConfigOptionDef; import java.util.Locale; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java 2013-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java 2013-03-12 13:18:01 UTC (rev 587) @@ -31,6 +31,7 @@ import com.google.common.collect.Sets; import com.google.common.io.Closeables; import com.google.common.io.Files; +import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.Species; @@ -38,7 +39,6 @@ import fr.ifremer.tutti.service.AbstractTuttiService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiServiceContext; -import fr.ifremer.tutti.TuttiTechnicalException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.csv.Export; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/AbstractChangeLocaleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/AbstractChangeLocaleAction.java 2013-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/AbstractChangeLocaleAction.java 2013-03-12 13:18:01 UTC (rev 587) @@ -24,8 +24,6 @@ * #L% */ -import fr.ifremer.tutti.ui.swing.TuttiScreen; - import java.util.Locale; /** @@ -34,7 +32,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0.3 */ -public abstract class AbstractChangeLocaleAction extends AbstractChangeScreenAction { +public abstract class AbstractChangeLocaleAction extends AbstractChangeScreenAction { protected AbstractChangeLocaleAction(MainUIHandler handler) { 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-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-03-12 13:18:01 UTC (rev 587) @@ -121,8 +121,8 @@ List<FishingOperation> fishingOperations = model.getFishingOperation(); initBeanComboBox(ui.getFishingOperationComboBox(), - fishingOperations, - model.getSelectedFishingOperation()); + fishingOperations, + model.getSelectedFishingOperation()); model.addPropertyChangeListener(FishingOperationsUIModel.PROPERTY_SELECTED_FISHING_OPERATION, new PropertyChangeListener() { @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-03-12 13:18:01 UTC (rev 587) @@ -138,20 +138,24 @@ <JPanel id='catchTotalSortedWeightPanel'> <JTextField id='catchTotalSortedWeightField' constraints='EditCatchesUIHandler.CLASSIC_VESSEL'/> - <Table constraints='EditCatchesUIHandler.CAROUSSEL_TREMIE_VESSEL' - fill='both'> + <Table + constraints='EditCatchesUIHandler.CAROUSSEL_TREMIE_VESSEL' + fill='both'> <row> <cell anchor='west'> - <JLabel id='catchTotalSortedCarousselWeightLabel'/> + <JLabel + id='catchTotalSortedCarousselWeightLabel'/> </cell> <cell weightx='1.0'> - <JTextField id='catchTotalSortedCarousselWeightField'/> + <JTextField + id='catchTotalSortedCarousselWeightField'/> </cell> <cell anchor='west'> <JLabel id='catchTotalSortedTremisWeightLabel'/> </cell> <cell weightx='1.0'> - <JTextField id='catchTotalSortedTremisWeightField'/> + <JTextField + id='catchTotalSortedTremisWeightField'/> </cell> </row> </Table> 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-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-03-12 13:18:01 UTC (rev 587) @@ -117,11 +117,11 @@ getParentUi().getFishingOperationTabContent().getModel() .addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_VESSEL, new PropertyChangeListener() { - public void propertyChange(PropertyChangeEvent evt) { - Vessel vessel = (Vessel) evt.getNewValue(); - selectCatchTotalSortedWeightPanel(vessel); - } - }); + public void propertyChange(PropertyChangeEvent evt) { + Vessel vessel = (Vessel) evt.getNewValue(); + selectCatchTotalSortedWeightPanel(vessel); + } + }); } @Override 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-12 13:12:49 UTC (rev 586) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategoryComponent.java 2013-03-12 13:18:01 UTC (rev 587) @@ -24,6 +24,7 @@ * #L% */ +import jaxx.runtime.JAXXUtil; import jaxx.runtime.swing.editor.NumberEditor; import org.nuiton.util.decorator.Decorator; @@ -43,7 +44,6 @@ import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import java.io.Serializable; -import jaxx.runtime.JAXXUtil; /** * To render and edit a {@link SampleCategory}. Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx 2013-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx 2013-03-12 13:18:01 UTC (rev 587) @@ -103,8 +103,8 @@ </cell> <cell weightx='1.0' columns='2'> <BeanComboBox id='sortedUnsortedCategoryComboBox' - constructorParams='this' - genericType='CaracteristicQualitativeValue'/> + constructorParams='this' + genericType='CaracteristicQualitativeValue'/> </cell> </row> 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-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-03-12 13:18:01 UTC (rev 587) @@ -108,8 +108,8 @@ persistenceService.getSortedUnsortedCaracteristic(); initBeanComboBox(ui.getSortedUnsortedCategoryComboBox(), - caracteristic.getQualitativeValue(), - null); + caracteristic.getQualitativeValue(), + null); getModel().addPropertyChangeListener(CreateSpeciesBatchUIModel.PROPERTY_SPECIES, new PropertyChangeListener() { @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-12 13:12:49 UTC (rev 586) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-03-12 13:18:01 UTC (rev 587) @@ -41,6 +41,38 @@ import fr.ifremer.tutti.ui.swing.util.action.TuttiUIAction; import fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment; import fr.ifremer.tutti.ui.swing.util.editor.SimpleTimeEditor; +import jaxx.runtime.JAXXUtil; +import jaxx.runtime.SwingUtil; +import jaxx.runtime.swing.editor.NumberEditor; +import jaxx.runtime.swing.editor.bean.BeanComboBox; +import jaxx.runtime.swing.editor.bean.BeanDoubleList; +import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; +import jaxx.runtime.validator.swing.SwingValidator; +import org.apache.commons.lang3.reflect.ConstructorUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.JXDatePicker; +import org.nuiton.util.decorator.Decorator; +import org.nuiton.util.decorator.JXPathDecorator; +import org.nuiton.validator.bean.simple.SimpleBeanValidator; + +import javax.swing.AbstractAction; +import javax.swing.AbstractButton; +import javax.swing.Action; +import javax.swing.DefaultComboBoxModel; +import javax.swing.JComponent; +import javax.swing.JDialog; +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.JOptionPane; +import javax.swing.JRootPane; +import javax.swing.JTextField; +import javax.swing.KeyStroke; +import javax.swing.ListCellRenderer; +import javax.swing.ListSelectionModel; +import javax.swing.event.ListSelectionEvent; +import javax.swing.text.JTextComponent; import java.awt.Component; import java.awt.Dialog; import java.awt.Dimension; @@ -62,37 +94,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.swing.AbstractAction; -import javax.swing.AbstractButton; -import javax.swing.Action; -import javax.swing.DefaultComboBoxModel; -import javax.swing.JComponent; -import javax.swing.JDialog; -import javax.swing.JLabel; -import javax.swing.JList; -import javax.swing.JOptionPane; -import javax.swing.JRootPane; -import javax.swing.JTextField; -import javax.swing.KeyStroke; -import javax.swing.ListCellRenderer; -import javax.swing.ListSelectionModel; -import javax.swing.event.ListSelectionEvent; -import javax.swing.text.JTextComponent; -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.editor.NumberEditor; -import jaxx.runtime.swing.editor.bean.BeanComboBox; -import jaxx.runtime.swing.editor.bean.BeanDoubleList; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; -import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; -import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.lang3.reflect.ConstructorUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.JXDatePicker; -import org.nuiton.util.decorator.Decorator; -import org.nuiton.util.decorator.JXPathDecorator; -import org.nuiton.validator.bean.simple.SimpleBeanValidator; import static org.nuiton.i18n.I18n._; @@ -397,7 +398,7 @@ } public <A extends AbstractTuttiAction> TuttiUIAction<A> createUIAction(AbstractButton abstractButton, - Class<A> actionName) { + Class<A> actionName) { try { // create logic action 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-12 13:12:49 UTC (rev 586) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java 2013-03-12 13:18:01 UTC (rev 587) @@ -216,7 +216,7 @@ dataValue = data.getComputedData(); font = TuttiUI.TEXTFIELD_COMPUTED_FONT; foreground = computedDataColor; - + if (useFloat && decimalNumber != null && dataValue != null) { text = JAXXUtil.getStringValue( String.format("%." + decimalNumber + "f", dataValue)); @@ -229,7 +229,7 @@ foreground = Color.BLACK; text = JAXXUtil.getStringValue(dataValue); } - + Component component = delegate.getTableCellRendererComponent(table, text, isSelected, Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java 2013-03-12 13:12:49 UTC (rev 586) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java 2013-03-12 13:18:01 UTC (rev 587) @@ -30,12 +30,10 @@ import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; -import java.awt.Component; -import java.awt.event.ActionEvent; -import java.awt.event.MouseEvent; -import java.util.EventObject; -import java.util.List; -import java.util.Map; +import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.util.decorator.Decorator; +import org.nuiton.util.decorator.JXPathDecorator; + import javax.swing.DefaultCellEditor; import javax.swing.DefaultListCellRenderer; import javax.swing.JComboBox; @@ -44,18 +42,23 @@ import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; -import org.nuiton.util.decorator.Decorator; -import org.nuiton.util.decorator.JXPathDecorator; +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.awt.event.MouseEvent; +import java.util.EventObject; +import java.util.List; +import java.util.Map; /** - * * @author kmorin <kmorin(a)codelutin.com> + * @since 1.0.3 */ public class VesselTableCell { protected Decorator<Vessel> decorator; + protected List<Vessel> vessels; + protected Map<String, Vessel> vesselMap; public VesselTableCell(TuttiUIContext context) { @@ -81,6 +84,8 @@ protected class VesselTableCellEditor extends DefaultCellEditor { + private static final long serialVersionUID = 1L; + protected VesselTableCellEditor() { super(new JComboBox()); @@ -89,10 +94,12 @@ editorComponent = component; delegate = new DefaultCellEditor.EditorDelegate() { + private static final long serialVersionUID = 1L; + @Override public void setValue(Object value) { if (value != null && String.class.isInstance(value)) { - value = vesselMap.get((String) value); + value = vesselMap.get(value); } component.setSelectedItem(value); } @@ -135,6 +142,8 @@ class VesselListCellRenderer extends DefaultListCellRenderer { + private static final long serialVersionUID = 1L; + @Override public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { return super.getListCellRendererComponent(list, decorator.toString(value), index, isSelected, cellHasFocus); @@ -144,10 +153,12 @@ protected class VesselTableCellRenderer extends DefaultTableCellRenderer { + private static final long serialVersionUID = 1L; + @Override public Component getTableCellRendererComponent(JTable table, Object value, - boolean isSelected, boolean hasFocus, - int row, int column) { + boolean isSelected, boolean hasFocus, + int row, int column) { String vesselId = String.valueOf(value); Vessel vessel = vesselMap.get(vesselId);

1 0

r586 - in trunk: tutti-service/src/main/java/fr/ifremer/tutti/service tutti-service/src/main/resources/i18n tutti-ui-swing/src/main/filtered-resources tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action tutti-ui-swing/src/main/java/fr/ifreme
by tchemit＠users.forge.codelutin.com 12 Mar '13

12 Mar '13

Author: tchemit Date: 2013-03-12 14:12:49 +0100 (Tue, 12 Mar 2013) New Revision: 586 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/586 Log: - add long action to reload application - improve change locale action - fix reloading application code - add missing svn properties + license headers Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/AbstractChangeLocaleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ReloadTuttiAction.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.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/ChangeToLocaleFRAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ChangeToLocaleUKAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.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/action/TuttiActionUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUI.jaxx 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/editor/VesselTableCell.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-03-12 10:35:17 UTC (rev 585) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-03-12 13:12:49 UTC (rev 586) @@ -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-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-03-12 10:35:17 UTC (rev 585) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-03-12 13:12:49 UTC (rev 586) @@ -40,6 +40,7 @@ tutti.property.zone= tutti.property.zoneLabel= tutti.propety.no.species.refTaxCode= +tutti.propety.no.species.speciesCode= tutti.propety.no.species.surveyCode= tutti.propety.no.vessel.name= tutti.propety.no.zone= Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-03-12 10:35:17 UTC (rev 585) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-03-12 13:12:49 UTC (rev 586) @@ -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% +### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo #Tue Mar 12 10:47:25 CET 2013 tuttihelp.createSpeciesBatch.action.addSpecies.help= Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-03-12 10:35:17 UTC (rev 585) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-03-12 13:12:49 UTC (rev 586) @@ -623,6 +623,7 @@ cruiseId = null; protocolId = null; validationContext = null; + IOUtils.closeQuietly(dataContext); setScreen(null); 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-12 10:35:17 UTC (rev 585) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java 2013-03-12 13:12:49 UTC (rev 586) @@ -27,6 +27,9 @@ import fr.ifremer.tutti.service.config.TuttiServiceConfigOption; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.MainUI; +import fr.ifremer.tutti.ui.swing.content.MainUIHandler; +import fr.ifremer.tutti.ui.swing.content.ReloadTuttiAction; +import fr.ifremer.tutti.ui.swing.util.action.TuttiUIAction; import fr.ifremer.tutti.ui.swing.util.editor.VesselTableCell; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.config.ConfigUI; @@ -143,13 +146,17 @@ ConfigUI configUI = helper.buildUI( mainUI, n_("tutti.config.category.applications")); - + helper.displayUI(mainUI, false); mainUI.getHandler().getContext().getSwingSession().add(configUI); } protected void reloadApplication() { - mainUI.getHandler().reloadTutti(); + MainUIHandler handler = mainUI.getHandler(); + + TuttiUIAction<ReloadTuttiAction> action = + handler.createUIAction(null, ReloadTuttiAction.class); + action.actionPerformed(null); } protected void reloadUI() { Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/AbstractChangeLocaleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/AbstractChangeLocaleAction.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/AbstractChangeLocaleAction.java 2013-03-12 13:12:49 UTC (rev 586) @@ -0,0 +1,51 @@ +package fr.ifremer.tutti.ui.swing.content; + +/* + * #%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.TuttiScreen; + +import java.util.Locale; + +/** + * TODO + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.0.3 + */ +public abstract class AbstractChangeLocaleAction extends AbstractChangeScreenAction { + + + protected AbstractChangeLocaleAction(MainUIHandler handler) { + super(handler, true, null); + } + + protected abstract Locale getLocale(); + + @Override + protected void doAction() throws Exception { + + getHandler().changeLocale(getLocale()); + } +} Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/AbstractChangeLocaleAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ChangeToLocaleFRAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ChangeToLocaleFRAction.java 2013-03-12 10:35:17 UTC (rev 585) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ChangeToLocaleFRAction.java 2013-03-12 13:12:49 UTC (rev 586) @@ -30,16 +30,15 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0.3 */ -public class ChangeToLocaleFRAction extends AbstractMainUITuttiAction { +public class ChangeToLocaleFRAction extends AbstractChangeLocaleAction { public ChangeToLocaleFRAction(MainUIHandler handler) { - super(handler, true); + super(handler); } @Override - protected void doAction() throws Exception { - - getHandler().changeLocale(Locale.FRANCE); + protected Locale getLocale() { + return Locale.FRANCE; } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ChangeToLocaleUKAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ChangeToLocaleUKAction.java 2013-03-12 10:35:17 UTC (rev 585) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ChangeToLocaleUKAction.java 2013-03-12 13:12:49 UTC (rev 586) @@ -30,16 +30,14 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0.3 */ -public class ChangeToLocaleUKAction extends AbstractMainUITuttiAction { +public class ChangeToLocaleUKAction extends AbstractChangeLocaleAction { public ChangeToLocaleUKAction(MainUIHandler handler) { - super(handler, true); + super(handler); } @Override - protected void doAction() throws Exception { - - getHandler().changeLocale(Locale.UK); + protected Locale getLocale() { + return Locale.UK; } - } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-03-12 10:35:17 UTC (rev 585) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-03-12 13:12:49 UTC (rev 586) @@ -202,7 +202,6 @@ // go to manage db screen (to install db) context.setScreen(TuttiScreen.MANAGE_DB); } - } } @@ -228,14 +227,6 @@ //-- Public methods --// //------------------------------------------------------------------------// - public void reloadTutti() { - - // Close the application - RunTutti.closeTutti(ui, false); - - RunTutti.startTutti(context, true); - } - public void reloadUI() { //close ui Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ReloadTuttiAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ReloadTuttiAction.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ReloadTuttiAction.java 2013-03-12 13:12:49 UTC (rev 586) @@ -0,0 +1,54 @@ +package fr.ifremer.tutti.ui.swing.content; + +/* + * #%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.RunTutti; + +import static org.nuiton.i18n.I18n._; + +/** + * To reload Tutti application. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.0.3 + */ +public class ReloadTuttiAction extends AbstractChangeScreenAction { + + public ReloadTuttiAction(MainUIHandler handler) { + super(handler, true, null); + setActionDescription(_("tutti.action.reloadTutti")); + } + + @Override + protected void doAction() throws Exception { + + // Close the application + RunTutti.closeTutti(getUI(), false); + + // Restart + RunTutti.startTutti(getContext(), true); + } + +} \ No newline at end of file Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ReloadTuttiAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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-12 10:35:17 UTC (rev 585) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-03-12 13:12:49 UTC (rev 586) @@ -396,7 +396,7 @@ abstractButton.setAction(action); } - protected <A extends AbstractTuttiAction> TuttiUIAction<A> createUIAction(AbstractButton abstractButton, + public <A extends AbstractTuttiAction> TuttiUIAction<A> createUIAction(AbstractButton abstractButton, Class<A> actionName) { try { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUI.css 2013-03-12 10:35:17 UTC (rev 585) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUI.css 2013-03-12 13:12:49 UTC (rev 586) @@ -21,6 +21,13 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ + +#busyBlockLayerUI { + useIcon:false; + blockingColor: {handler.getConfig().getColorBlockingLayer()}; + block:{true}; +} + #globalPanel { border: {new TitledBorder((String) null)}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUI.jaxx 2013-03-12 10:35:17 UTC (rev 585) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUI.jaxx 2013-03-12 13:12:49 UTC (rev 586) @@ -21,7 +21,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JDialog layout='{new BorderLayout()}' width='300' height='200' modal='true' +<JDialog width='300' height='200' modal='true' undecorated='true' implements='fr.ifremer.tutti.ui.swing.util.TuttiUI<TuttiActionUIModel, TuttiActionUIHandler>'> <import> @@ -29,6 +29,8 @@ fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.TuttiUIContext + jaxx.runtime.swing.BlockingLayerUI + javax.swing.border.EmptyBorder static org.nuiton.i18n.I18n._ @@ -56,23 +58,29 @@ } ]]></script> + + <BlockingLayerUI id='busyBlockLayerUI'/> + <TuttiActionUIHandler id='handler' initializer='getContextValue(TuttiActionUIHandler.class)'/> <TuttiActionUIModel id='model' initializer='getContextValue(TuttiActionUIModel.class)'/> + <JPanel id='rootPanel' layout='{new BorderLayout()}' + constraints='BorderLayout.CENTER' decorator='boxed'> + <JPanel id='globalPanel' constraints='BorderLayout.NORTH' + layout='{new BorderLayout()}'> + <JLabel id='globalActionLabel' constraints='BorderLayout.CENTER'/> + <JProgressBar id='globalProgressBar' constraints='BorderLayout.SOUTH'/> + </JPanel> + <JPanel id='taskPanel' constraints='BorderLayout.CENTER' + layout='{new BorderLayout()}'> + <JLabel id='taskActionLabel' constraints='BorderLayout.CENTER'/> + <JProgressBar id='taskProgressBar' constraints='BorderLayout.SOUTH'/> + </JPanel> + </JPanel> - <JPanel id='globalPanel' constraints='BorderLayout.NORTH' - layout='{new BorderLayout()}'> - <JLabel id='globalActionLabel' constraints='BorderLayout.CENTER'/> - <JProgressBar id='globalProgressBar' constraints='BorderLayout.SOUTH'/> - </JPanel> - <JPanel id='taskPanel' constraints='BorderLayout.CENTER' - layout='{new BorderLayout()}'> - <JLabel id='taskActionLabel' constraints='BorderLayout.CENTER'/> - <JProgressBar id='taskProgressBar' constraints='BorderLayout.SOUTH'/> - </JPanel> <!--JPanel id='informationPanel' constraints='BorderLayout.SOUTH' layout='{new BorderLayout()}'> <JLabel id='informationLabel' constraints='BorderLayout.CENTER'/> 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-12 10:35:17 UTC (rev 585) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-03-12 13:12:49 UTC (rev 586) @@ -28,6 +28,7 @@ import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.MainUI; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; +import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -173,6 +174,9 @@ initUI(ui); + // installation layer de blocage en mode busy + SwingUtil.setLayerUI(ui.getRootPanel(), ui.getBusyBlockLayerUI()); + ui.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java 2013-03-12 10:35:17 UTC (rev 585) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java 2013-03-12 13:12:49 UTC (rev 586) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.editor; +/* + * #%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 com.google.common.base.Function; import com.google.common.collect.Lists; import com.google.common.collect.Maps; Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-03-12 10:35:17 UTC (rev 585) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-03-12 13:12:49 UTC (rev 586) @@ -82,6 +82,7 @@ tutti.action.reload.actions= tutti.action.reload.application= tutti.action.reload.ui= +tutti.action.reloadTutti= tutti.action.removeCaracteristic= tutti.action.removeSpeciesBatch= tutti.action.removeSpeciesSubBatch= 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-12 10:35:17 UTC (rev 585) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-03-12 13:12:49 UTC (rev 586) @@ -89,6 +89,7 @@ tutti.action.reload.actions=Recharger les actions tutti.action.reload.application=Recharger l'application tutti.action.reload.ui=Recharger l'interface graphique +tutti.action.reloadTutti=Redémarrer Tutti tutti.action.removeCaracteristic=Supprimer la caractéristique tutti.action.removeSpeciesBatch=Supprimer le lot tutti.action.removeSpeciesProtocol=Supprimer l'espèce

1 0