- Coser-commits - mailman.cloud.codelutin.com

r1055 - in trunk/coser-ui/src/main: java/fr/ifremer/coser/ui/selection resources/i18n
by echatellier＠users.forge.codelutin.com 20 Aug '12

20 Aug '12

Author: echatellier Date: 2012-08-20 11:41:28 +0200 (Mon, 20 Aug 2012) New Revision: 1055 Url: http://forge.codelutin.com/repositories/revision/coser/1055 Log: Adapter les labels lors d'un simple renommage. Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SpeciesFusionDialog.jaxx trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2012-08-20 09:12:36 UTC (rev 1054) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2012-08-20 09:41:28 UTC (rev 1055) @@ -772,6 +772,13 @@ // init selected element String firstSelected = (String)view.getFilteredSpeciesList().getSelectedValue(); speciesFusionDialog.getSpeciesCombo().setSelectedItem(firstSelected); + + Object[] selectedValues = view.getFilteredSpeciesList().getSelectedValues(); + if (selectedValues.length == 1) { + speciesFusionDialog.setTitle(_("coser.ui.selection.fusion.rename.title")); + } else { + speciesFusionDialog.setTitle(_("coser.ui.selection.fusion.title")); + } speciesFusionDialog.setLocationRelativeTo(view); speciesFusionDialog.setVisible(true); @@ -1065,8 +1072,13 @@ // supprime la selection apres fusion (demande utilisateur) parent.getFilteredSpeciesListSelectionModel().clearSelection(); - JOptionPane.showMessageDialog(view, _("coser.ui.selection.speciesMerged"), - _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); + if (speciesCodes.length == 1) { + JOptionPane.showMessageDialog(view, _("coser.ui.selection.speciesRenamed"), + _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); + } else { + JOptionPane.showMessageDialog(view, _("coser.ui.selection.speciesMerged"), + _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); + } } catch (CoserBusinessException ex) { JOptionPane.showMessageDialog(view, ex.getMessage(), Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SpeciesFusionDialog.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SpeciesFusionDialog.jaxx 2012-08-20 09:12:36 UTC (rev 1054) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SpeciesFusionDialog.jaxx 2012-08-20 09:41:28 UTC (rev 1055) @@ -22,7 +22,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JDialog title="coser.ui.selection.fusion.title" modal="true"> +<JDialog modal="true"> <SelectionHandler id="handler" javaBean="null" /> <Table> <row> Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2012-08-20 09:12:36 UTC (rev 1054) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2012-08-20 09:41:28 UTC (rev 1055) @@ -207,7 +207,7 @@ coser.ui.selection.details.displayDiffCatchLengthGraph=Comparison catch/length graphs coser.ui.selection.details.displayDiffCatchLengthGraphTip=Comparison catch/length graphs coser.ui.selection.details.filteredSpecies=Filtered species (%d/%d) \: -coser.ui.selection.details.mergeSpeciesTip=Merge +coser.ui.selection.details.mergeSpeciesTip=Merge/Rename coser.ui.selection.details.name=Selection name \: coser.ui.selection.details.removeFromSelectedListTip=Remove selected species from selected species list coser.ui.selection.details.saveSelection=Save selection @@ -232,8 +232,9 @@ coser.ui.selection.filter.occurrence=Occurrence \: coser.ui.selection.filter.occurrenceunit=% coser.ui.selection.fusion.comment=Comment \: -coser.ui.selection.fusion.description=Species merge. Fill new species name with name existing in referential. +coser.ui.selection.fusion.description=Fill new species name with name existing in referential. coser.ui.selection.fusion.name=New name \: +coser.ui.selection.fusion.rename.title=Rename coser.ui.selection.fusion.title=Merge coser.ui.selection.maturitySpecies=L4 \: Species with maturity (%d/%d) coser.ui.selection.nonJustifiedMaturity=Maturity species list is not all selected.\nYou must justify this selection with a comment. @@ -269,6 +270,7 @@ coser.ui.selection.sizeAllYearSpecies=L3 \: Species with size all year (%d/%d) coser.ui.selection.speciesMenuFusion=Merge coser.ui.selection.speciesMerged=Species merged. +coser.ui.selection.speciesRenamed=Species renamed. coser.ui.selection.tab.details=Selection details coser.ui.selection.tab.lists=Species lists coser.ui.selection.tab.rsufi=RSufi Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2012-08-20 09:12:36 UTC (rev 1054) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2012-08-20 09:41:28 UTC (rev 1055) @@ -207,7 +207,7 @@ coser.ui.selection.details.displayDiffCatchLengthGraph=Graphiques des différences captures/tailles coser.ui.selection.details.displayDiffCatchLengthGraphTip=Graphiques des différences captures/tailles coser.ui.selection.details.filteredSpecies=Espèces filtrées (%d/%d) \: -coser.ui.selection.details.mergeSpeciesTip=Fusion +coser.ui.selection.details.mergeSpeciesTip=Fusion/Renommage coser.ui.selection.details.name=Nom de la sélection \: coser.ui.selection.details.removeFromSelectedListTip=Retire les espèces sélectionnées de la liste des espèces sélectionnées coser.ui.selection.details.saveSelection=Sauvegarder la sélection @@ -232,8 +232,9 @@ coser.ui.selection.filter.occurrence=Occurence \: coser.ui.selection.filter.occurrenceunit=% coser.ui.selection.fusion.comment=Commentaire \: -coser.ui.selection.fusion.description=Fusion d'espèces. Veuillez renseigner un nouveau nom présent dans le référentiel. +coser.ui.selection.fusion.description=Veuillez renseigner un nouveau nom présent dans le référentiel. coser.ui.selection.fusion.name=Nouveau nom \: +coser.ui.selection.fusion.rename.title=Renommage coser.ui.selection.fusion.title=Fusion coser.ui.selection.maturitySpecies=L4 \: Espèces avec maturité (%d/%d) coser.ui.selection.nonJustifiedMaturity=La liste espèces avec maturité n'est pas entièrement sélectionnée.\nVous devez justifier cette sélection par un commentaire. @@ -269,6 +270,7 @@ coser.ui.selection.sizeAllYearSpecies=L3 \: Espèces avec taille pour toutes les années (%d/%d) coser.ui.selection.speciesMenuFusion=Fusion coser.ui.selection.speciesMerged=Espèces fusionnées. +coser.ui.selection.speciesRenamed=Espèce renommée. coser.ui.selection.tab.details=Détails de la sélection coser.ui.selection.tab.lists=Listes des espèces coser.ui.selection.tab.rsufi=RSufi

1 0

r1054 - trunk/coser-business/src/main/java/fr/ifremer/coser/services
by echatellier＠users.forge.codelutin.com 20 Aug '12

20 Aug '12

Author: echatellier Date: 2012-08-20 11:12:36 +0200 (Mon, 20 Aug 2012) New Revision: 1054 Url: http://forge.codelutin.com/repositories/revision/coser/1054 Log: Suppression du dossier "results" s'il n'y a plus de r?\195?\169sultats Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2012-08-20 09:06:33 UTC (rev 1053) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2012-08-20 09:12:36 UTC (rev 1054) @@ -1274,10 +1274,18 @@ File rsufiResultDirectory = new File(resultsDirectory, rsufiResult.getName()); FileUtils.deleteDirectory(rsufiResultDirectory); + List<RSufiResult> results = selection.getRsufiResults(); results.remove(rsufiResult); // this way to fire change event (do not remove) selection.setRsufiResults(results); + + // s'il n'y a plus de résultat, suppprimer le dossier + // result + File[] resultFiles = resultsDirectory.listFiles(); + if (ArrayUtils.isEmpty(resultFiles)) { + resultsDirectory.delete(); + } } catch (IOException ex) { throw new CoserBusinessException("Can't delete directory", ex); }

1 0

r1053 - trunk/src/site/rst/devel
by echatellier＠users.forge.codelutin.com 20 Aug '12

20 Aug '12

Author: echatellier Date: 2012-08-20 11:06:33 +0200 (Mon, 20 Aug 2012) New Revision: 1053 Url: http://forge.codelutin.com/repositories/revision/coser/1053 Log: Mise ?\195?\160 jour du site Modified: trunk/src/site/rst/devel/textupdate.rst Modified: trunk/src/site/rst/devel/textupdate.rst =================================================================== --- trunk/src/site/rst/devel/textupdate.rst 2012-08-17 09:04:25 UTC (rev 1052) +++ trunk/src/site/rst/devel/textupdate.rst 2012-08-20 09:06:33 UTC (rev 1053) @@ -89,7 +89,8 @@ traductions soit en adequation avec les fichiers html. Une fois les modifications effectuées, vous pouvez commiter ces modifications -sur le serveur avec votre client svn. +sur le serveur avec votre client svn. Les identifiant et mot de passe qui vous +seront demandés sont ceux de votre compte sur la forge. Mise en prod

1 0

r1052 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control
by echatellier＠users.forge.codelutin.com 17 Aug '12

17 Aug '12

Author: echatellier Date: 2012-08-17 11:04:25 +0200 (Fri, 17 Aug 2012) New Revision: 1052 Url: http://forge.codelutin.com/repositories/revision/coser/1052 Log: Fix javadoc Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalControlErrorModel.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalControlErrorModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalControlErrorModel.java 2012-08-17 09:00:05 UTC (rev 1051) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalControlErrorModel.java 2012-08-17 09:04:25 UTC (rev 1052) @@ -73,7 +73,8 @@ * Utilise une simple liste d'erreur issue du contôle pour en faire * une représentation sous forme d'arbre pour l'utilisateur. * - * @param errors errors list to render + * @param project project (to get species real names) + * @param validationErrors validation errors list to render */ protected void buildGlobalControlErrorTreeModel(Project project, List<ControlError> validationErrors) {

1 0

r1051 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui
by echatellier＠users.forge.codelutin.com 17 Aug '12

17 Aug '12

Author: echatellier Date: 2012-08-17 11:00:05 +0200 (Fri, 17 Aug 2012) New Revision: 1051 Url: http://forge.codelutin.com/repositories/revision/coser/1051 Log: Correction sur la notification de chargement d'une selection Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2012-08-17 08:11:45 UTC (rev 1050) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2012-08-17 09:00:05 UTC (rev 1051) @@ -42,6 +42,7 @@ import javax.swing.filechooser.FileFilter; import jaxx.runtime.JAXXContext; +import jaxx.runtime.JAXXUtil; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; @@ -301,8 +302,7 @@ * Ferme le projet. */ public void closeProject() { - view.setProject(null); - view.removeContextValue(Project.class); + projectLoaded(null); view.setTitle(_("coser.ui.mainview.titleempty")); showHomeView(); } @@ -310,16 +310,34 @@ /** * Do some operation when a new project is loaded into application. * - * @param project loaded project + * @param project loaded project (can be null) */ public void projectLoaded(Project project) { view.setProject(project); - view.setSelection(null); // to update freize - view.setContextValue(project); - view.setTitle(_("coser.ui.mainview.titleproject", project.getName())); + if (project != null) { + view.setContextValue(project); + view.setTitle(_("coser.ui.mainview.titleproject", project.getName())); + } else { + view.removeContextValue(Project.class); + } + selectionLoaded(null); // to update freize } /** + * Do some operation when a new selection is loaded into application. + * + * @param selection loaded selection (can be null) + */ + public void selectionLoaded(Selection selection) { + view.setSelection(selection); // to update freize + if (selection != null) { + view.setContextValue(selection); + } else { + view.removeContextValue(Selection.class); + } + } + + /** * Affiche la fenêtre de résumé d'un projet. */ public void showSummaryView() { @@ -406,7 +424,7 @@ setWaitCursor(view); try { Selection selection = projectService.initProjectSelection(project); - view.setContextValue(selection); + selectionLoaded(selection); SelectionView selectionView = new SelectionView(view); selectionView.setSelection(selection); @@ -476,8 +494,7 @@ setWaitCursor(view); try { - view.setSelection(selection); // for freize - view.setContextValue(selection); + selectionLoaded(selection); SelectionView selectionView = new SelectionView(view); selectionView.setSelection(selection);

1 0

r1050 - trunk
by echatellier＠users.forge.codelutin.com 17 Aug '12

17 Aug '12

Author: echatellier Date: 2012-08-17 10:11:45 +0200 (Fri, 17 Aug 2012) New Revision: 1050 Url: http://forge.codelutin.com/repositories/revision/coser/1050 Log: Update to struts 2.3.4.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-14 17:29:50 UTC (rev 1049) +++ trunk/pom.xml 2012-08-17 08:11:45 UTC (rev 1050) @@ -343,7 +343,7 @@ <jaxx.version>2.5.4</jaxx.version> <i18n.version>2.4.1</i18n.version>  - <struts.version>2.3.4</struts.version> + <struts.version>2.3.4.1</struts.version> </properties> <scm>

1 0

r1049 - in trunk: . coser-ui coser-ui/src/main/java/fr/ifremer/coser/ui coser-ui/src/main/java/fr/ifremer/coser/ui/freize coser-ui/src/main/resources/i18n coser-ui/src/main/resources/icons
by echatellier＠users.forge.codelutin.com 14 Aug '12

14 Aug '12

Author: echatellier Date: 2012-08-14 19:29:50 +0200 (Tue, 14 Aug 2012) New Revision: 1049 Url: http://forge.codelutin.com/repositories/revision/coser/1049 Log: fixes #1328: Ajouter une frise permettant de guide l'utilisateur dans le processus Added: trunk/coser-ui/src/main/resources/icons/agt_action_fail.png trunk/coser-ui/src/main/resources/icons/button_ok.png trunk/coser-ui/src/main/resources/icons/stock_lock.png Modified: trunk/coser-ui/pom.xml trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/Freize.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeHandler.java trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties trunk/pom.xml Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2012-08-14 14:45:09 UTC (rev 1048) +++ trunk/coser-ui/pom.xml 2012-08-14 17:29:50 UTC (rev 1049) @@ -77,6 +77,10 @@ <artifactId>jaxx-validator</artifactId> </dependency> <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets</artifactId> + </dependency> + <dependency> <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-core</artifactId> </dependency> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2012-08-14 14:45:09 UTC (rev 1048) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2012-08-14 17:29:50 UTC (rev 1049) @@ -314,6 +314,7 @@ */ public void projectLoaded(Project project) { view.setProject(project); + view.setSelection(null); // to update freize view.setContextValue(project); view.setTitle(_("coser.ui.mainview.titleproject", project.getName())); } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/Freize.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/Freize.jaxx 2012-08-14 14:45:09 UTC (rev 1048) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/Freize.jaxx 2012-08-14 17:29:50 UTC (rev 1049) @@ -22,7 +22,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JPanel layout="{new GridLayout(0, 4)}" +<JPanel layout="{new GridLayout(0, 5)}" border="{BorderFactory.createLineBorder(Color.BLACK)}"> <import> @@ -36,66 +36,79 @@ <Table id="step0Panel" border="{BorderFactory.createEtchedBorder()}"> <row> - <cell weightx="1"> + <cell columns="2"> <JLabel text="coser.ui.freize.projectstep" font-weight="bold" /> </cell> - <cell rows="2"> - <JLabel id="step0Icon" icon="button_ok.png" /> - </cell> </row> <row> - <cell> - <JButton text='coser.ui.freize.projectaction' + <cell weightx="1" anchor="center"> + <JButton text='coser.ui.freize.projectcreate' onActionPerformed="getParentContainer(CoserFrame.class).getHandler().showProjectCreationView()"/> </cell> + <cell weightx="1" anchor="center"> + <JButton text='coser.ui.freize.projectopen' + onActionPerformed="getParentContainer(CoserFrame.class).getHandler().showProjectOpenView()"/> + </cell> </row> </Table> <Table id="step1Panel" border="{BorderFactory.createEtchedBorder()}" decorator="boxed"> <row> - <cell weightx="1"> - <JLabel text="coser.ui.freize.controlstep" enabled="{model.isStep1Enabled()}" /> + <cell columns="2"> + <JLabel text="coser.ui.freize.controlstep" enabled="{model.isStep1Enabled()}" font-weight="bold" /> </cell> - <cell rows="2"> - <JLabel id="step1Icon" icon="stock_lock.png" enabled="{model.isStep1Enabled()}" /> - </cell> </row> <row> - <cell> + <cell weightx="1" anchor="center"> <JButton text='coser.ui.freize.controlaction' enabled="{model.isStep1Enabled()}" onActionPerformed="getParentContainer(CoserFrame.class).getHandler().showControlView()"/> </cell> + <cell weightx="2" anchor="center"> + <JLabel id="controlStatus" enabled="{model.isStep1Enabled()}" /> + </cell> </row> </Table> - + <Table id="step2Panel" border="{BorderFactory.createEtchedBorder()}" decorator="boxed"> <row> - <cell weightx="1"> - <JLabel text="coser.ui.freize.selectionstep" enabled="{model.isStep2Enabled()}" /> + <cell columns="2"> + <JLabel text="coser.ui.freize.selectionstep" enabled="{model.isStep2Enabled()}" font-weight="bold" /> </cell> - <cell rows="2"> - <JLabel id="step2Icon" icon="agt_action_fail.png" enabled="{model.isStep2Enabled()}" /> - </cell> </row> <row> - <cell> - <JButton text='coser.ui.freize.selectionaction' enabled="{model.isStep2Enabled()}" - onActionPerformed="getParentContainer(CoserFrame.class).getHandler().showSelectionView(model.getSelection(), 0)"/> + <cell weightx="2" anchor="center"> + <JButton text='coser.ui.freize.selectionaction' + enabled="{model.isStep2Enabled()}" + onMousePressed="getHandler().showSelectionDropDownMenu(this, event)"/> </cell> + <cell weightx="2" anchor="center"> + <JLabel id="selectionStatus" enabled="{model.isStep2Enabled()}" /> + </cell> </row> </Table> - + <Table id="step3Panel" border="{BorderFactory.createEtchedBorder()}" decorator="boxed"> <row> <cell weightx="1"> - <JLabel text="coser.ui.freize.resultstep" enabled="{model.isStep3Enabled()}" /> + <JLabel text="coser.ui.freize.rsufistep" enabled="{model.isStep3Enabled()}" font-weight="bold" /> </cell> - <cell rows="2"> - <JLabel id="step3Icon" icon="agt_action_fail.png" enabled="{model.isStep3Enabled()}" /> + </row> + <row> + <cell> + <JButton text='coser.ui.freize.rsufiaction' enabled="{model.isStep3Enabled()}" + onActionPerformed="getParentContainer(CoserFrame.class).getHandler().showSelectionView(model.getSelection(), 2)"/> </cell> </row> + </Table> + + <Table id="step4Panel" border="{BorderFactory.createEtchedBorder()}" decorator="boxed"> <row> <cell> + <JLabel text="coser.ui.freize.resultstep" enabled="{model.isStep3Enabled()}" font-weight="bold" /> + </cell> + </row> + <row> + <cell weightx="1"> <JButton text='coser.ui.freize.resultaction' enabled="{model.isStep3Enabled()}" onActionPerformed="getParentContainer(CoserFrame.class).getHandler().showSelectionView(model.getSelection(), 2)"/> </cell> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeHandler.java 2012-08-14 14:45:09 UTC (rev 1048) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeHandler.java 2012-08-14 17:29:50 UTC (rev 1049) @@ -22,18 +22,25 @@ */ package fr.ifremer.coser.ui.freize; +import static org.nuiton.i18n.I18n._; + import java.awt.Color; +import java.awt.Component; +import java.awt.event.MouseEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import javax.swing.Icon; import javax.swing.ImageIcon; +import javax.swing.JPopupMenu; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.bean.Selection; +import fr.ifremer.coser.ui.CoserFrame; +import fr.ifremer.coser.ui.SelectionsListMenu; /** @@ -100,39 +107,79 @@ view.getStep0Panel().setBackground(DISABLED_COLOR); view.getStep1Panel().setBackground(DISABLED_COLOR); view.getStep2Panel().setBackground(DISABLED_COLOR); - view.getStep0Icon().setIcon(BAD_ICON); - view.getStep1Icon().setIcon(BAD_ICON); - view.getStep2Icon().setIcon(BAD_ICON); + view.getStep3Panel().setBackground(DISABLED_COLOR); + view.getStep4Panel().setBackground(DISABLED_COLOR); Project project = model.getProject(); + // step 0 if (project != null) { - view.getStep0Icon().setIcon(OK_ICON); view.getStep0Panel().setBackground(COMPLETE_COLOR); + + // step 1 model.setStep1Enabled(true); - if (project.getControl().isValidated()) { view.getStep1Panel().setBackground(COMPLETE_COLOR); + + // step 2 model.setStep2Enabled(true); if (!project.getSelections().isEmpty()) { - view.getStep1Icon().setIcon(LOCKED_ICON); + view.getControlStatus().setText(_("coser.ui.freize.locked")); + view.getControlStatus().setToolTipText(_("coser.ui.freize.controllockedtip")); + view.getControlStatus().setIcon(LOCKED_ICON); } else { - view.getStep1Icon().setIcon(OK_ICON); + view.getControlStatus().setText(_("coser.ui.freize.validated")); + view.getControlStatus().setIcon(OK_ICON); } Selection selection = model.getSelection(); if (selection != null && selection.isValidated()) { - view.getStep2Icon().setIcon(OK_ICON); + view.getSelectionStatus().setIcon(OK_ICON); + view.getSelectionStatus().setText(_("coser.ui.freize.validated")); view.getStep2Panel().setBackground(COMPLETE_COLOR); + + // step 3 model.setStep3Enabled(true); + view.getStep3Panel().setBackground(COMPLETE_COLOR); + + // step 4 + if (selection.getRsufiResults().isEmpty()) { + view.getStep4Panel().setBackground(PENDING_COLOR); + } else { + view.getStep4Panel().setBackground(COMPLETE_COLOR); + } + } else { view.getStep2Panel().setBackground(PENDING_COLOR); + view.getSelectionStatus().setIcon(BAD_ICON); + view.getSelectionStatus().setText(_("coser.ui.freize.unvalidated")); } } else { view.getStep1Panel().setBackground(PENDING_COLOR); + view.getControlStatus().setIcon(BAD_ICON); + view.getControlStatus().setText(_("coser.ui.freize.unvalidated")); } } else { view.getStep0Panel().setBackground(PENDING_COLOR); - view.getStep0Icon().setIcon(BAD_ICON); } - } + } + + /** + * Affiche en popup l'equivalent du menu "Données" > "Selection". + * + * @param view view + */ + public void showSelectionDropDownMenu(Freize view, MouseEvent event) { + JPopupMenu menu = new JPopupMenu(); + + SelectionsListMenu oldMenu = new SelectionsListMenu(view.getParentContainer(CoserFrame.class)); + oldMenu.setProject(view.getModel().getProject()); + + // lorsqu'on ajoute un element a menu, il est supprimé + // de oldMenu, donc le parcourt doit se faire en sens inverse + for (int i = oldMenu.getItemCount() - 1; i >= 0; i--) { + menu.insert(oldMenu.getMenuComponent(i), 0); + } + + menu.show((Component)event.getSource(), event.getX(), event.getY()); + } } Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2012-08-14 14:45:09 UTC (rev 1048) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2012-08-14 17:29:50 UTC (rev 1049) @@ -61,14 +61,21 @@ coser.ui.error.htmlmessage=An error occurred \: %s coser.ui.error.reportSendTo=A report has been sent to %s coser.ui.error.title=Global application error -coser.ui.freize.controlaction= -coser.ui.freize.controlstep= -coser.ui.freize.projectaction= -coser.ui.freize.projectstep= -coser.ui.freize.resultaction= -coser.ui.freize.resultstep= -coser.ui.freize.selectionaction= -coser.ui.freize.selectionstep= +coser.ui.freize.controlaction=Control +coser.ui.freize.controllockedtip=Control locked because selection exists \! +coser.ui.freize.controlstep=2/4 Control +coser.ui.freize.locked=Locked +coser.ui.freize.projectcreate=Create +coser.ui.freize.projectopen=Open +coser.ui.freize.projectstep=1/4 Project +coser.ui.freize.resultaction=Add result +coser.ui.freize.resultstep=5/5 Result +coser.ui.freize.rsufiaction=RSufi export +coser.ui.freize.rsufistep=4/5 RSUfi +coser.ui.freize.selectionaction=Selection ► +coser.ui.freize.selectionstep=3/4 Selection +coser.ui.freize.unvalidated=Not validated +coser.ui.freize.validated=Validated coser.ui.graph.compareNumberCatchLength=Comparison Catch/Length coser.ui.graph.compareNumberCatchLengthTip=Display catch and length number comparison graphs (data are generated only during error check) coser.ui.graph.lengthStructure=Length structure Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2012-08-14 14:45:09 UTC (rev 1048) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2012-08-14 17:29:50 UTC (rev 1049) @@ -62,13 +62,20 @@ coser.ui.error.reportSendTo=Un rapport a été envoyé à %s coser.ui.error.title=Erreur globale coser.ui.freize.controlaction=Contrôle -coser.ui.freize.controlstep=2/4 \: Contrôle -coser.ui.freize.projectaction=Créer -coser.ui.freize.projectstep=1/4 \: Création +coser.ui.freize.controllockedtip=Contrôle vérrouillé car sélections existantes \! +coser.ui.freize.controlstep=2/5 \: Contrôle +coser.ui.freize.locked=Vérrouillé +coser.ui.freize.projectcreate=Créer +coser.ui.freize.projectopen=Ouvrir +coser.ui.freize.projectstep=1/5 \: Création coser.ui.freize.resultaction=Ajouter un résultat -coser.ui.freize.resultstep=4/4 \: Résultats -coser.ui.freize.selectionaction=Sélection -coser.ui.freize.selectionstep=3/4 \: Sélection +coser.ui.freize.resultstep=5/5 \: Résultats +coser.ui.freize.rsufiaction=Export RSUfi +coser.ui.freize.rsufistep=4/5 RSUfi +coser.ui.freize.selectionaction=Sélection ► +coser.ui.freize.selectionstep=3/5 \: Sélection +coser.ui.freize.unvalidated=Non validé +coser.ui.freize.validated=Validé coser.ui.graph.compareNumberCatchLength=Comparaison Captures/Tailles coser.ui.graph.compareNumberCatchLengthTip=Affiche les graphiques de comparaison des nombres entre les captures et les tailles (Les données sont générées uniquement lors de la vérification des erreurs) coser.ui.graph.lengthStructure=Structures en taille Added: trunk/coser-ui/src/main/resources/icons/agt_action_fail.png =================================================================== (Binary files differ) Property changes on: trunk/coser-ui/src/main/resources/icons/agt_action_fail.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: trunk/coser-ui/src/main/resources/icons/button_ok.png =================================================================== (Binary files differ) Property changes on: trunk/coser-ui/src/main/resources/icons/button_ok.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: trunk/coser-ui/src/main/resources/icons/stock_lock.png =================================================================== (Binary files differ) Property changes on: trunk/coser-ui/src/main/resources/icons/stock_lock.png ___________________________________________________________________ Added: svn:mime-type + image/png Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-14 14:45:09 UTC (rev 1048) +++ trunk/pom.xml 2012-08-14 17:29:50 UTC (rev 1049) @@ -155,6 +155,13 @@ <version>${jaxx.version}</version> <scope>compile</scope> </dependency> + + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets</artifactId> + <version>${jaxx.version}</version> + <scope>runtime</scope> + </dependency> <dependency> <groupId>org.swinglabs.swingx</groupId>

1 0

r1048 - in trunk: . coser-business/src/license coser-ui coser-ui/src/license coser-ui/src/main/java/fr/ifremer/coser/ui/freize coser-web/src/license
by echatellier＠users.forge.codelutin.com 14 Aug '12

14 Aug '12

Author: echatellier Date: 2012-08-14 16:45:09 +0200 (Tue, 14 Aug 2012) New Revision: 1048 Url: http://forge.codelutin.com/repositories/revision/coser/1048 Log: Update header, third party, dependencies Modified: trunk/coser-business/src/license/THIRD-PARTY.properties trunk/coser-ui/pom.xml trunk/coser-ui/src/license/THIRD-PARTY.properties trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeModel.java trunk/coser-web/src/license/THIRD-PARTY.properties trunk/pom.xml Modified: trunk/coser-business/src/license/THIRD-PARTY.properties =================================================================== --- trunk/coser-business/src/license/THIRD-PARTY.properties 2012-08-14 14:16:17 UTC (rev 1047) +++ trunk/coser-business/src/license/THIRD-PARTY.properties 2012-08-14 14:45:09 UTC (rev 1048) @@ -22,9 +22,6 @@ # Please fill the missing licenses for dependencies : # # -#Tue Jan 10 11:54:42 CET 2012 -asm--asm--3.1=Copyright (c) 2000-2011 INRIA, France Telecom -asm--asm-commons--3.1=Copyright (c) 2000-2011 INRIA, France Telecom -asm--asm-tree--3.1=Copyright (c) 2000-2011 INRIA, France Telecom +#Tue Aug 14 16:22:07 CEST 2012 commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0 javassist--javassist--3.8.0.GA=GNU Lesser General Public License Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2012-08-14 14:16:17 UTC (rev 1047) +++ trunk/coser-ui/pom.xml 2012-08-14 14:45:09 UTC (rev 1048) @@ -41,10 +41,6 @@ <artifactId>nuiton-utils</artifactId> </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - </dependency> - <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> @@ -81,10 +77,6 @@ <artifactId>jaxx-validator</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-widgets</artifactId> - </dependency> - <dependency> <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-core</artifactId> </dependency> Modified: trunk/coser-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/coser-ui/src/license/THIRD-PARTY.properties 2012-08-14 14:16:17 UTC (rev 1047) +++ trunk/coser-ui/src/license/THIRD-PARTY.properties 2012-08-14 14:45:09 UTC (rev 1048) @@ -9,7 +9,6 @@ # - Bouncy Castle License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 -# - Copyright (c) 2000-2011 INRIA, France Telecom # - GNU General Public License - Version 2 with the class path exception # - GNU Lesser General Public Licence # - GNU Lesser General Public License (LGPL), version 2.1 @@ -27,10 +26,7 @@ # Please fill the missing licenses for dependencies : # # -#Tue Jan 10 11:58:01 CET 2012 -asm--asm--3.1=Copyright (c) 2000-2011 INRIA, France Telecom -asm--asm-commons--3.1=Copyright (c) 2000-2011 INRIA, France Telecom -asm--asm-tree--3.1=Copyright (c) 2000-2011 INRIA, France Telecom +#Tue Aug 14 15:41:41 CEST 2012 commons-jxpath--commons-jxpath--1.3=Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0 javassist--javassist--3.8.0.GA=GNU Lesser General Public License Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeModel.java 2012-08-14 14:16:17 UTC (rev 1047) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeModel.java 2012-08-14 14:45:09 UTC (rev 1048) @@ -1,3 +1,27 @@ +/* + * #%L + * Coser :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer, Codelutin, Chatellier Eric + * %% + * 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% + */ + package fr.ifremer.coser.ui.freize; import java.beans.PropertyChangeListener; Modified: trunk/coser-web/src/license/THIRD-PARTY.properties =================================================================== --- trunk/coser-web/src/license/THIRD-PARTY.properties 2012-08-14 14:16:17 UTC (rev 1047) +++ trunk/coser-web/src/license/THIRD-PARTY.properties 2012-08-14 14:45:09 UTC (rev 1048) @@ -7,7 +7,6 @@ # - BSD-style license # - Bouncy Castle License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Copyright (c) 2000-2011 INRIA, France Telecom # - GNU Lesser General Public Licence # - GNU Lesser General Public License (LGPL), version 2.1 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 @@ -23,10 +22,7 @@ # Please fill the missing licenses for dependencies : # # -#Tue Jan 10 11:59:53 CET 2012 -asm--asm--3.1=Copyright (c) 2000-2011 INRIA, France Telecom -asm--asm-commons--3.1=Copyright (c) 2000-2011 INRIA, France Telecom -asm--asm-tree--3.1=Copyright (c) 2000-2011 INRIA, France Telecom +#Tue Aug 14 16:31:46 CEST 2012 commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0 javassist--javassist--3.8.0.GA=GNU Lesser General Public License javax.servlet--servlet-api--2.5=License Agreement for Java(TM) Servlet API Specification Interface Classes Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-14 14:16:17 UTC (rev 1047) +++ trunk/pom.xml 2012-08-14 14:45:09 UTC (rev 1048) @@ -120,12 +120,6 @@ <version>2.5.3</version> <scope>compile</scope> </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - <version>2.5.3</version> - <scope>compile</scope> - </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> @@ -161,13 +155,6 @@ <version>${jaxx.version}</version> <scope>compile</scope> </dependency> - - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-widgets</artifactId> - <version>${jaxx.version}</version> - <scope>compile</scope> - </dependency> <dependency> <groupId>org.swinglabs.swingx</groupId>

1 0

r1047 - in trunk/src/site: . en/rst/devel rst/devel
by echatellier＠users.forge.codelutin.com 14 Aug '12

14 Aug '12

Author: echatellier Date: 2012-08-14 16:16:17 +0200 (Tue, 14 Aug 2012) New Revision: 1047 Url: http://forge.codelutin.com/repositories/revision/coser/1047 Log: fixes #1334: Am?\195?\169liorer la documentation (mise ?\195?\160 jour des textes du site) Modified: trunk/src/site/en/rst/devel/textupdate.rst trunk/src/site/rst/devel/textupdate.rst trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/src/site/en/rst/devel/textupdate.rst =================================================================== --- trunk/src/site/en/rst/devel/textupdate.rst 2012-08-14 13:45:56 UTC (rev 1046) +++ trunk/src/site/en/rst/devel/textupdate.rst 2012-08-14 14:16:17 UTC (rev 1047) @@ -23,3 +23,77 @@ .. * #L% .. - + +Website text update +=================== + +This documentation shows hom to update text content of website available at: +http://www.ifremer.fr/SIH-indices-campagnes/. + +Source +------ +In order to modify source content, you have to be part of coser project developper +to be allowed to commit on repository. + +After this autorisation, sources can be retreived with a subversion client: + + * Windows : http://tortoisesvn.net/ + * Linux : command line ``svn`` + +Repository address is : http://svn.forge.codelutin.com/svn/coser/trunk + +Directory layout +---------------- +Root directory contains 3 maven modules: + + * *coser-business* : contains all business code (used by both other modules) + * *coser-ui* : swing client + * *coser-web* : website + +In order to modify website content *coser-web* module will be used. + + +coser-web module source +----------------------- +In coser-web module, two groups of files concern the modification of text content: + + * ``src/main/webapp/WEB-INF/content`` : html pages + * ``src/main/resources/fr/ifremer/coser/web`` : text translation to include in html pages + + +Indeed, in the html pages, we find this kind of code :: + + <head> + <title><s:text name="message.index.title" /></title> + </head> + +This code define a html page title, with the translation key `message.layout.title`. + +And in files ``package_en.properties`` and ``package_fr.properties`` we find +respectively:: + + message.index.title=Home + +et:: + + message.index.title=Accueil + + +Change and commit to the server +------------------------------- +You can change the formatting and content of HTML pages. +However, it is important to ensure that the contents of translation files +are in adequacy with the html. + +After making changes, you can commiting these changes +on the server with your svn client. + + +Production +---------- +The act of commiting does not mean that the production site will be updated. +Indeed, a new stable release must be prepared and installed in production. +The changes you make will only be integrated in the next production. + +However, it is possible to ask the development team to prepare +a new version if your changes were urgent. Modified: trunk/src/site/rst/devel/textupdate.rst =================================================================== --- trunk/src/site/rst/devel/textupdate.rst 2012-08-14 13:45:56 UTC (rev 1046) +++ trunk/src/site/rst/devel/textupdate.rst 2012-08-14 14:16:17 UTC (rev 1047) @@ -46,7 +46,7 @@ Le répertoire racine est constitué de 3 modules maven: * *coser-business* : contenant le code métier (tout le code utilisé par les deux - autre modules) + autres modules) * *coser-ui* : client swing * *coser-web* : site internet @@ -56,7 +56,7 @@ Source du modules coser-web --------------------------- -Dans le module coser-web, deux groupes de fichiers concerne la modification +Dans le module coser-web, deux groupes de fichiers concernent la modification du contenu textuel: * ``src/main/webapp/WEB-INF/content`` : qui contient les pages html @@ -69,7 +69,7 @@ <title><s:text name="message.index.title" /></title> </head> -Cette code défini un titre de page html, contenant la traduction de le clé +Ce code défini un titre de page html, contenant la traduction de le clé `message.layout.title`. Et dans les fichiers ``package_en.properties`` et ``package_fr.properties``, on trouve @@ -79,4 +79,25 @@ et:: - message.index.title=Accueil \ No newline at end of file + message.index.title=Accueil + + +Modification et commit sur le serveur +------------------------------------- +Il est possible de modifier la mise en forme et le contenu des pages html. +Toutefois, il est important de veiller à ce que le contenu des fichiers de +traductions soit en adequation avec les fichiers html. + +Une fois les modifications effectuées, vous pouvez commiter ces modifications +sur le serveur avec votre client svn. + + +Mise en prod +------------ +Le fait de commiter ne signifie pas que le site de production sera mis à jour. +En effet, une nouvelle version stable (release) doit être préparée et mise +en production. Les modifications que vous pourrez effectuer ne seront +intégrées que lors de la prochaine mise en production. + +Il est toutefois possible de demander à l'equipe de developpement la production +d'une nouvelle version si vos modifications se révélaient urgentes. Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-08-14 13:45:56 UTC (rev 1046) +++ trunk/src/site/site_en.xml 2012-08-14 14:16:17 UTC (rev 1047) @@ -47,8 +47,6 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="http://maven-site.forge.codelutin.com/coser/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst" name="JRst" img="http://maven-site.forge.codelutin.com/coser/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="http://maven-site.forge.codelutin.com/coser/images/restructuredtext-logo.png"/> </poweredBy> <body> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-08-14 13:45:56 UTC (rev 1046) +++ trunk/src/site/site_fr.xml 2012-08-14 14:16:17 UTC (rev 1047) @@ -47,8 +47,6 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="http://maven-site.forge.codelutin.com/coser/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst" name="JRst" img="http://maven-site.forge.codelutin.com/coser/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="http://maven-site.forge.codelutin.com/coser/images/restructuredtext-logo.png"/> </poweredBy> <body>

1 0

r1046 - trunk/coser-business/src/main/java/fr/ifremer/coser/services
by echatellier＠users.forge.codelutin.com 14 Aug '12

14 Aug '12

Author: echatellier Date: 2012-08-14 15:45:56 +0200 (Tue, 14 Aug 2012) New Revision: 1046 Url: http://forge.codelutin.com/repositories/revision/coser/1046 Log: Correction d'un bug lors de l'upload de donn?\195?\169es (les r?\195?\169sultats n'?\195?\169taient pas supprim?\195?\169s) Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2012-08-14 13:16:42 UTC (rev 1045) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2012-08-14 13:45:56 UTC (rev 1046) @@ -918,7 +918,7 @@ // return result depending on result type if ( ( indicatorResults == null || rsufiResult.isIndicatorsResult() == indicatorResults ) - && + || ( mapResults == null || rsufiResult.isMapsResult() == mapResults ) ) { String resultResultId = rsufiResult.getZone(); if (StringUtils.isNotBlank(resultResultId)) {

1 0