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

r373 - in trunk/coser-business/src: main/java/fr/ifremer/coser/services test/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 07 Dec '10

07 Dec '10

Author: chatellier Date: 2010-12-07 13:13:56 +0000 (Tue, 07 Dec 2010) New Revision: 373 Log: Ajout du calcul de la structure en taille. Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.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 2010-12-06 15:13:09 UTC (rev 372) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-12-07 13:13:56 UTC (rev 373) @@ -2185,6 +2185,135 @@ } /** + * Présentation du graphique : histogramme de distribution en tailles par + * espèce, par strate et par année (une planche par espèce et par année) + * pour toute la série. Avec la possibilité de voir regroupé l'ensemble des + * années. + * + * Données. TAILLES$Nombres et TAILLES$Longueur + * Calcul. Sommer TAILLES$Nombres par classe de longueur (TAILLES$Longueur) + * sur tous les traits d'une année (ou tous les années si regroupé) + * + * @param project project + * @param selection data container + * @return matrix 4 dimension + */ + public MatrixND getLengthStructure(Project project, Selection selection) { + + // load map traitname > stratename + Map<String, String> haulAndStratas = new HashMap<String, String>(); + Iterator<String[]> itHaul = selection.getHaul().iterator(); + itHaul.next(); // skip header + while (itHaul.hasNext()) { + String[] tuple = itHaul.next(); + String haul = tuple[Haul.INDEX_HAUL]; + String strataName = tuple[Haul.INDEX_STRATUM]; + haulAndStratas.put(haul, strataName); + } + + // map lengthstep, species , strata , year > count + Map<Double, Map<String, Map<String, Map<String, Double>>>> countForLengthSpeciesStrataYear = + new HashMap<Double, Map<String, Map<String, Map<String, Double>>>>(); + Set<Double> lengthSet = new HashSet<Double>(); + Set<String> speciesSet = new HashSet<String>(); + Set<String> strataSet = new HashSet<String>(); + Set<String> yearSet = new HashSet<String>(); + + Iterator<String[]> itData = selection.getLength().iterator(); + itData.next(); // skip header + + while (itData.hasNext()) { + String[] tuple = itData.next(); + + String year = tuple[Length.INDEX_YEAR]; + String haul = tuple[Length.INDEX_HAUL]; + String species = tuple[Length.INDEX_SPECIES]; + String lengthAsString = tuple[Length.INDEX_LENGTH]; + String numberAsString = tuple[Length.INDEX_NUMBER]; + String strata = haulAndStratas.get(haul); + + // remember for matrix spemantics + speciesSet.add(species); + strataSet.add(strata); + yearSet.add(year); + + // get correct length step + // plain or half centimeters + try { + double length = Double.parseDouble(lengthAsString); + lengthSet.add(length); + + try { + double number = Double.parseDouble(numberAsString); + + // fill map + Map<String, Map<String, Map<String, Double>>> lengthCountForSpeciesStrataYear = countForLengthSpeciesStrataYear.get(length); + if (lengthCountForSpeciesStrataYear == null) { + lengthCountForSpeciesStrataYear = new HashMap<String, Map<String,Map<String,Double>>>(); + countForLengthSpeciesStrataYear.put(length, lengthCountForSpeciesStrataYear); + } + + Map<String, Map<String, Double>> speciesCountForStrataYear = lengthCountForSpeciesStrataYear.get(species); + if (speciesCountForStrataYear == null) { + speciesCountForStrataYear = new HashMap<String, Map<String,Double>>(); + lengthCountForSpeciesStrataYear.put(species, speciesCountForStrataYear); + } + + Map<String, Double> strataCountForYear = speciesCountForStrataYear.get(strata); + if (strataCountForYear == null) { + strataCountForYear = new HashMap<String, Double>(); + speciesCountForStrataYear.put(strata, strataCountForYear); + } + + Double countForYear = strataCountForYear.get(year); + if (countForYear == null) { + strataCountForYear.put(year, number); + } + else { + double newCount = countForYear + number; + strataCountForYear.put(year, newCount); + } + } + catch (NumberFormatException ex) { + if (log.isWarnEnabled()) { + log.warn("Can't parse number as double : " + numberAsString); + } + } + } + catch (NumberFormatException ex) { + if (log.isWarnEnabled()) { + log.warn("Can't parse length as double : " + lengthAsString); + } + } + } + + // convert map to matrixND + List<Double> lengthSem = new ArrayList<Double>(lengthSet); + List<String> speciesSem = new ArrayList<String>(speciesSet); + List<String> strataSem = new ArrayList<String>(strataSet); + List<String> yearSem = new ArrayList<String>(yearSet); + + MatrixND matrix = MatrixFactory.getInstance().create("density", new List<?>[] { + lengthSem , speciesSem, strataSem, yearSem}); + + for (Map.Entry<Double, Map<String, Map<String, Map<String, Double>>>> lengthTuple : countForLengthSpeciesStrataYear.entrySet()) { + Double length = lengthTuple.getKey(); + for (Map.Entry<String, Map<String, Map<String, Double>>> speciesTuple : lengthTuple.getValue().entrySet()) { + String species = speciesTuple.getKey(); + for (Map.Entry<String, Map<String, Double>> strataTuple : speciesTuple.getValue().entrySet()) { + String strata = strataTuple.getKey(); + for (Map.Entry<String, Double> yearTuple : strataTuple.getValue().entrySet()) { + String year = yearTuple.getKey(); + matrix.setValue(new Object[]{length, species, strata, year}, yearTuple.getValue()); + } + } + } + } + + return matrix; + } + + /** * Extrait les données de la selection * * @param project project Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2010-12-06 15:13:09 UTC (rev 372) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2010-12-07 13:13:56 UTC (rev 373) @@ -438,4 +438,18 @@ MatrixND matrix = projectService.getDensity(project, selection); Assert.assertNotNull(matrix); } + + /** + * Test de la méthode de structure en taille. + * + * @throws CoserBusinessException + */ + @Test + public void getLengthStructure() throws CoserBusinessException { + Project project = createTestProject(projectService, true); + Selection selection = projectService.initProjectSelection(project); + selection.setName("test"); + MatrixND matrix = projectService.getLengthStructure(project, selection); + Assert.assertNotNull(matrix); + } }

1 0

r372 - in trunk: coser-business coser-ui
by chatellier＠users.labs.libre-entreprise.org 06 Dec '10

06 Dec '10

Author: chatellier Date: 2010-12-06 15:13:09 +0000 (Mon, 06 Dec 2010) New Revision: 372 Log: Fix dependencies Modified: trunk/coser-business/pom.xml trunk/coser-ui/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2010-12-06 15:07:55 UTC (rev 371) +++ trunk/coser-business/pom.xml 2010-12-06 15:13:09 UTC (rev 372) @@ -74,6 +74,10 @@ <groupId>jfree</groupId> <artifactId>jfreechart</artifactId> </dependency> + <dependency> + <groupId>jfree</groupId> + <artifactId>jcommon</artifactId> + </dependency> </dependencies> <name>Coser :: Business</name> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2010-12-06 15:07:55 UTC (rev 371) +++ trunk/coser-ui/pom.xml 2010-12-06 15:13:09 UTC (rev 372) @@ -85,10 +85,6 @@ <groupId>jfree</groupId> <artifactId>jfreechart</artifactId> </dependency> - <dependency> - <groupId>jfree</groupId> - <artifactId>jcommon</artifactId> - </dependency> </dependencies> <name>Coser :: UI</name>

1 0

r371 - in trunk: . coser-ui
by chatellier＠users.labs.libre-entreprise.org 06 Dec '10

06 Dec '10

Author: chatellier Date: 2010-12-06 15:07:55 +0000 (Mon, 06 Dec 2010) New Revision: 371 Log: Fix dependencies Modified: trunk/coser-ui/pom.xml trunk/pom.xml Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2010-12-06 14:42:50 UTC (rev 370) +++ trunk/coser-ui/pom.xml 2010-12-06 15:07:55 UTC (rev 371) @@ -85,6 +85,10 @@ <groupId>jfree</groupId> <artifactId>jfreechart</artifactId> </dependency> + <dependency> + <groupId>jfree</groupId> + <artifactId>jcommon</artifactId> + </dependency> </dependencies> <name>Coser :: UI</name> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-06 14:42:50 UTC (rev 370) +++ trunk/pom.xml 2010-12-06 15:07:55 UTC (rev 371) @@ -147,6 +147,13 @@ <version>1.0.12</version> <scope>compile</scope> </dependency> + + <dependency> + <groupId>jfree</groupId> + <artifactId>jcommon</artifactId> + <version>1.0.15</version> + <scope>compile</scope> + </dependency> <dependency> <groupId>org.nuiton</groupId>

1 0

r370 - in trunk/coser-business/src: main/java/fr/ifremer/coser/services main/resources/i18n test/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 06 Dec '10

06 Dec '10

Author: chatellier Date: 2010-12-06 14:42:50 +0000 (Mon, 06 Dec 2010) New Revision: 370 Log: G?\195?\169n?\195?\169ration des graphique en fin de rapport et liens depuis les erreurs Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2010-12-06 14:27:40 UTC (rev 369) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2010-12-06 14:42:50 UTC (rev 370) @@ -28,7 +28,6 @@ import static org.nuiton.i18n.I18n._; import java.awt.Shape; -import java.awt.geom.Ellipse2D; import java.io.File; import java.io.IOException; import java.io.PrintStream; @@ -47,7 +46,6 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.util.ShapeUtils; import org.jfree.chart.ChartUtilities; import org.jfree.chart.JFreeChart; import org.jfree.chart.axis.CategoryAxis; @@ -276,6 +274,9 @@ * Export la liste d'erreurs dans un fichier html avec la liste des graphes * si necessaire. * + * Genere les graphes en fin de fichier avec des liens html pour voir les + * graphes depuis les erreurs. + * * @param project project * @param container data container * @param validationErrors errors list @@ -371,18 +372,18 @@ } out.println(")"); } + + // ajout d'un graph si necessaire + if (error instanceof DiffCatchLengthControlError) { + DiffCatchLengthControlError diffError = (DiffCatchLengthControlError)error; + String species = diffError.getSpecies(); + out.println(" (<a href='#graph" + species + "'>" + _("coser.business.publication.errorgraph") + "</a>)"); + } + String tipMessage = _(error.getTipMessage()); if (StringUtils.isNotEmpty(error.getTipMessage())) { out.println("<p style='font-style:italic'>" + tipMessage + "</p>"); } - // ajout d'un graph si necessaire - if (error instanceof DiffCatchLengthControlError) { - DiffCatchLengthControlError diffError = (DiffCatchLengthControlError)error; - JFreeChart chart = charts.get(diffError.getSpecies()); - File tmpChartImage = File.createTempFile("chart-", ".jpg", imageDirectory); - ChartUtilities.saveChartAsJPEG(tmpChartImage, chart, 800, 400); - out.println("<div><img src='images/" + tmpChartImage.getName() + "' /></div>"); - } out.println("</li>"); } @@ -392,6 +393,18 @@ out.println("</ul>"); } + out.println("<h2>" + _("coser.business.publication.errorgraphs") + "</h2>"); + out.println("<ul>"); + // generation des graphiques + for (Map.Entry<String, JFreeChart> chartEntry : charts.entrySet()) { + JFreeChart chart = chartEntry.getValue(); + File tmpChartImage = File.createTempFile("chart-", ".jpg", imageDirectory); + ChartUtilities.saveChartAsJPEG(tmpChartImage, chart, 800, 400); + out.println("<li><p><a name='graph" + chartEntry.getKey() + "'>" + chartEntry.getKey() + "</a></p>"); + out.println("<img src='images/" + tmpChartImage.getName() + "' /></li>"); + } + out.println("</ul>"); + out.println("</body></html>"); } catch (IOException ex) { Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2010-12-06 14:27:40 UTC (rev 369) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2010-12-06 14:42:50 UTC (rev 370) @@ -64,6 +64,8 @@ coser.business.line=Line coser.business.publication.errorexportlines=Lines coser.business.publication.errorexporttitle=Error report for project %s +coser.business.publication.errorgraph=Graph +coser.business.publication.errorgraphs=Graphs coser.business.publication.logexporttitle=Modifications list for project %s coser.business.result.rsufiResultAlreadyExists=Result %s already exists \! coser.business.selection.notValidatedControl=Not validated control \! Modified: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2010-12-06 14:27:40 UTC (rev 369) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2010-12-06 14:42:50 UTC (rev 370) @@ -64,6 +64,8 @@ coser.business.line=Ligne coser.business.publication.errorexportlines=Lignes coser.business.publication.errorexporttitle=Rapport d'erreur pour le projet %s +coser.business.publication.errorgraph=Graphique +coser.business.publication.errorgraphs=Graphiques coser.business.publication.logexporttitle=Liste des modifications pour le projet %s coser.business.result.rsufiResultAlreadyExists=Le r\u00E9sultat %D existe d\u00E9j\u00E0 \! coser.business.selection.notValidatedControl=Contr\u00F4le non valid\u00E9 \! Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java 2010-12-06 14:27:40 UTC (rev 369) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java 2010-12-06 14:42:50 UTC (rev 370) @@ -175,6 +175,6 @@ Assert.assertTrue(fileContent.indexOf("from \"251.86\" to \"392.98\"") > 0); // clean all - //htmlExport.delete(); + htmlExport.delete(); } }

1 0

r369 - trunk/coser-business/src/main/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 06 Dec '10

06 Dec '10

Author: chatellier Date: 2010-12-06 14:27:40 +0000 (Mon, 06 Dec 2010) New Revision: 369 Log: Extraction du fichier listEspeces.txt egalement lors de la validation simple (demande client) 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 2010-12-06 14:18:13 UTC (rev 368) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-12-06 14:27:40 UTC (rev 369) @@ -898,6 +898,13 @@ finally { IOUtils.closeQuietly(outputStream); } + + // fichier en plus (demande client) + // quand la selection est validé (le fichier list espece (4 listes) + if (selection.isValidated()) { + File listSpeciesFile = new File(selectionDirectory, "ListEspeces" + project.getName() + ".txt"); + fillListSpeciesFile(selection, listSpeciesFile); + } } /** @@ -2206,15 +2213,30 @@ } // extract additionnal data file (selected species) + File listSpeciesFile = new File(projectDirectory, "ListEspeces" + project.getName() + ".txt"); + fillListSpeciesFile(selection, listSpeciesFile); + } + + /** + * Ecrit le fichier ListEspeces.txt dans le fichier specifiés. + * + * Est utilisé lors de l'extraction des données RSUfi et lors de + * la sauvegarde d'une selection validée (demande client). + * + * @param selection selection + * @param ouputFile output file + * @throws CoserBusinessException ection + */ + protected void fillListSpeciesFile(Selection selection, File ouputFile) throws CoserBusinessException { + // extract additionnal data file (selected species) List<String> allSpecies = selection.getSelectedSpecies(); List<String> occDensSpecies = selection.getSelectedSpeciesOccDens(); List<String> sizeAllYearSpecies = selection.getSelectedSpeciesSizeAllYear(); List<String> maturitySpecies = selection.getSelectedSpeciesMaturity(); - File listSpeciesFile = new File(projectDirectory, "ListEspeces" + project.getName() + ".txt"); PrintStream out = null; try { - out = new PrintStream(new BufferedOutputStream(new FileOutputStream(listSpeciesFile))); + out = new PrintStream(new BufferedOutputStream(new FileOutputStream(ouputFile))); // header out.println("Espece\tListAll\tListIdent\tListLong\tListMat");

1 0

r368 - trunk/coser-business/src/main/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 06 Dec '10

06 Dec '10

Author: chatellier Date: 2010-12-06 14:18:13 +0000 (Mon, 06 Dec 2010) New Revision: 368 Log: Laisse les trou apparent sur les series. Agrandi la shape de la premiere series Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2010-12-06 13:48:55 UTC (rev 367) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2010-12-06 14:18:13 UTC (rev 368) @@ -27,6 +27,8 @@ import static org.nuiton.i18n.I18n._; +import java.awt.Shape; +import java.awt.geom.Ellipse2D; import java.io.File; import java.io.IOException; import java.io.PrintStream; @@ -45,6 +47,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.util.ShapeUtils; import org.jfree.chart.ChartUtilities; import org.jfree.chart.JFreeChart; import org.jfree.chart.axis.CategoryAxis; @@ -58,6 +61,7 @@ import org.jfree.chart.renderer.category.LineAndShapeRenderer; import org.jfree.data.category.CategoryDataset; import org.jfree.data.category.DefaultCategoryDataset; +import org.jfree.util.ShapeUtilities; import fr.ifremer.coser.CoserBusinessConfig; import fr.ifremer.coser.CoserBusinessException; @@ -204,16 +208,19 @@ DefaultCategoryDataset dataset = new DefaultCategoryDataset(); for (int year = minYear ; year <= maxYear ; ++year) { Double catchNumber = catchNumbers.get(String.valueOf(year)); - if (catchNumber == null) { - catchNumber = 0.0; - } + + // laisse les abscents de captures apparentes + //if (catchNumber == null) { + // catchNumber = 0.0; + //} dataset.setValue(catchNumber, _(Category.CATCH.getTranslationKey()), (Integer)year); if (lengthNumbers != null) { Double lengthNumber = lengthNumbers.get(String.valueOf(year)); - if (lengthNumber == null) { - lengthNumber = 0.0; - } + // laisse les abscents de taille apparentes + //if (lengthNumber == null) { + // lengthNumber = 0.0; + //} dataset.setValue(lengthNumber, _(Category.LENGTH.getTranslationKey()), (Integer)year); } } @@ -245,6 +252,10 @@ CategoryItemRenderer renderer = new LineAndShapeRenderer(); + // agrandit la 2eme serie + Shape firstShape = ShapeUtilities.createDiamond(5F); + renderer.setSeriesShape(0, firstShape); + // n'affiche pas les nombre sur le graphique //StandardCategoryItemLabelGenerator itemLabelGenerator = new StandardCategoryItemLabelGenerator(); //renderer.setBaseItemLabelGenerator(itemLabelGenerator);

1 0

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

06 Dec '10

Author: chatellier Date: 2010-12-06 13:48:55 +0000 (Mon, 06 Dec 2010) New Revision: 367 Log: G?\195?\169n?\195?\169ration des graphes par menu contextuel. Fix un pb de rafraichissement. 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-06 13:25:56 UTC (rev 366) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-12-06 13:48:55 UTC (rev 367) @@ -207,7 +207,7 @@ <SpecyListModel id="filteredSpecyListModel" onContentsChanged='filteredSpecyLabel.setText(_("coser.ui.selection.details.filteredSpecies", filteredSpecyList.getSelectedIndices().length, filteredSpecyList.getModel().getSize()))'/> <JList id="filteredSpecyList" model="{filteredSpecyListModel}" - onMouseClicked="getHandler().showSpeciesContextMenu(this, event)" + onMouseClicked="getHandler().showFilteredSpeciesContextMenu(this, event)" selectionModel="{new CoserListSelectionModel(filteredSpecyList.getSelectionModel(), filteredSpecyListModel)}" enabled="{isYearsValidated() && isStrataValidated()}" onValueChanged='filteredSpecyLabel.setText(_("coser.ui.selection.details.filteredSpecies", filteredSpecyList.getSelectedIndices().length, filteredSpecyList.getModel().getSize()))' /> @@ -232,14 +232,6 @@ enabled="{getSelectedSpecyList().getSelectedIndex() != -1 && isYearsValidated() && isStrataValidated()}"/> </cell> </row> - <row> - <cell> - <JButton icon="chart_curve.png" - toolTipText="coser.ui.selection.details.displayDiffCatchLengthGraphTip" - onActionPerformed='getHandler().showSelectedSpeciesGraph(this, "SPECIESGRAPH")' - enabled="{getFilteredSpecyList().getSelectedIndex() != -1 && isYearsValidated() && isStrataValidated()}" /> - </cell> - </row> </Table> </cell> <cell weightx="1" weighty="1" fill="both"> @@ -247,6 +239,7 @@ <SpecyListModel id="selectedSpecyListModel" onContentsChanged='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)}" enabled="{isYearsValidated() && isStrataValidated()}" onValueChanged='selectedSpecyLabel.setText(_("coser.ui.selection.details.selectedSpecies", selectedSpecyList.getSelectedIndices().length, selectedSpecyList.getModel().getSize()))'/> 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-06 13:25:56 UTC (rev 366) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-12-06 13:48:55 UTC (rev 367) @@ -45,6 +45,7 @@ import javax.swing.JList; import javax.swing.JMenuItem; import javax.swing.JOptionPane; +import javax.swing.JPanel; import javax.swing.JPopupMenu; import javax.swing.JTextField; import javax.swing.event.ChangeEvent; @@ -321,7 +322,7 @@ * @param view view * @param event mouse event */ - public void showSpeciesContextMenu(final SelectionDetailsView view, MouseEvent event) { + public void showFilteredSpeciesContextMenu(final SelectionDetailsView view, MouseEvent event) { // clic droit if (event.getButton() == MouseEvent.BUTTON3) { @@ -349,6 +350,18 @@ }); popupMenu.add(fusionMenu); } + + if (selectedRows.length > 0) { + // graph + JMenuItem graphMenu = new JMenuItem(_("coser.ui.selection.details.displayDiffCatchLengthGraph")); + graphMenu.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + showSelectedSpeciesGraph(view, view.getFilteredSpecyList()); + } + }); + popupMenu.add(graphMenu); + } // select all menu JMenuItem selectAllMenu = new JMenuItem(_("coser.ui.common.selectAll")); @@ -360,7 +373,9 @@ } }); popupMenu.add(selectAllMenu); - + + + // unselect all menu JMenuItem unselectAllMenu = new JMenuItem(_("coser.ui.common.unselectAll")); unselectAllMenu.addActionListener(new ActionListener() { @@ -374,7 +389,59 @@ popupMenu.show(view.getFilteredSpecyList(), event.getX(), event.getY()); } } + + /** + * Affiche un menu contextuel lors du clic (droit) sur la liste des especes + * sélectionnées. + * + * @param view view + * @param event mouse event + */ + public void showSelectedSpeciesContextMenu(final SelectionDetailsView view, MouseEvent event) { + // clic droit + if (event.getButton() == MouseEvent.BUTTON3) { + + JPopupMenu popupMenu = new JPopupMenu(_("coser.ui.selection.speciesMenuLabel")); + + int[] selectedRows = view.getSelectedSpecyList().getSelectedIndices(); + if (selectedRows.length > 0) { + // graph + JMenuItem graphMenu = new JMenuItem(_("coser.ui.selection.details.displayDiffCatchLengthGraph")); + graphMenu.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + showSelectedSpeciesGraph(view, view.getSelectedSpecyList()); + } + }); + popupMenu.add(graphMenu); + } + + // select all menu + JMenuItem selectAllMenu = new JMenuItem(_("coser.ui.common.selectAll")); + selectAllMenu.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + int size = view.getSelectedSpecyList().getModel().getSize(); + view.getSelectedSpecyList().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.getSelectedSpecyList().getSelectionModel().clearSelection(); + } + }); + popupMenu.add(unselectAllMenu); + + popupMenu.show(view.getSelectedSpecyList(), event.getX(), event.getY()); + } + } + /** * Sauvegarde (ou creer) la sélection (partie details). * @@ -745,27 +812,30 @@ /** * Affiche les graphes de différence captures/taille dans le panel - * reféréncé par {@code cardLayoutContraints}. + * reféréncé par {@code cardLayoutContraints} suivant la liste + * sur laquelle porte l'appel. * * @param view view - * @param cardLayoutContraints + * @param source */ - public void showSelectedSpeciesGraph(SelectionDetailsView view, String cardLayoutContraints) { + public void showSelectedSpeciesGraph(SelectionDetailsView view, JList source) { PublicationService publicationService = view.getContextValue(PublicationService.class); Project project = view.getContextValue(Project.class); Selection selection = view.getContextValue(Selection.class); - Object[] selectedFilteredSpecies = view.getFilteredSpecyList().getSelectedValues(); + Object[] selectedSpecies = source.getSelectedValues(); Set<String> graphSpecies = new HashSet<String>(); - for (Object selectedFilteredSpecy : selectedFilteredSpecies) { - graphSpecies.add((String)selectedFilteredSpecy); + for (Object selectedSingleSpecies : selectedSpecies) { + graphSpecies.add((String)selectedSingleSpecies); } Map<String, JFreeChart> chartsMap = publicationService.getCompareCatchLengthGraph(project, selection, graphSpecies); Collection<JFreeChart> charts = chartsMap.values(); - - view.getSpeciesGraphPanel().removeAll(); + + // add all this graphes in panel + JPanel graphPanel = view.getSpeciesGraphPanel(); + graphPanel.removeAll(); Iterator<JFreeChart> itCharts = charts.iterator(); int chartIndex = 0; while (itCharts.hasNext()) { @@ -777,7 +847,9 @@ GridBagConstraints.BOTH, new Insets(0, 3, 3, 3), 0, 0)); chartIndex++; } - view.getDetailDecisionPanelLayout().show(view.getDetailDecisionPanel(), cardLayoutContraints); + view.getDetailDecisionPanelLayout().show(view.getDetailDecisionPanel(), "SPECIESGRAPH"); + view.getDetailDecisionPanel().validate(); + view.getDetailDecisionPanel().repaint(); } /** 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-06 13:25:56 UTC (rev 366) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-12-06 13:48:55 UTC (rev 367) @@ -153,7 +153,7 @@ coser.ui.selection.details.comment=Comments \: coser.ui.selection.details.dates=Years \: coser.ui.selection.details.description=Description \: -coser.ui.selection.details.displayDiffCatchLengthGraphTip=Display selected species's comparison catch/length graphs. +coser.ui.selection.details.displayDiffCatchLengthGraph=Comparison catch/length graphs coser.ui.selection.details.filteredSpecies=Filtered species (%d/%d) \: coser.ui.selection.details.name=Selection name \: coser.ui.selection.details.removeFromSelectedListTip=Remove selected species from selected species list 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-06 13:25:56 UTC (rev 366) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-12-06 13:48:55 UTC (rev 367) @@ -153,7 +153,7 @@ coser.ui.selection.details.comment=Commentaire \: coser.ui.selection.details.dates=Ann\u00E9es \: coser.ui.selection.details.description=Description \: -coser.ui.selection.details.displayDiffCatchLengthGraphTip=Affiche les graphiques des diff\u00E9rences captures/tailles pour les esp\u00E8ces s\uFFFDlectionn\uFFFDes. +coser.ui.selection.details.displayDiffCatchLengthGraph=Graphiques des diff\u00E9rences captures/tailles coser.ui.selection.details.filteredSpecies=Esp\u00E8ces filtr\u00E9es (%d/%d) \: coser.ui.selection.details.name=Nom de la s\u00E9lection \: coser.ui.selection.details.removeFromSelectedListTip=Retire les esp\u00E8ces s\u00E9lectionn\u00E9es de la liste des esp\u00E8ces s\u00E9lectionn\u00E9es

1 0

r366 - in trunk: . coser-web coser-web/src/main/java/fr/ifremer/coser/web coser-web/src/main/java/fr/ifremer/coser/web/actions coser-web/src/main/resources coser-web/src/main/resources/i18n coser-web/src/main/webapp/WEB-INF coser-web/src/main/webapp/WEB-INF/content
by chatellier＠users.labs.libre-entreprise.org 06 Dec '10

06 Dec '10

Author: chatellier Date: 2010-12-06 13:25:56 +0000 (Mon, 06 Dec 2010) New Revision: 366 Log: Begin strut2 code (hello world) Added: trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/UploadResultAction.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/WelcomeUserAction.java trunk/coser-web/src/main/resources/i18n/ trunk/coser-web/src/main/resources/i18n/coser-web_en_GB.properties trunk/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties trunk/coser-web/src/main/webapp/WEB-INF/content/ trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/upload-result-success.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/upload-result.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/welcome-user.jsp Removed: trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserServlet.java Modified: trunk/coser-web/pom.xml trunk/coser-web/src/main/webapp/WEB-INF/web.xml trunk/pom.xml Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2010-12-06 13:24:48 UTC (rev 365) +++ trunk/coser-web/pom.xml 2010-12-06 13:25:56 UTC (rev 366) @@ -54,9 +54,20 @@ <build> <finalName>coser-${project.version}</finalName> -  <plugins> <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> <configuration> Deleted: trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserServlet.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserServlet.java 2010-12-06 13:24:48 UTC (rev 365) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserServlet.java 2010-12-06 13:25:56 UTC (rev 366) @@ -1,56 +0,0 @@ -/* - * #%L - * - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 Codelutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package fr.ifremer.coser.web; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * Coser main servlet. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class CoserServlet extends HttpServlet { - - /** serialVersionUID. */ - private static final long serialVersionUID = 8814522533745401133L; - - @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) - throws ServletException, IOException { - resp.getWriter().print("Coser : It's works"); - } - - -} Added: trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java (rev 0) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java 2010-12-06 13:25:56 UTC (rev 366) @@ -0,0 +1,91 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package fr.ifremer.coser.web; + +import static org.nuiton.i18n.I18n._; + +import java.io.File; + +import fr.ifremer.coser.CoserBusinessConfig; + +/** + * Coser web configuration. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class CoserWebConfig extends CoserBusinessConfig { + + public CoserWebConfig() { + // init configuration with default options + for (CoserWebOption o : CoserWebOption.values()) { + if (o.defaultValue != null) { + setDefaultOption(o.key, o.defaultValue); + } + } + } + + /** + * Get coser web result directory. + * + * @return + */ + public File getResultDirectory() { + File result = getOptionAsFile(CoserWebOption.RESULT_DIRECTORY.key); + return result; + } + + public enum CoserWebOption { + CONFIG_FILE(CONFIG_FILE_NAME, _("coser.config.config.file.description"), "coserweb.properties"), + + RESULT_DIRECTORY("coser.web.directory", _("coser.config.config.file.description"), "${java.io.tmpdir}" + File.separator + "coserweb"); + + protected String key; + protected String description; + protected String defaultValue; + + private CoserWebOption(String key, String description, String defaultValue) { + this.key = key; + this.description = description; + this.defaultValue = defaultValue; + } + + public String getDefaultValue() { + return defaultValue; + } + + public String getDescription() { + return description; + } + + public String getKey() { + return key; + } + } +} Property changes on: trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConfig.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/UploadResultAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/UploadResultAction.java (rev 0) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/UploadResultAction.java 2010-12-06 13:25:56 UTC (rev 366) @@ -0,0 +1,76 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package fr.ifremer.coser.web.actions; + +import java.io.File; + +import com.opensymphony.xwork2.ActionSupport; + +/** + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class UploadResultAction extends ActionSupport { + + /** serialVersionUID. */ + private static final long serialVersionUID = 3887268253160622587L; + + protected File resultFile; + + protected File resultFileFileName; + + public void setResultFile(File resultFile) { + this.resultFile = resultFile; + } + + public File getResultFile() { + return resultFile; + } + + public File getResultFileFileName() { + return resultFileFileName; + } + + public void setResultFileFileName(File resultFileFileName) { + this.resultFileFileName = resultFileFileName; + } + + //@Action(params={"allowedTypes", "application/zip"}) + public String execute() { + if (resultFile == null) { + System.out.println("File size = " + null); + return INPUT; + } + else { + System.out.println("File size = " + resultFile.length()); + return SUCCESS; + } + } +} Property changes on: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/UploadResultAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/WelcomeUserAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/WelcomeUserAction.java (rev 0) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/WelcomeUserAction.java 2010-12-06 13:25:56 UTC (rev 366) @@ -0,0 +1,72 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package fr.ifremer.coser.web.actions; + +import org.apache.struts2.convention.annotation.Action; +import org.apache.struts2.convention.annotation.Namespace; +import org.apache.struts2.convention.annotation.Result; +import org.apache.struts2.convention.annotation.ResultPath; + +import com.opensymphony.xwork2.ActionSupport; + +/** + * TODO add comment here. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class WelcomeUserAction extends ActionSupport { + + /** serialVersionUID. */ + private static final long serialVersionUID = 3887268253160622587L; + + private String userName; + private String message; + + public String execute() { + message = "Welcome " + userName; + return SUCCESS; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public void setMessage(String message) { + this.message = message; + } + + public String getUserName() { + return userName; + } + + public String getMessage() { + return message; + } +} Property changes on: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/WelcomeUserAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/coser-web/src/main/resources/i18n/coser-web_en_GB.properties =================================================================== --- trunk/coser-web/src/main/resources/i18n/coser-web_en_GB.properties (rev 0) +++ trunk/coser-web/src/main/resources/i18n/coser-web_en_GB.properties 2010-12-06 13:25:56 UTC (rev 366) @@ -0,0 +1 @@ +coser.config.config.file.description= Added: trunk/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties =================================================================== --- trunk/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties (rev 0) +++ trunk/coser-web/src/main/resources/i18n/coser-web_fr_FR.properties 2010-12-06 13:25:56 UTC (rev 366) @@ -0,0 +1 @@ +coser.config.config.file.description= Added: trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp (rev 0) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp 2010-12-06 13:25:56 UTC (rev 366) @@ -0,0 +1,20 @@ +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<%@taglib uri="/struts-tags" prefix="s" %> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <title>Hello World</title> + </head> + <body> + <s:form action="upload-result" method="post" enctype="multipart/form-data"> + <s:actionerror /> + <s:file name="resultFile" label="Result archive" /> + <s:submit /> + </s:form> + <s:form action="welcome-user"> + <s:textfield name="userName" label="User Name" /> + <s:submit /> + </s:form> + </body> +</html> \ No newline at end of file Added: trunk/coser-web/src/main/webapp/WEB-INF/content/upload-result-success.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/upload-result-success.jsp (rev 0) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/upload-result-success.jsp 2010-12-06 13:25:56 UTC (rev 366) @@ -0,0 +1,15 @@ +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<%@taglib uri="/struts-tags" prefix="s" %> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <title>Hello World</title> + </head> + <body> + <s:form action="upload-result" method="post" enctype="multipart/form-data"> + <s:file name="resultFile" label="Result archive" /> + <s:submit /> + </s:form> + </body> +</html> \ No newline at end of file Added: trunk/coser-web/src/main/webapp/WEB-INF/content/upload-result.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/upload-result.jsp (rev 0) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/upload-result.jsp 2010-12-06 13:25:56 UTC (rev 366) @@ -0,0 +1,17 @@ +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<%@taglib uri="/struts-tags" prefix="s" %> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <title>Hello World</title> + </head> + <body> + Success !!! + <s:form action="upload-result" method="post" enctype="multipart/form-data"> + <s:actionerror /> + <s:file name="resultFile" label="Result archive" /> + <s:submit /> + </s:form> + </body> +</html> \ No newline at end of file Added: trunk/coser-web/src/main/webapp/WEB-INF/content/welcome-user.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/welcome-user.jsp (rev 0) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/welcome-user.jsp 2010-12-06 13:25:56 UTC (rev 366) @@ -0,0 +1,12 @@ +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<%@taglib uri="/struts-tags" prefix="s" %> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <title>Welcome User</title> + </head> + <body> + <h1>Hi : ${message}</h1> + </body> +</html> \ No newline at end of file Modified: trunk/coser-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/web.xml 2010-12-06 13:24:48 UTC (rev 365) +++ trunk/coser-web/src/main/webapp/WEB-INF/web.xml 2010-12-06 13:25:56 UTC (rev 366) @@ -23,20 +23,37 @@ #L% --> -<web-app version="3.0" +<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + <display-name>Coser</display-name> - - <servlet> - <servlet-name>coser</servlet-name> - <servlet-class>fr.ifremer.coser.web.CoserServlet</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>coser</servlet-name> - <url-pattern>/coser</url-pattern> - </servlet-mapping> +  + + <filter> + <filter-name>struts2</filter-name> + <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class> + <init-param> + <param-name>struts.convention.action.packages</param-name> + <param-value>fr.ifremer.coser.web</param-value> + </init-param> +  + <init-param> + <param-name>struts.devMode</param-name> + <param-value>true</param-value> + </init-param> + </filter> + + <filter-mapping> + <filter-name>struts2</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + </web-app> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-06 13:24:48 UTC (rev 365) +++ trunk/pom.xml 2010-12-06 13:25:56 UTC (rev 366) @@ -172,21 +172,21 @@ <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> - <version>2.2.1</version> + <version>${struts.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-convention-plugin</artifactId> - <version>2.2.1</version> + <version>${struts.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> - <version>2.2.1</version> + <version>${struts.version}</version> <scope>compile</scope> </dependency> @@ -244,6 +244,7 @@  <jaxx.version>2.2.4-SNAPSHOT</jaxx.version> <i18n.version>2.0</i18n.version> + <struts.version>2.2.1</struts.version> </properties> <scm>

1 0

r365 - in trunk/coser-web/src/site: . en
by chatellier＠users.labs.libre-entreprise.org 06 Dec '10

06 Dec '10

Author: chatellier Date: 2010-12-06 13:24:48 +0000 (Mon, 06 Dec 2010) New Revision: 365 Log: Update license Modified: trunk/coser-web/src/site/en/index.rst trunk/coser-web/src/site/index.rst trunk/coser-web/src/site/site_en.xml trunk/coser-web/src/site/site_fr.xml Modified: trunk/coser-web/src/site/en/index.rst =================================================================== --- trunk/coser-web/src/site/en/index.rst 2010-12-06 13:24:21 UTC (rev 364) +++ trunk/coser-web/src/site/en/index.rst 2010-12-06 13:24:48 UTC (rev 365) @@ -1,2 +1,25 @@ +.. - +.. * #%L +.. * Coser :: Web +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2010 Ifremer, Codelutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero 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 Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Coser :: Web ============ \ No newline at end of file Modified: trunk/coser-web/src/site/index.rst =================================================================== --- trunk/coser-web/src/site/index.rst 2010-12-06 13:24:21 UTC (rev 364) +++ trunk/coser-web/src/site/index.rst 2010-12-06 13:24:48 UTC (rev 365) @@ -1,2 +1,25 @@ +.. - +.. * #%L +.. * Coser :: Web +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2010 Ifremer, Codelutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero 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 Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Coser :: Web ============ \ No newline at end of file Modified: trunk/coser-web/src/site/site_en.xml =================================================================== --- trunk/coser-web/src/site/site_en.xml 2010-12-06 13:24:21 UTC (rev 364) +++ trunk/coser-web/src/site/site_en.xml 2010-12-06 13:24:48 UTC (rev 365) @@ -9,18 +9,17 @@ Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. + it under the terms of the GNU Affero 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 Lesser Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU General Lesser Public - License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> Modified: trunk/coser-web/src/site/site_fr.xml =================================================================== --- trunk/coser-web/src/site/site_fr.xml 2010-12-06 13:24:21 UTC (rev 364) +++ trunk/coser-web/src/site/site_fr.xml 2010-12-06 13:24:48 UTC (rev 365) @@ -9,18 +9,17 @@ Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. + it under the terms of the GNU Affero 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 Lesser Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU General Lesser Public - License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. #L% -->

1 0

r364 - trunk/coser-web/src/license
by chatellier＠users.labs.libre-entreprise.org 06 Dec '10

06 Dec '10

Author: chatellier Date: 2010-12-06 13:24:21 +0000 (Mon, 06 Dec 2010) New Revision: 364 Log: Update license Modified: trunk/coser-web/src/license/THIRD-PARTY.properties Modified: trunk/coser-web/src/license/THIRD-PARTY.properties =================================================================== --- trunk/coser-web/src/license/THIRD-PARTY.properties 2010-12-06 10:11:28 UTC (rev 363) +++ trunk/coser-web/src/license/THIRD-PARTY.properties 2010-12-06 13:24:21 UTC (rev 364) @@ -1,44 +1,26 @@ -### -# #%L -# Coser :: Web -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero 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 Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache 2 +# - Apache Software License - Version 2.0 # - Apache Software License, Version 2.0 # - BSD License # - Common Public License Version 1.0 +# - Eclipse Public License - Version 1.0 # - GNU Lesser General Public Licence +# - GNU Lesser General Public License # - General Public License (GPL) v 3.0 +# - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - License Agreement for Java(TM) Servlet API Specification Interface Classes # - The Apache Software License, Version 2.0 +# - The OpenSymphony Software License 1.1 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue Nov 02 15:27:11 CET 2010 -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 -ognl--ognl--3.0=The OpenSymphony Software License 1.1 +#Fri Dec 03 11:47:54 CET 2010 +commons-primitives--commons-primitives--1.0--jar=Apache Software License, Version 2.0 +javassist--javassist--3.8.0.GA--jar=GNU Lesser General Public License +javax.servlet--servlet-api--2.5--jar=License Agreement for Java(TM) Servlet API Specification Interface Classes +ognl--ognl--3.0--jar=The OpenSymphony Software License 1.1

1 0