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

r403 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection
by chatellier＠users.labs.libre-entreprise.org 14 Dec '10

14 Dec '10

Author: chatellier Date: 2010-12-14 11:01:06 +0000 (Tue, 14 Dec 2010) New Revision: 403 Log: Bouton sauver actif que lorsque L1 n'est pas vide Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-12-14 10:13:31 UTC (rev 402) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-12-14 11:01:06 UTC (rev 403) @@ -45,7 +45,7 @@  <fr.ifremer.coser.bean.Selection id="selection" javaBean="null" /> <jaxx.runtime.validator.swing.SwingValidatorMessageTableModel id='errorsTableModel' - onTableChanged='saveSelectionButton.setEnabled(errorsTableModel.getRowCount()==0)'/> + onTableChanged='saveSelectionButton.setEnabled(getErrorsTableModel().getRowCount() == 0 && getSelectedSpecyListModel().getSize() != 0)'/> <BeanValidator id='validatorSelection' bean='selection' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI" errorTableModel="errorsTableModel"> @@ -242,7 +242,7 @@ <cell weightx="1" weighty="1" fill="both"> <JScrollPane> <SpecyListModel id="selectedSpecyListModel" - onContentsChanged='selectedSpecyLabel.setText(_("coser.ui.selection.details.selectedSpecies", selectedSpecyList.getSelectedIndices().length, selectedSpecyList.getModel().getSize()))'/> + onContentsChanged='saveSelectionButton.setEnabled(getErrorsTableModel().getRowCount() == 0 && getSelectedSpecyListModel().getSize() != 0);selectedSpecyLabel.setText(_("coser.ui.selection.details.selectedSpecies", selectedSpecyList.getSelectedIndices().length, selectedSpecyList.getModel().getSize()))'/> <JList id="selectedSpecyList" model="{selectedSpecyListModel}" onMouseClicked="getHandler().showSelectedSpeciesContextMenu(this, event)" selectionModel="{new CoserListSelectionModel(selectedSpecyList.getSelectionModel(), selectedSpecyListModel)}"

1 0

r402 - in trunk/coser-ui/src/main: java/fr/ifremer/coser/ui/control resources/i18n
by chatellier＠users.labs.libre-entreprise.org 14 Dec '10

14 Dec '10

Author: chatellier Date: 2010-12-14 10:13:31 +0000 (Tue, 14 Dec 2010) New Revision: 402 Log: Affiche des graphiques associ?\195?\169 aux errors lors du double clic dans l'arbre Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlGraphFrame.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.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/control/ControlGraphFrame.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlGraphFrame.jaxx 2010-12-13 17:06:44 UTC (rev 401) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlGraphFrame.jaxx 2010-12-14 10:13:31 UTC (rev 402) @@ -22,7 +22,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JFrame title="coser.ui.graph.compareNumberCatchSize" name="catchLengthCompareFrame"> +<JFrame title="coser.ui.graph.compareNumberCatchLength" name="catchLengthCompareFrame"> <ControlHandler id="handler" javaBean="null" /> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2010-12-13 17:06:44 UTC (rev 401) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2010-12-14 10:13:31 UTC (rev 402) @@ -83,6 +83,7 @@ import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.control.ControlError; import fr.ifremer.coser.control.ControlErrorGroup; +import fr.ifremer.coser.control.DiffCatchLengthControlError; import fr.ifremer.coser.data.AbstractDataEntity; import fr.ifremer.coser.data.Catch; import fr.ifremer.coser.data.Haul; @@ -398,6 +399,13 @@ } try { + + // genere la liste des graphes a se moment + PublicationService publicationService = view.getContextValue(PublicationService.class); + Map<String, JFreeChart> charts = publicationService.getCompareCatchLengthGraph(project, project.getControl(), null); + view.setContextValue(charts, "CompareCatchLengthGraph"); + view.getCompareNumberCatchLengthButton().setEnabled(true); + // hack parce que impossible de faire un faire // sans que les colonnes soit redimentionnées view.getGlobalControlErrorTable().setAutoCreateColumnsFromModel(false); @@ -519,18 +527,22 @@ /** * Affiche le menu contextuel de l'arbre qui contient les erreurs de - * validation globales. + * validation globales ou les graphes de comparaison captures/taille + * dans le cas d'un double clic sur une {@link DiffCatchLengthControlError}. * * @param controlView view * @param event mouse event + * @see DiffCatchLengthControlError */ - public void showGlobalErrorTableContextMenu(final ControlView controlView, MouseEvent event) { + public void globalErrorTableMouseCLicked(final ControlView controlView, MouseEvent event) { - // clic contextuel - if (event.getButton() == MouseEvent.BUTTON3) { + int eventButton = event.getButton(); + + // clic contextuel (clic droit) + if (eventButton == MouseEvent.BUTTON3) { TreePath selectedError = controlView.getGlobalControlErrorTable().getTreeSelectionModel().getSelectionPath(); - JPopupMenu popupMenu = new JPopupMenu(_("coser.ui.control.globalErrorMenuLabel")); + JPopupMenu popupMenu = new JPopupMenu(); // plusieurs lignes selectionnées et pas la premiere colonne (Line index) if (selectedError != null) { @@ -566,6 +578,23 @@ popupMenu.show(controlView.getGlobalControlErrorTable(), event.getX(), event.getY()); } + + // double clic (bouton normal) + else if (eventButton == MouseEvent.BUTTON1 && event.getClickCount() == 2) { + TreePath selectedError = controlView.getGlobalControlErrorTable().getTreeSelectionModel().getSelectionPath(); + + // si la selection est une instance de DiffCatchLengthControlError + // affiche le graphe avec l'espece correspondante + if (selectedError != null) { + Object[] pathWay = selectedError.getPath(); + Object lastComponent = pathWay[pathWay.length - 1]; + if (lastComponent instanceof DiffCatchLengthControlError) { + DiffCatchLengthControlError error = (DiffCatchLengthControlError)lastComponent; + String species = error.getSpecies(); + displayCompareNumberCatchGraph(controlView, species); + } + } + } } /** @@ -830,35 +859,36 @@ * * @param view view */ - public void displayCompareNumberCatchGraph(final ControlView view) { + public void displayCompareNumberCatchGraph(ControlView view) { + displayCompareNumberCatchGraph(view, null); + } - final Project project = view.getContextValue(Project.class); - final PublicationService publicationService = view.getContextValue(PublicationService.class); - final SwingSession session = view.getContextValue(SwingSession.class); + /** + * Display data graph, initialized with graph for selected specy + * selected. + * + * @param view view + * @param selectedSpecies if not null (auto select species in combo box) + */ + public void displayCompareNumberCatchGraph(ControlView view, String selectedSpecies) { + SwingSession session = view.getContextValue(SwingSession.class); - SwingUtilities.invokeLater(new Runnable() { - public void run() { - try { - setWaitCursor(view); + // get matrix (form context by method #checkData) + Map<String, JFreeChart> charts = view.getContextValue(Map.class, "CompareCatchLengthGraph"); + List<String> species = new ArrayList<String>(charts.keySet()); - // get matrix - Map<String, JFreeChart> charts = publicationService.getCompareCatchLengthGraph(project, project.getControl(), null); - List<String> species = new ArrayList<String>(charts.keySet()); - - ControlGraphFrame frame = new ControlGraphFrame(view); - frame.setHandler(ControlHandler.this); - frame.setContextValue(charts); - frame.getSpecyComboModel().setSpecy(species); - frame.pack(); - frame.setLocationRelativeTo(view); - session.add(frame); // session restore - frame.setVisible(true); - } - finally { - setDefaultCursor(view); - } - } - }); + ControlGraphFrame frame = new ControlGraphFrame(view); + frame.setHandler(ControlHandler.this); + frame.setContextValue(charts); + frame.getSpecyComboModel().setSpecy(species); + if (selectedSpecies != null) { + frame.getSpecyComboModel().setSelectedItem(selectedSpecies); + updateCompareNumberCatchGraph(frame); + } + frame.pack(); + frame.setLocationRelativeTo(view); + session.add(frame); // session restore + frame.setVisible(true); } /** @@ -880,7 +910,7 @@ */ public void updateCompareNumberCatchGraph(ControlGraphFrame view) { String specyName = (String)view.getSpecyComboModel().getSelectedItem(); - Map<String, JFreeChart> charts = view.getContextValue(Map.class); + Map<String, JFreeChart> charts = view.getContextValue(Map.class, "CompareCatchLengthGraph"); JFreeChart chart = charts.get(specyName); view.getControlGraphPanel().removeAll(); ChartPanel chartPanel = new ChartPanel(chart); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx 2010-12-13 17:06:44 UTC (rev 401) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx 2010-12-14 10:13:31 UTC (rev 402) @@ -53,8 +53,8 @@ <JToolBar.Separator /> <JButton icon="spellcheck.png" text="coser.ui.control.checkData" onActionPerformed="getHandler().checkData(this)" /> - <JToolBar.Separator /> - <JButton icon="chart_curve.png" text="coser.ui.graph.compareNumberCatchSize" + <JButton id="compareNumberCatchLengthButton" icon="chart_curve.png" enabled="false" + text="coser.ui.graph.compareNumberCatchLength" toolTipText="coser.ui.graph.compareNumberCatchLengthTip" onActionPerformed="getHandler().displayCompareNumberCatchGraph(this)"/> <JButton icon="chart_bar.png" text="coser.ui.graph.lengthStructure" onActionPerformed="getHandler().displayLengthStructureGraph(this)"/> @@ -159,7 +159,7 @@ <JXTreeTable id='globalControlErrorTable' treeTableModel="{globalControlErrorModel}" rootVisible="false" showsRootHandles="true" treeCellRenderer="{new ControlErrorTreeRenderer()}" - onMouseClicked="getHandler().showGlobalErrorTableContextMenu(this, event)" + onMouseClicked="getHandler().globalErrorTableMouseCLicked(this, event)" selectionMode="{ListSelectionModel.SINGLE_SELECTION}" /> <javax.swing.tree.TreeSelectionModel id="globalControlErrorSelectionModel" javaBean="globalControlErrorTable.getTreeSelectionModel()" 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 2010-12-13 17:06:44 UTC (rev 401) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-12-14 10:13:31 UTC (rev 402) @@ -28,7 +28,7 @@ coser.ui.control.confirmDeletionsMessage=Are you sure you want to delete %d selected lines ? coser.ui.control.controlSaved=Control saved. coser.ui.control.controlTitle=Control -coser.ui.control.controlValidated=Control validated. +coser.ui.control.controlValidated=Control validated and saved. coser.ui.control.dataMenuDeleteSelected=Deleted selected lines coser.ui.control.dataMenuLabel=Data menu coser.ui.control.dataMenuReplace=Replace in %s for selection @@ -38,7 +38,6 @@ coser.ui.control.global.done=\u2026 coser.ui.control.global.message=Message coser.ui.control.globalErrorMenuGenerateHTML=Export as HTML -coser.ui.control.globalErrorMenuLabel=Error menu coser.ui.control.globalErrorMenuSelectAll=Select all lines coser.ui.control.graph.species=Species \: coser.ui.control.logreport=Modification report @@ -62,7 +61,8 @@ coser.ui.error.htmlmessage=An error occurs \: %s coser.ui.error.reportSendTo=A repport has been sent to %s coser.ui.error.title=Global application error -coser.ui.graph.compareNumberCatchSize=Comparison Catch/Length +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 coser.ui.locale.mustRestart=You must restart application to take effect coser.ui.locale.title=Locale modification @@ -196,7 +196,7 @@ coser.ui.selection.selectionFilterDescription=Coser selection (*.selection) coser.ui.selection.selectionSaved=Selection saved. coser.ui.selection.selectionTitle=Selection -coser.ui.selection.selectionValidated=Selection validated. +coser.ui.selection.selectionValidated=Selection validated and saved. coser.ui.selection.sizeAllYearSpecies=L3 \: Species with size all year (%d/%d) coser.ui.selection.speciesMenuFusion=Merge coser.ui.selection.speciesMerged=Species merged. 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 2010-12-13 17:06:44 UTC (rev 401) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-12-14 10:13:31 UTC (rev 402) @@ -28,7 +28,7 @@ coser.ui.control.confirmDeletionsMessage=\u00CAtes vous s\u00FBr de vouloir supprimer les %d lignes s\u00E9lectionn\u00E9es ? coser.ui.control.controlSaved=Contr\u00F4le sauv\u00E9. coser.ui.control.controlTitle=Contr\u00F4le -coser.ui.control.controlValidated=Contr\u00F4le valid\u00E9. +coser.ui.control.controlValidated=Contr\u00F4le valid\u00E9 et sauv\u00E9. coser.ui.control.dataMenuDeleteSelected=Supprimer les lignes s\u00E9lectionn\u00E9es coser.ui.control.dataMenuLabel=Menu des donn\u00E9es coser.ui.control.dataMenuReplace=Remplacer dans %s pour la s\u00E9lection @@ -38,7 +38,6 @@ coser.ui.control.global.done=\u2026 coser.ui.control.global.message=Message coser.ui.control.globalErrorMenuGenerateHTML=Exporter en HTML -coser.ui.control.globalErrorMenuLabel=Menu des erreurs coser.ui.control.globalErrorMenuSelectAll=S\u00E9lectionner toutes les lignes coser.ui.control.graph.species=Esp\u00E8ces \: coser.ui.control.logreport=Rapport des modifications @@ -62,7 +61,8 @@ coser.ui.error.htmlmessage=Une erreur s'est produite \: %s coser.ui.error.reportSendTo=Un rapport a \u00E9t\u00E9 envoy\u00E9 \u00E0 %s coser.ui.error.title=Erreur globale -coser.ui.graph.compareNumberCatchSize=Comparaison Captures/Tailles +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\u00E9es sont g\u00E9n\u00E9r\u00E9es uniquement lors de la v\u00E9rification des erreurs) coser.ui.graph.lengthStructure=Structures en taille coser.ui.locale.mustRestart=Vous devez red\u00E9marrer l'application pour prendre en compte la modification. coser.ui.locale.title=Modification de la langue @@ -196,7 +196,7 @@ coser.ui.selection.selectionFilterDescription=Coser s\u00E9lection (*.selection) coser.ui.selection.selectionSaved=S\u00E9lection sauv\u00E9e. coser.ui.selection.selectionTitle=S\u00E9lection -coser.ui.selection.selectionValidated=S\u00E9lection valid\u00E9e. +coser.ui.selection.selectionValidated=S\u00E9lection valid\u00E9e et sauv\u00E9e. coser.ui.selection.sizeAllYearSpecies=L3 \: Esp\u00E8ces avec taille pour toutes les ann\u00E9es (%d/%d) coser.ui.selection.speciesMenuFusion=Fusion coser.ui.selection.speciesMerged=Esp\u00E8ces fusionn\u00E9es.

1 0

r401 - trunk/coser-business/src/main/resources/fr/ifremer/coser/data
by chatellier＠users.labs.libre-entreprise.org 13 Dec '10

13 Dec '10

Author: chatellier Date: 2010-12-13 17:06:44 +0000 (Mon, 13 Dec 2010) New Revision: 401 Log: Erreur si poids sans nombre (meme que pour les captures) Modified: trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Length-error-validation.xml Modified: trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Length-error-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Length-error-validation.xml 2010-12-13 16:46:34 UTC (rev 400) +++ trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Length-error-validation.xml 2010-12-13 17:06:44 UTC (rev 401) @@ -83,4 +83,8 @@ <message>age attribute is not a valid double</message> </field-validator> </field> + <validator type="coserExpression"> + <param name="expression"><![CDATA[ (weight > 0 && number > 0) || weight == 0]]></param> + <message>coser.business.control.error.noCatchNumberWithWeight</message> + </validator> </validators> \ No newline at end of file

1 0

r400 - in trunk/coser-ui/src/main: java/fr/ifremer/coser/ui/selection resources/i18n
by chatellier＠users.labs.libre-entreprise.org 13 Dec '10

13 Dec '10

Author: chatellier Date: 2010-12-13 16:46:34 +0000 (Mon, 13 Dec 2010) New Revision: 400 Log: Ajout d'un message lorsque l'action est r?\195?\169alis?\195?\169 Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.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 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 2010-12-13 16:22:24 UTC (rev 399) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-12-13 16:46:34 UTC (rev 400) @@ -1047,6 +1047,9 @@ File directory = new File(directoryPath); try { projectService.extractRSUfiData(project, selection, directory); + + JOptionPane.showMessageDialog(view, _("coser.ui.selection.rsufidataextracted"), + _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); } catch (CoserBusinessException ex) { throw new CoserException("Can't extract rsufi files", ex); } 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 2010-12-13 16:22:24 UTC (rev 399) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-12-13 16:46:34 UTC (rev 400) @@ -188,6 +188,7 @@ coser.ui.selection.occurrenceDensitySpecies=L2 \: Filtered species (%d/%d) coser.ui.selection.occurrencedensityrenderer=<html>%s<span style\='font-size\:85%%;color\:gray;'>(Occ\=%.2f, Dens\=%.2f)</span></html> coser.ui.selection.replayerror=Replay error +coser.ui.selection.rsufidataextracted=RSufi data extracted. coser.ui.selection.saveError=Save error coser.ui.selection.selection.requiredDescription=Selection description is required coser.ui.selection.selection.requiredName=Selection name is required 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 2010-12-13 16:22:24 UTC (rev 399) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-12-13 16:46:34 UTC (rev 400) @@ -188,10 +188,11 @@ coser.ui.selection.occurrenceDensitySpecies=L2 \: Esp\u00E8ces filtr\u00E9es (%d/%d) coser.ui.selection.occurrencedensityrenderer=<html>%s<span style\='font-size\:85%%;color\:gray;'>(Occ\=%.2f, Dens\=%.2f)</span></html> coser.ui.selection.replayerror=Erreur de reapplication +coser.ui.selection.rsufidataextracted=Donn\u00E9es RSufi extraites. coser.ui.selection.saveError=Erreur de sauvegarde coser.ui.selection.selection.requiredDescription=La description de la s\u00E9lection est requise coser.ui.selection.selection.requiredName=Le nom de la s\u00E9lection est requis -coser.ui.selection.selectionCreated=S\u00E9lection cr\u00E9\u00E9e +coser.ui.selection.selectionCreated=S\u00E9lection cr\u00E9\u00E9e. coser.ui.selection.selectionFilterDescription=Coser s\u00E9lection (*.selection) coser.ui.selection.selectionSaved=S\u00E9lection sauv\u00E9e. coser.ui.selection.selectionTitle=S\u00E9lection

1 0

r399 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection
by chatellier＠users.labs.libre-entreprise.org 13 Dec '10

13 Dec '10

Author: chatellier Date: 2010-12-13 16:22:24 +0000 (Mon, 13 Dec 2010) New Revision: 399 Log: Mauvaise condition d'application du filtre (rechargement) Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 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 2010-12-13 16:03:22 UTC (rev 398) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-12-13 16:22:24 UTC (rev 399) @@ -146,10 +146,13 @@ selectionListsView.getSelectionMaturityListModel().setMaturitySpecies(speciesWithMaturity); // rechargement de la selection sauvegardée - if (!selectionSpecyList.isEmpty()) { + // si aucune des autres listes n'est vide + if (!selection.getSelectedSpeciesOccDens().isEmpty() || + !selection.getSelectedSpeciesSizeAllYear().isEmpty() || + !selection.getSelectedSpeciesMaturity().isEmpty()) { selectionListsView.getSelectionFilterOccurrenceField().setText(String.valueOf(selection.getOccurrenceFilter())); selectionListsView.getSelectionFilterDensityField().setText(String.valueOf(selection.getDensityFilter())); - + // restauration de la selection sauvegardée ((CoserListSelectionModel)selectionListsView.getSelectionOccurrenceDensityList().getSelectionModel()).setSelectedObjects(selection.getSelectedSpeciesOccDens()); ((CoserListSelectionModel)selectionListsView.getSelectionSizeAllYearList().getSelectionModel()).setSelectedObjects(selection.getSelectedSpeciesSizeAllYear());

1 0

r398 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection
by chatellier＠users.labs.libre-entreprise.org 13 Dec '10

13 Dec '10

Author: chatellier Date: 2010-12-13 16:03:22 +0000 (Mon, 13 Dec 2010) New Revision: 398 Log: Auto select strata list values after years validation Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-12-13 15:56:17 UTC (rev 397) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-12-13 16:03:22 UTC (rev 398) @@ -129,7 +129,7 @@ </cell> <cell anchor="south"> <JButton id="validDatesButton" text="coser.ui.selection.details.validYears" - onActionPerformed="getHandler().updateSelectionDateData(this);setYearsValidated(true)" + onActionPerformed="getHandler().updateSelectionYearsData(this);setYearsValidated(true)" enabled="{!isYearsValidated()}"/> </cell> </row> 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 2010-12-13 15:56:17 UTC (rev 397) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-12-13 16:03:22 UTC (rev 398) @@ -210,7 +210,7 @@ ((CoserListSelectionModel)detailView.getYearsList().getSelectionModel()).setSelectedObjects(selectedYears); // details view : fill strata data and selection - updateSelectionDateData(detailView); + updateSelectionYearsData(detailView); List<String> selectedStrata = selection.getSelectedStrata(); ((CoserListSelectionModel)detailView.getStrataList().getSelectionModel()).setSelectedObjects(selectedStrata); @@ -226,11 +226,11 @@ } /** - * Rafraichit la liste des zones suite à la selection des dates. + * Rafraichit la liste des zones suite à la selection des années. * * @param view view */ - public void updateSelectionDateData(SelectionDetailsView view) { + public void updateSelectionYearsData(SelectionDetailsView view) { Project project = view.getContextValue(Project.class); Selection selection = view.getContextValue(Selection.class); ProjectService projectService = view.getContextValue(ProjectService.class); @@ -252,6 +252,9 @@ List<String> strata = projectService.filterDataYearsAndGetStrata(project, selection, years); view.getStrataListModel().setStrata(strata); + // auto selectionne les strates par default + view.getStrataList().addSelectionInterval(0, strata.size() - 1); + if (log.isDebugEnabled()) { log.debug("Strata list refreshed"); } @@ -303,7 +306,7 @@ * * @param view view */ - protected void updateSelectionSpecies(SelectionDetailsView view) { + public void updateSelectionSpecies(SelectionDetailsView view) { if (log.isDebugEnabled()) { log.debug("Updating species list");

1 0

r397 - in trunk/coser-ui/src/main: java/fr/ifremer/coser/ui/selection resources/i18n
by chatellier＠users.labs.libre-entreprise.org 13 Dec '10

13 Dec '10

Author: chatellier Date: 2010-12-13 15:56:17 +0000 (Mon, 13 Dec 2010) New Revision: 397 Log: Ajout de menu contextuel sur les ann?\195?\169es et strates. Renomage de dates en years dans le code. Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.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 Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-12-13 15:39:33 UTC (rev 396) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-12-13 15:56:17 UTC (rev 397) @@ -113,21 +113,22 @@ <Table> <row> <cell anchor="west" columns="2"> - <JLabel text="coser.ui.selection.details.dates" /> + <JLabel text="coser.ui.selection.details.years" /> </cell> </row> <row> <cell weighty="1" weightx="1" fill="both"> <JScrollPane> - <YearListModel id="datesListModel" /> - <JList id="datesList" model="{datesListModel}" - selectionModel="{new CoserListSelectionModel(datesList.getSelectionModel(), datesListModel)}" + <YearListModel id="yearsListModel" /> + <JList id="yearsList" model="{yearsListModel}" + onMouseClicked="getHandler().showYearsContextMenu(this, event)" + selectionModel="{new CoserListSelectionModel(yearsList.getSelectionModel(), yearsListModel)}" onValueChanged="setYearsValidated(false)" /> - <ListSelectionModel id="datesListSelectionModel" javaBean="datesList.getSelectionModel()" /> + <ListSelectionModel id="yearsListSelectionModel" javaBean="yearsList.getSelectionModel()" /> </JScrollPane> </cell> <cell anchor="south"> - <JButton id="validDatesButton" text="coser.ui.selection.details.validDates" + <JButton id="validDatesButton" text="coser.ui.selection.details.validYears" onActionPerformed="getHandler().updateSelectionDateData(this);setYearsValidated(true)" enabled="{!isYearsValidated()}"/> </cell> @@ -147,6 +148,7 @@ <StrataListModel id="strataListModel" onContentsChanged='strataLabel.setText(_("coser.ui.selection.details.strata", strataList.getSelectedIndices().length, strataList.getModel().getSize()))'/> <JList id="strataList" model="{strataListModel}" + onMouseClicked="getHandler().showStrataContextMenu(this, event)" selectionModel="{new CoserListSelectionModel(strataList.getSelectionModel(), strataListModel)}" onValueChanged='setStrataValidated(false); strataLabel.setText(_("coser.ui.selection.details.strata", strataList.getSelectedIndices().length, strataList.getModel().getSize()))'/> </JScrollPane> 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 2010-12-13 15:39:33 UTC (rev 396) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-12-13 15:56:17 UTC (rev 397) @@ -176,9 +176,9 @@ // initialize la liste de toutes les années // c'est normalement la seule initialisation a faire SelectionDetailsView detailView = view.getSelectionDetailsTab(); - detailView.getDatesListModel().setYears(selection.getAllYears()); + detailView.getYearsListModel().setYears(selection.getAllYears()); // tout est selectionné par defaut - ((CoserListSelectionModel)detailView.getDatesList().getSelectionModel()).setSelectedObjects(selection.getSelectedYears()); + ((CoserListSelectionModel)detailView.getYearsList().getSelectionModel()).setSelectedObjects(selection.getSelectedYears()); view.setCreationState(true); @@ -205,9 +205,9 @@ SelectionDetailsView detailView = view.getSelectionDetailsTab(); // details view : fill details view - detailView.getDatesListModel().setYears(selection.getAllYears()); + detailView.getYearsListModel().setYears(selection.getAllYears()); List<String> selectedYears = selection.getSelectedYears(); - ((CoserListSelectionModel)detailView.getDatesList().getSelectionModel()).setSelectedObjects(selectedYears); + ((CoserListSelectionModel)detailView.getYearsList().getSelectionModel()).setSelectedObjects(selectedYears); // details view : fill strata data and selection updateSelectionDateData(detailView); @@ -236,7 +236,7 @@ ProjectService projectService = view.getContextValue(ProjectService.class); // get selected zones as list - Object[] selectedDates = view.getDatesList().getSelectedValues(); + Object[] selectedDates = view.getYearsList().getSelectedValues(); List<String> years = new ArrayList<String>(selectedDates.length); for (Object selectedDate : selectedDates) { years.add((String)selectedDate); @@ -333,6 +333,82 @@ } /** + * Affiche un menu contextuel lors du clic (droit) sur la liste des années. + * + * @param view view + * @param event mouse event + */ + public void showYearsContextMenu(final SelectionDetailsView view, MouseEvent event) { + + // clic droit + if (event.getButton() == MouseEvent.BUTTON3) { + + JPopupMenu popupMenu = new JPopupMenu(); + + // select all menu + JMenuItem selectAllMenu = new JMenuItem(_("coser.ui.common.selectAll")); + selectAllMenu.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + int size = view.getYearsList().getModel().getSize(); + view.getYearsList().getSelectionModel().addSelectionInterval(0, size - 1); + } + }); + popupMenu.add(selectAllMenu); + + // unselect all menu + JMenuItem unselectAllMenu = new JMenuItem(_("coser.ui.common.unselectAll")); + unselectAllMenu.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + view.getYearsList().getSelectionModel().clearSelection(); + } + }); + popupMenu.add(unselectAllMenu); + + popupMenu.show(view.getYearsList(), event.getX(), event.getY()); + } + } + + /** + * Affiche un menu contextuel lors du clic (droit) sur la liste des strates. + * + * @param view view + * @param event mouse event + */ + public void showStrataContextMenu(final SelectionDetailsView view, MouseEvent event) { + + // clic droit + if (event.getButton() == MouseEvent.BUTTON3) { + + JPopupMenu popupMenu = new JPopupMenu(); + + // select all menu + JMenuItem selectAllMenu = new JMenuItem(_("coser.ui.common.selectAll")); + selectAllMenu.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + int size = view.getStrataList().getModel().getSize(); + view.getStrataList().getSelectionModel().addSelectionInterval(0, size - 1); + } + }); + popupMenu.add(selectAllMenu); + + // unselect all menu + JMenuItem unselectAllMenu = new JMenuItem(_("coser.ui.common.unselectAll")); + unselectAllMenu.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + view.getStrataList().getSelectionModel().clearSelection(); + } + }); + popupMenu.add(unselectAllMenu); + + popupMenu.show(view.getStrataList(), event.getX(), event.getY()); + } + } + + /** * Affiche un menu contextuel lors du clic (droit) sur la liste filtrées des especes. * * @param view view @@ -343,7 +419,7 @@ // clic droit if (event.getButton() == MouseEvent.BUTTON3) { - JPopupMenu popupMenu = new JPopupMenu(_("coser.ui.selection.speciesMenuLabel")); + JPopupMenu popupMenu = new JPopupMenu(); // affiche le menu contextuel si au moins 2 especes selectionnées int[] selectedRows = view.getFilteredSpecyList().getSelectedIndices(); @@ -418,7 +494,7 @@ // clic droit if (event.getButton() == MouseEvent.BUTTON3) { - JPopupMenu popupMenu = new JPopupMenu(_("coser.ui.selection.speciesMenuLabel")); + JPopupMenu popupMenu = new JPopupMenu(); int[] selectedRows = view.getSelectedSpecyList().getSelectedIndices(); if (selectedRows.length > 0) { 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 2010-12-13 15:39:33 UTC (rev 396) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-12-13 15:56:17 UTC (rev 397) @@ -154,7 +154,6 @@ coser.ui.selection.detail.yearAccordion=Years coser.ui.selection.details.addToSelectedListTip=Add selected species to selected species list. coser.ui.selection.details.comment=Comments \: -coser.ui.selection.details.dates=Years \: coser.ui.selection.details.description=Description \: coser.ui.selection.details.displayDiffCatchLengthGraph=Comparison catch/length graphs coser.ui.selection.details.filteredSpecies=Filtered species (%d/%d) \: @@ -166,10 +165,11 @@ coser.ui.selection.details.showSpreciesTip=Display sampling effort table coser.ui.selection.details.strata=Strata (%d/%d) \: coser.ui.selection.details.type=Filter by type (%d/%d) \: -coser.ui.selection.details.validDates=Valid years coser.ui.selection.details.validFilter=Valid filter coser.ui.selection.details.validSelection=Valid selection coser.ui.selection.details.validStrata=Valid strata +coser.ui.selection.details.validYears=Valid years +coser.ui.selection.details.years=Years \: coser.ui.selection.filter.density=Density \: coser.ui.selection.filter.filter=Filter coser.ui.selection.filter.occurrence=Occurrence \: @@ -198,7 +198,6 @@ coser.ui.selection.selectionValidated=Selection validated. coser.ui.selection.sizeAllYearSpecies=L3 \: Species with size all year (%d/%d) coser.ui.selection.speciesMenuFusion=Merge -coser.ui.selection.speciesMenuLabel=Species menu coser.ui.selection.speciesMerged=Species merged. coser.ui.selection.tab.details=Selection details coser.ui.selection.tab.lists=Species lists 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 2010-12-13 15:39:33 UTC (rev 396) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-12-13 15:56:17 UTC (rev 397) @@ -154,7 +154,6 @@ coser.ui.selection.detail.yearAccordion=Ann\u00E9es coser.ui.selection.details.addToSelectedListTip=Ajoute les esp\u00E8ces s\u00E9lectionn\u00E9es \u00E0 la liste des especes s\u00E9lectionn\u00E9es. coser.ui.selection.details.comment=Commentaire \: -coser.ui.selection.details.dates=Ann\u00E9es \: coser.ui.selection.details.description=Description \: coser.ui.selection.details.displayDiffCatchLengthGraph=Graphiques des diff\u00E9rences captures/tailles coser.ui.selection.details.filteredSpecies=Esp\u00E8ces filtr\u00E9es (%d/%d) \: @@ -166,10 +165,11 @@ coser.ui.selection.details.showSpreciesTip=Afficher la table de l'effort d'\u00E9chantillonage coser.ui.selection.details.strata=Strates (%d/%d) \: coser.ui.selection.details.type=Filtrer par type (%d/%d) \: -coser.ui.selection.details.validDates=Valider les ann\u00E9es coser.ui.selection.details.validFilter=Valider les filtres coser.ui.selection.details.validSelection=Valider la s\u00E9lection coser.ui.selection.details.validStrata=Valider les strates +coser.ui.selection.details.validYears=Valider les ann\u00E9es +coser.ui.selection.details.years=Ann\u00E9es \: coser.ui.selection.filter.density=Densit\u00E9 \: coser.ui.selection.filter.filter=Filtrer coser.ui.selection.filter.occurrence=Occurence \: @@ -198,7 +198,6 @@ coser.ui.selection.selectionValidated=S\u00E9lection valid\u00E9e. coser.ui.selection.sizeAllYearSpecies=L3 \: Esp\u00E8ces avec taille pour toutes les ann\u00E9es (%d/%d) coser.ui.selection.speciesMenuFusion=Fusion -coser.ui.selection.speciesMenuLabel=Menu esp\u00E8ces coser.ui.selection.speciesMerged=Esp\u00E8ces fusionn\u00E9es. coser.ui.selection.tab.details=D\u00E9tails de la s\u00E9lection coser.ui.selection.tab.lists=Listes des esp\u00E8ces

1 0

r396 - in trunk/coser-ui/src/main: java/fr/ifremer/coser/ui resources/i18n
by chatellier＠users.labs.libre-entreprise.org 13 Dec '10

13 Dec '10

Author: chatellier Date: 2010-12-13 15:39:33 +0000 (Mon, 13 Dec 2010) New Revision: 396 Log: Add loaded project title in application window Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.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 Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx 2010-12-13 15:26:27 UTC (rev 395) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx 2010-12-13 15:39:33 UTC (rev 396) @@ -22,7 +22,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JFrame title="coser.ui.mainview.title" layout="{new BorderLayout()}" +<JFrame title="coser.ui.mainview.titleempty" layout="{new BorderLayout()}" name="mainFrame" onWindowClosing="getHandler().quit()"> <CoserFrameHandler id="handler" constructorParams="this" /> 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 2010-12-13 15:26:27 UTC (rev 395) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-12-13 15:39:33 UTC (rev 396) @@ -417,6 +417,7 @@ public void closeProject() { setMainComponent(null); view.setProject(null); + view.setTitle(_("coser.ui.mainview.titleempty")); } /** @@ -425,6 +426,8 @@ protected void projectLoaded(Project project) { view.setProject(project); view.setContextValue(project); + + view.setTitle(_("coser.ui.mainview.titleproject", project.getName())); } /** 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 2010-12-13 15:26:27 UTC (rev 395) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-12-13 15:39:33 UTC (rev 396) @@ -89,7 +89,8 @@ coser.ui.mainframe.menu.view=View coser.ui.mainframe.menu.view.lookandfeel=Look and feel coser.ui.mainframe.menu.website=Online help -coser.ui.mainview.title=Contr\u00F4le et S\u00E9lection RSufi +coser.ui.mainview.titleempty=Contr\u00F4le et S\u00E9lection RSufi +coser.ui.mainview.titleproject=Contr\u00F4le et S\u00E9lection RSufi (%s) coser.ui.project.catchFile=Catch file \: coser.ui.project.createProject=Create project coser.ui.project.createProjectMissingCodeTypeSpecies=File 'CodeTypeSpecies' is not valid \!\n(check configuration \: coser.reference.typeSpecies) 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 2010-12-13 15:26:27 UTC (rev 395) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-12-13 15:39:33 UTC (rev 396) @@ -89,7 +89,8 @@ coser.ui.mainframe.menu.view=Vue coser.ui.mainframe.menu.view.lookandfeel=Th\u00E8me coser.ui.mainframe.menu.website=Aide en ligne -coser.ui.mainview.title=Contr\u00F4le et S\u00E9lection RSufi +coser.ui.mainview.titleempty=Contr\u00F4le et S\u00E9lection RSufi +coser.ui.mainview.titleproject=Contr\u00F4le et S\u00E9lection RSufi (%s) coser.ui.project.catchFile=Fichier de captures \: coser.ui.project.createProject=Cr\u00E9er le projet coser.ui.project.createProjectMissingCodeTypeSpecies=Le fichier 'CodeTypeEspeces' n'est pas valide \!\n(v\u00E9rifiez la configuration \: coser.reference.typeSpecies)

1 0

r395 - in trunk/coser-ui/src/main: java/fr/ifremer/coser/ui/maps resources/maps
by chatellier＠users.labs.libre-entreprise.org 13 Dec '10

13 Dec '10

Author: chatellier Date: 2010-12-13 15:26:27 +0000 (Mon, 13 Dec 2010) New Revision: 395 Log: Add world map and center map on france. Added: trunk/coser-ui/src/main/resources/maps/vmap_area_thin.shp trunk/coser-ui/src/main/resources/maps/vmap_area_thin.ssx Removed: trunk/coser-ui/src/main/resources/maps/ibts/ Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/CoserMap.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/CoserMap.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/CoserMap.java 2010-12-10 16:33:23 UTC (rev 394) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/CoserMap.java 2010-12-13 15:26:27 UTC (rev 395) @@ -86,8 +86,14 @@ addGraticuleLayer(); - addLayer("maps/ibts/pol_ibts.shp", "maps/ibts/pol_ibts.shp", "ff000000", "ffbdde83"); + // centrée sur la france + setCenter(50f, 0f); + setScale(16000000f); + addLayer("maps/vmap_area_thin.shp", "maps/vmap_area_thin.shp", "ff000000", "ffbdde83"); + + // addLayer("maps/ibts/pol_ibts.shp", "maps/ibts/pol_ibts.shp", "ff000000", "ffE55B3C"); + } protected void addGraticuleLayer() { Added: trunk/coser-ui/src/main/resources/maps/vmap_area_thin.shp =================================================================== (Binary files differ) Property changes on: trunk/coser-ui/src/main/resources/maps/vmap_area_thin.shp ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/coser-ui/src/main/resources/maps/vmap_area_thin.ssx =================================================================== (Binary files differ) Property changes on: trunk/coser-ui/src/main/resources/maps/vmap_area_thin.ssx ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r394 - in trunk: . coser-web
by chatellier＠users.labs.libre-entreprise.org 10 Dec '10

10 Dec '10

Author: chatellier Date: 2010-12-10 16:33:23 +0000 (Fri, 10 Dec 2010) New Revision: 394 Log: Fix dependencies Modified: trunk/coser-web/pom.xml trunk/pom.xml Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2010-12-10 16:33:11 UTC (rev 393) +++ trunk/coser-web/pom.xml 2010-12-10 16:33:23 UTC (rev 394) @@ -25,10 +25,14 @@ <artifactId>nuiton-utils</artifactId> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> </dependency> <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </dependency> + <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-10 16:33:11 UTC (rev 393) +++ trunk/pom.xml 2010-12-10 16:33:23 UTC (rev 394) @@ -194,14 +194,14 @@ <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> <version>${struts.version}</version> - <scope>compile</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-convention-plugin</artifactId> <version>${struts.version}</version> - <scope>compile</scope> + <scope>runtime</scope> </dependency> <dependency>

1 0