Author: tchemit Date: 2013-04-08 17:43:12 +0200 (Mon, 08 Apr 2013) New Revision: 753 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/753 Log: back to required level 1.6 (jaxx does not still accept 1.7) Modified: trunk/pom.xml trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategory.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java trunk/tutti-service/pom.xml 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/util/CustomTab.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-08 14:04:34 UTC (rev 752) +++ trunk/pom.xml 2013-04-08 15:43:12 UTC (rev 753) @@ -119,10 +119,10 @@ <projectId>tutti</projectId> <!-- Java version --> - <maven.compiler.source>1.7</maven.compiler.source> - <maven.compiler.target>1.7</maven.compiler.target> - <signatureArtifactId>java17</signatureArtifactId> - <signatureVersion>1.0</signatureVersion> + <!--<maven.compiler.source>1.7</maven.compiler.source>--> + <!--<maven.compiler.target>1.7</maven.compiler.target>--> + <!--<signatureArtifactId>java17</signatureArtifactId>--> + <!--<signatureVersion>1.0</signatureVersion>--> <!-- libraries version --> @@ -226,6 +226,12 @@ <classifier>tests</classifier> </dependency> + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + <version>${xworkVersion}</version> + </dependency> + <!-- librairie Jaxx --> <dependency> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategory.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategory.java 2013-04-08 14:04:34 UTC (rev 752) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategory.java 2013-04-08 15:43:12 UTC (rev 753) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.entities.data; +/* + * #%L + * Tutti :: Persistence + * $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.lang3.builder.ReflectionToStringBuilder; import java.io.Serializable; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java 2013-04-08 14:04:34 UTC (rev 752) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java 2013-04-08 15:43:12 UTC (rev 753) @@ -112,7 +112,7 @@ // Get marine litter root batch SortingBatch vracMarineLitterBatch = getMarineLitterParentBatch(catchBatch); - BatchContainer<MarineLitterBatch> result = new BatchContainer<>(); + BatchContainer<MarineLitterBatch> result = new BatchContainer<MarineLitterBatch>(); result.setId(vracMarineLitterBatch.getId()); Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-04-08 14:04:34 UTC (rev 752) +++ trunk/tutti-service/pom.xml 2013-04-08 15:43:12 UTC (rev 753) @@ -115,6 +115,16 @@ <artifactId>commons-vfs2</artifactId> </dependency> + <dependency> + <groupId>org.swinglabs.swingx</groupId> + <artifactId>swingx-common</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </dependency> + <!-- Logging --> <dependency> 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-04-08 14:04:34 UTC (rev 752) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-04-08 15:43:12 UTC (rev 753) @@ -25,8 +25,6 @@ */ import com.google.common.collect.Sets; -import fr.ifremer.tutti.persistence.entities.referential.Vessel; -import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUIModel; import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUIHandler; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler; @@ -43,8 +41,6 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JTabbedPane; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.util.Set; import static org.nuiton.i18n.I18n._; @@ -291,24 +287,18 @@ TuttiUI tuttiUi = null; JXTitledPanel titlePanel = null; String title = ""; - switch (card) { - case CREATE_BATCH_CARD: - tuttiUi = ui.getSpeciesTabCreateBatch(); - titlePanel = ui.getSpeciesTabCreateBatchReminderLabel(); - title = n_("tutti.createSpeciesBatch.title"); - - break; - case SPLIT_BATCH_CARD: - tuttiUi = ui.getSpeciesTabSplitBatch(); - titlePanel = ui.getSpeciesTabSplitBatchReminderLabel(); - title = n_("tutti.splitSpeciesBatch.title"); - - break; - case EDIT_FREQUENCY_CARD: - tuttiUi = ui.getSpeciesTabFrequencyEditor(); - titlePanel = ui.getSpeciesTabFrequencyEditorReminderLabel(); - title = n_("tutti.editSpeciesFrequencies.title"); - break; + if (CREATE_BATCH_CARD.equals(card)) { + tuttiUi = ui.getSpeciesTabCreateBatch(); + titlePanel = ui.getSpeciesTabCreateBatchReminderLabel(); + title = n_("tutti.createSpeciesBatch.title"); + } else if (SPLIT_BATCH_CARD.equals(card)) { + tuttiUi = ui.getSpeciesTabSplitBatch(); + titlePanel = ui.getSpeciesTabSplitBatchReminderLabel(); + title = n_("tutti.splitSpeciesBatch.title"); + } else if (EDIT_FREQUENCY_CARD.equals(card)) { + tuttiUi = ui.getSpeciesTabFrequencyEditor(); + titlePanel = ui.getSpeciesTabFrequencyEditorReminderLabel(); + title = n_("tutti.editSpeciesFrequencies.title"); } if (tuttiUi != null) { @@ -336,24 +326,18 @@ TuttiUI tuttiUi = null; JXTitledPanel titlePanel = null; String title = ""; - switch (card) { - case CREATE_BATCH_CARD: - tuttiUi = ui.getBenthosTabCreateBatch(); - titlePanel = ui.getBenthosTabCreateBatchReminderLabel(); - title = n_("tutti.createBenthosBatch.title"); - - break; - case SPLIT_BATCH_CARD: - tuttiUi = ui.getBenthosTabSplitBatch(); - titlePanel = ui.getBenthosTabSplitBatchReminderLabel(); - title = n_("tutti.splitBenthosBatch.title"); - - break; - case EDIT_FREQUENCY_CARD: - tuttiUi = ui.getBenthosTabFrequencyEditor(); - titlePanel = ui.getBenthosTabFrequencyEditorReminderLabel(); - title = n_("tutti.editBenthosFrequencies.title"); - break; + if (CREATE_BATCH_CARD.equals(card)) { + tuttiUi = ui.getBenthosTabCreateBatch(); + titlePanel = ui.getBenthosTabCreateBatchReminderLabel(); + title = n_("tutti.createBenthosBatch.title"); + } else if (SPLIT_BATCH_CARD.equals(card)) { + tuttiUi = ui.getBenthosTabSplitBatch(); + titlePanel = ui.getBenthosTabSplitBatchReminderLabel(); + title = n_("tutti.splitBenthosBatch.title"); + } else if (EDIT_FREQUENCY_CARD.equals(card)) { + tuttiUi = ui.getBenthosTabFrequencyEditor(); + titlePanel = ui.getBenthosTabFrequencyEditorReminderLabel(); + title = n_("tutti.editBenthosFrequencies.title"); } if (tuttiUi != null) { @@ -381,12 +365,10 @@ TuttiUI tuttiUi = null; JXTitledPanel titlePanel = null; String title = ""; - switch (card) { - case CREATE_BATCH_CARD: - tuttiUi = ui.getMarineLitterTabCreateBatch(); - titlePanel = ui.getMarineLitterTabCreateBatchReminderLabel(); - title = n_("tutti.createMarineLitterBatch.title"); - break; + if (CREATE_BATCH_CARD.equals(card)) { + tuttiUi = ui.getMarineLitterTabCreateBatch(); + titlePanel = ui.getMarineLitterTabCreateBatchReminderLabel(); + title = n_("tutti.createMarineLitterBatch.title"); } if (tuttiUi != null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/CustomTab.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/CustomTab.java 2013-04-08 14:04:34 UTC (rev 752) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/CustomTab.java 2013-04-08 15:43:12 UTC (rev 753) @@ -74,9 +74,7 @@ } }, this.model); - } catch (NoSuchMethodException - | IllegalAccessException - | InvocationTargetException ex) { + } catch (Exception ex) { log.error("Error while adding the listener to the model modifications", ex); } 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-04-08 14:04:34 UTC (rev 752) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-08 15:43:12 UTC (rev 753) @@ -1,3 +1,4 @@ +swing.error.cannot.open.file= swing.error.cannot.open.link= swing.error.desktop.browse.not.supported= swing.error.desktop.extension.not.supported=