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

r1015 - trunk
by echatellier＠users.forge.codelutin.com 17 Jul '12

17 Jul '12

Author: echatellier Date: 2012-07-17 09:09:32 +0200 (Tue, 17 Jul 2012) New Revision: 1015 Url: http://forge.codelutin.com/repositories/revision/coser/1015 Log: Fix build from scratch Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-16 16:14:52 UTC (rev 1014) +++ trunk/pom.xml 2012-07-17 07:09:32 UTC (rev 1015) @@ -420,4 +420,11 @@ </plugins> </pluginManagement> </build> + + <repositories> + <repository> + <id>nuiton-public</id> + <url>http://nexus.nuiton.org/nexus/content/groups/public</url> + </repository> + </repositories> </project>

1 0

r1014 - trunk
by echatellier＠users.forge.codelutin.com 16 Jul '12

16 Jul '12

Author: echatellier Date: 2012-07-16 18:14:52 +0200 (Mon, 16 Jul 2012) New Revision: 1014 Url: http://forge.codelutin.com/repositories/revision/coser/1014 Log: Update to struts 2.3.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-16 16:01:56 UTC (rev 1013) +++ trunk/pom.xml 2012-07-16 16:14:52 UTC (rev 1014) @@ -361,7 +361,7 @@ <jaxx.version>2.5.1</jaxx.version> <i18n.version>2.4.1</i18n.version>  - <struts.version>2.2.3</struts.version> + <struts.version>2.3.3</struts.version> </properties> <scm>

1 0

r1013 - in trunk: coser-business/src/main/java/fr/ifremer/coser/services coser-business/src/main/resources/i18n coser-business/src/test/java/fr/ifremer/coser/services coser-ui/src/main/java/fr/ifremer/coser/ui/maps
by echatellier＠users.forge.codelutin.com 16 Jul '12

16 Jul '12

Author: echatellier Date: 2012-07-16 18:01:56 +0200 (Mon, 16 Jul 2012) New Revision: 1013 Url: http://forge.codelutin.com/repositories/revision/coser/1013 Log: refs #1323: fix tests fixes #1324: ajout de la profondeur sur la carte Removed: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationLayer.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.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/ProjectServiceTest.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/CoserMap.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationHandler.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2012-07-16 15:20:13 UTC (rev 1012) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2012-07-16 16:01:56 UTC (rev 1013) @@ -1963,10 +1963,10 @@ * * @param project project * @param container data container - * @param filterSpecyType filterSpecyType + * @param filterSpecyType filterSpecyType (can be null or empty) * @return species */ - public List<String> getProjectSpecies(Project project, AbstractDataContainer container, List<String> filterSpecyType) { + public List<String> getProjectSpecies(Project project, AbstractDataContainer container, Collection<String> filterSpecyType) { // first get species with trait list List<String> result = new ArrayList<String>(); @@ -2001,7 +2001,7 @@ String[] tuple = itTypeSpecies.next(); String specyType = tuple[0]; - if (filterSpecyType.contains(specyType)) { + if (filterSpecyType != null && filterSpecyType.contains(specyType)) { Integer iMinNumSys = Integer.valueOf(tuple[2]); Integer iMaxNumSys = Integer.valueOf(tuple[3]); mapType.put(specyType, new Integer[]{iMinNumSys, iMaxNumSys}); @@ -2922,6 +2922,7 @@ String stratum = tuple[Haul.INDEX_STRATUM]; String year = tuple[Haul.INDEX_YEAR]; String haul = tuple[Haul.INDEX_HAUL]; + String depth = tuple[Haul.INDEX_DEPTH]; String lat = tuple[Haul.INDEX_LAT]; String longi = tuple[Haul.INDEX_LONG]; @@ -2929,7 +2930,7 @@ double dlat = Double.parseDouble(lat); double dlong = Double.parseDouble(longi); - String name = _("coser.business.map.haulname", stratum, year, haul); + String name = _("coser.business.map.haulname", stratum, year, haul, depth); int serieIndex = serieCache.indexOf(strata); Coordinate coordinate = new Coordinate(serieIndex, name, dlat, dlong); hauls.add(coordinate); 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 2012-07-16 15:20:13 UTC (rev 1012) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2012-07-16 16:01:56 UTC (rev 1013) @@ -100,7 +100,7 @@ coser.business.extract.projectName=Project name \: coser.business.extract.selectionName=Selection name \: coser.business.line=Line -coser.business.map.haulname=Strata \: %s, Year \: %s, Haul \: %s +coser.business.map.haulname=Strata \: %s\nYear \: %s\nHaul \: %s\nDepth \: %s coser.business.matrix.density=Density coser.business.matrix.lengthstructure=Length structures coser.business.matrix.occurrence=Occurrence 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 2012-07-16 15:20:13 UTC (rev 1012) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2012-07-16 16:01:56 UTC (rev 1013) @@ -100,7 +100,7 @@ coser.business.extract.projectName=Nom du project \: coser.business.extract.selectionName=Nom de la sélection \: coser.business.line=Ligne -coser.business.map.haulname=Strate \: %s, Année \: %s, Trait \: %s +coser.business.map.haulname=Strate \: %s\nAnnée \: %s\nTrait \: %s\nProfMoy \: %s coser.business.matrix.density=Densité coser.business.matrix.lengthstructure=Structures en taille coser.business.matrix.occurrence=Occurrence 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 2012-07-16 15:20:13 UTC (rev 1012) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2012-07-16 16:01:56 UTC (rev 1013) @@ -34,6 +34,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.Set; import org.junit.Assert; import org.junit.Before; @@ -280,38 +281,41 @@ List<String> years2009 = new ArrayList<String>(); years2009.add("2009"); + // get all species type + Set<String> allPpeciesType = projectService.getProjectSpeciesTypes(project).keySet(); + // all data List<String> allStrata = projectService.filterDataYearsAndGetStrata(project, selection, years20102011); projectService.filterDataStrata(project, selection, allStrata); - List<String> species = projectService.getProjectSpecies(project, selection, null); + List<String> species = projectService.getProjectSpecies(project, selection, allPpeciesType); Assert.assertEquals(4, species.size()); // data in 2011 projectService.loadControlDataToSelection(project, selection); allStrata = projectService.filterDataYearsAndGetStrata(project, selection, years2011); projectService.filterDataStrata(project, selection, allStrata); - species = projectService.getProjectSpecies(project, selection, null); + species = projectService.getProjectSpecies(project, selection, allPpeciesType); Assert.assertEquals(4, species.size()); // all strata but no data for years projectService.loadControlDataToSelection(project, selection); allStrata = projectService.filterDataYearsAndGetStrata(project, selection, years2009); projectService.filterDataStrata(project, selection, allStrata); - species = projectService.getProjectSpecies(project, selection, null); + species = projectService.getProjectSpecies(project, selection, allPpeciesType); Assert.assertEquals(0, species.size()); // test with no strata projectService.loadControlDataToSelection(project, selection); allStrata = projectService.filterDataYearsAndGetStrata(project, selection, years20102011); projectService.filterDataStrata(project, selection, new ArrayList<String>()); - species = projectService.getProjectSpecies(project, selection, null); + species = projectService.getProjectSpecies(project, selection, allPpeciesType); Assert.assertEquals(0, species.size()); // test with only one stratum projectService.loadControlDataToSelection(project, selection); allStrata = projectService.filterDataYearsAndGetStrata(project, selection, years20102011); projectService.filterDataStrata(project, selection, Collections.singletonList("STR6")); - species = projectService.getProjectSpecies(project, selection, null); + species = projectService.getProjectSpecies(project, selection, allPpeciesType); Assert.assertEquals(4, species.size()); } 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 2012-07-16 15:20:13 UTC (rev 1012) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/CoserMap.java 2012-07-16 16:01:56 UTC (rev 1013) @@ -176,7 +176,7 @@ removeMapComponent(haulLocationLayer); } HaulLocationHandler locationHandler = new HaulLocationHandler(hauls); - haulLocationLayer = new HaulLocationLayer(); + haulLocationLayer = new LocationLayer(); haulLocationLayer.setLocationHandlers(new LocationHandler[]{locationHandler}); haulLocationLayer.addInfoDisplayListener(informationDelegator); addMapComponent(haulLocationLayer); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationHandler.java 2012-07-16 15:20:13 UTC (rev 1012) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationHandler.java 2012-07-16 16:01:56 UTC (rev 1013) @@ -64,7 +64,6 @@ public HaulLocationHandler(List<Coordinate> coordinates) { this.coordinates = coordinates; - setLocationColor(Color.GREEN); setShowLocations(true); } @@ -80,7 +79,9 @@ int serie = coordinate.getSerie(); serie = serie % markerColors.length; - Location location = new BasicLocation(coordinate.getLatitude(), coordinate.getLongitude(), coordinate.getName(), null); + // use html for multiple line tooltip + String htmlName = "<html>" + coordinate.getName().replaceAll("\n", "<br>") + "</html>"; + Location location = new BasicLocation(coordinate.getLatitude(), coordinate.getLongitude(), htmlName, null); location.setLocationHandler(this); location.getLocationMarker().setLinePaint(markerColors[serie]); graphicList.add(location); Deleted: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationLayer.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationLayer.java 2012-07-16 15:20:13 UTC (rev 1012) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationLayer.java 2012-07-16 16:01:56 UTC (rev 1013) @@ -1,49 +0,0 @@ -/* - * #%L - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Codelutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package fr.ifremer.coser.ui.maps; - -import com.bbn.openmap.layer.location.LocationLayer; - -/** - * Haul location layer. - * - * See http://openmap.bbn.com/mailArchives/openmap-users/2004-06/2869.html - * for tooltip details. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class HaulLocationLayer extends LocationLayer { - - /** serialVersionUID. */ - private static final long serialVersionUID = -4011021347597993208L; - - public HaulLocationLayer() { - //setUseDeclutterMatrix(true); - //setDeclutterMatrix(new DeclutterMatrix()); - } -}

1 0

r1012 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui
by echatellier＠users.forge.codelutin.com 16 Jul '12

16 Jul '12

Author: echatellier Date: 2012-07-16 17:20:13 +0200 (Mon, 16 Jul 2012) New Revision: 1012 Url: http://forge.codelutin.com/repositories/revision/coser/1012 Log: Remove commit error Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2012-07-16 15:11:37 UTC (rev 1011) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2012-07-16 15:20:13 UTC (rev 1012) @@ -479,7 +479,7 @@ try { view.setSelection(selection); // for freize view.setContextValue(selection); - view.getParentContainer(CoserFrame.class).getHandler().showSelectionView(selection, selectedTab); + SelectionView selectionView = new SelectionView(view); selectionView.setSelection(selection);

1 0

r1011 - in trunk: coser-business/src/main/java/fr/ifremer/coser/services coser-ui/src/main/java/fr/ifremer/coser/ui/selection
by echatellier＠users.forge.codelutin.com 16 Jul '12

16 Jul '12

Author: echatellier Date: 2012-07-16 17:11:37 +0200 (Mon, 16 Jul 2012) New Revision: 1011 Url: http://forge.codelutin.com/repositories/revision/coser/1011 Log: fixes #1323: Modifier le filtre par type Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 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/java/fr/ifremer/coser/ui/selection/SelectionView.jaxx Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2012-07-16 14:47:51 UTC (rev 1010) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2012-07-16 15:11:37 UTC (rev 1011) @@ -1981,65 +1981,62 @@ } } - // third, filter specy list with specy types filter - if (CollectionUtils.isNotEmpty(filterSpecyType)) { - // load map SpecyName > numSys - Map<String, Integer> map = new HashMap<String, Integer>(); - Iterator<String[]> refTaxIterator = project.getRefTaxSpecies().iterator(true); - while (refTaxIterator.hasNext()) { - // "C_Perm";"NumSys";"NivSys";"C_VALIDE";"L_VALIDE";"AA_VALIDE";"C_TxPère";"Taxa" - String[] tuple = refTaxIterator.next(); - String specyName = tuple[3]; - Integer iNumSys = Integer.valueOf(tuple[1]); - map.put(specyName, iNumSys); - } + // load map SpecyName > numSys + Map<String, Integer> map = new HashMap<String, Integer>(); + Iterator<String[]> refTaxIterator = project.getRefTaxSpecies().iterator(true); + while (refTaxIterator.hasNext()) { + // "C_Perm";"NumSys";"NivSys";"C_VALIDE";"L_VALIDE";"AA_VALIDE";"C_TxPère";"Taxa" + String[] tuple = refTaxIterator.next(); + String specyName = tuple[3]; + Integer iNumSys = Integer.valueOf(tuple[1]); + map.put(specyName, iNumSys); + } - // load specy type map SpecyTypeName > [min, max] - // iteration sur les type d'especes - Map<String, Integer[]> mapType = new HashMap<String, Integer[]>(); - Iterator<String[]> itTypeSpecies = project.getTypeEspeces().iterator(true); - while (itTypeSpecies.hasNext()) { - // "Types";"Commentaire";"NumSys min";"NumSys max","Code" - String[] tuple = itTypeSpecies.next(); - String specyType = tuple[0]; + // load specy type map SpecyTypeName > [min, max] + // iteration sur les type d'especes + Map<String, Integer[]> mapType = new HashMap<String, Integer[]>(); + Iterator<String[]> itTypeSpecies = project.getTypeEspeces().iterator(true); + while (itTypeSpecies.hasNext()) { + // "Types";"Commentaire";"NumSys min";"NumSys max","Code" + String[] tuple = itTypeSpecies.next(); + String specyType = tuple[0]; - if (filterSpecyType.contains(specyType)) { - Integer iMinNumSys = Integer.valueOf(tuple[2]); - Integer iMaxNumSys = Integer.valueOf(tuple[3]); - mapType.put(specyType, new Integer[]{iMinNumSys, iMaxNumSys}); - } + if (filterSpecyType.contains(specyType)) { + Integer iMinNumSys = Integer.valueOf(tuple[2]); + Integer iMaxNumSys = Integer.valueOf(tuple[3]); + mapType.put(specyType, new Integer[]{iMinNumSys, iMaxNumSys}); } + } + + // iteration sur les especes trouvées + Iterator<String> itSpecies = result.iterator(); + while (itSpecies.hasNext()) { + String specy = itSpecies.next(); + Integer specyNumSys = map.get(specy); - // iteration sur les especes trouvées - Iterator<String> itSpecies = result.iterator(); - while (itSpecies.hasNext()) { - String specy = itSpecies.next(); - Integer specyNumSys = map.get(specy); - - if (specyNumSys == null) { - // ca ne peut pas arriver, ce cs est valider - // par un control - if (log.isWarnEnabled()) { - log.warn("Can't find specy " + specy + " in reftax"); - } - itSpecies.remove(); - continue; + if (specyNumSys == null) { + // ca ne peut pas arriver, ce cs est valider + // par un control + if (log.isWarnEnabled()) { + log.warn("Can't find specy " + specy + " in reftax"); } + itSpecies.remove(); + continue; + } - // test si le numsys est dans les bornes d'un - // des type d'espece demandé - boolean foundInFilter = false; - for (Integer[] bornes : mapType.values()) { - if (specyNumSys >= bornes[0] - && specyNumSys <= bornes[1]){ - foundInFilter = true; - } + // test si le numsys est dans les bornes d'un + // des type d'espece demandé + boolean foundInFilter = false; + for (Integer[] bornes : mapType.values()) { + if (specyNumSys >= bornes[0] + && specyNumSys <= bornes[1]){ + foundInFilter = true; } - - if (!foundInFilter) { - itSpecies.remove(); - } } + + if (!foundInFilter) { + itSpecies.remove(); + } } Collections.sort(result); 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 2012-07-16 14:47:51 UTC (rev 1010) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2012-07-16 15:11:37 UTC (rev 1011) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2010 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2012-07-16 14:47:51 UTC (rev 1010) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2012-07-16 15:11:37 UTC (rev 1011) @@ -394,6 +394,10 @@ view.getStataMapInfo().setMap(view.getStrataMap().getMapBean()); view.getStataMapInfo().setShowCoordsInfoLine(true); view.getStataMapInfo().setShowInfoLine(true); + + // fill species type selection by default + int count = view.getTypeSpeciesModel().getSize(); + view.getTypeSpeciesList().addSelectionInterval(0, count - 1); } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionView.jaxx 2012-07-16 14:47:51 UTC (rev 1010) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionView.jaxx 2012-07-16 15:11:37 UTC (rev 1011) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2010 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as

1 0

r1010 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui
by echatellier＠users.forge.codelutin.com 16 Jul '12

16 Jul '12

Author: echatellier Date: 2012-07-16 16:47:51 +0200 (Mon, 16 Jul 2012) New Revision: 1010 Url: http://forge.codelutin.com/repositories/revision/coser/1010 Log: fixes #1330 Correction du probl?\195?\168me d'affichage ?\195?\160 l'ouverture Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/HomeView.jaxx Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/HomeView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/HomeView.jaxx 2012-07-16 14:14:39 UTC (rev 1009) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/HomeView.jaxx 2012-07-16 14:47:51 UTC (rev 1010) @@ -32,12 +32,12 @@ <Table constraints="BorderLayout.CENTER"> <row> - <cell weightx="1" weighty="1" anchor="south"> + <cell weightx="1" weighty="1" anchor="south" fill="horizontal"> <JLabel icon="logo300.png" horizontalAlignment="{SwingConstants.CENTER}" /> </cell> </row> <row> - <cell weightx="1" weighty="1" anchor="north"> + <cell weightx="1" weighty="1" anchor="north" fill="horizontal"> <JLabel text='coser.ui.home.text' horizontalAlignment="{SwingConstants.CENTER}" /> </cell> </row>

1 0

r1009 - in trunk/src/site: . en/rst en/rst/user rst rst/devel rst/user
by echatellier＠users.forge.codelutin.com 16 Jul '12

16 Jul '12

Author: echatellier Date: 2012-07-16 16:14:39 +0200 (Mon, 16 Jul 2012) New Revision: 1009 Url: http://forge.codelutin.com/repositories/revision/coser/1009 Log: Update website generation Modified: trunk/src/site/en/rst/download.rst trunk/src/site/en/rst/index.rst trunk/src/site/en/rst/user/configuration.rst trunk/src/site/en/rst/user/controls.rst trunk/src/site/en/rst/user/dataformat.rst trunk/src/site/en/rst/user/faq.rst trunk/src/site/en/rst/user/guide_control.rst trunk/src/site/en/rst/user/guide_listcontrols.rst trunk/src/site/en/rst/user/guide_project.rst trunk/src/site/en/rst/user/guide_results.rst trunk/src/site/en/rst/user/guide_selection.rst trunk/src/site/rst/devel/directory.rst trunk/src/site/rst/devel/struts.rst trunk/src/site/rst/download.rst trunk/src/site/rst/index.rst trunk/src/site/rst/user/configuration.rst trunk/src/site/rst/user/controls.rst trunk/src/site/rst/user/dataformat.rst trunk/src/site/rst/user/faq.rst trunk/src/site/rst/user/guide_control.rst trunk/src/site/rst/user/guide_listcontrols.rst trunk/src/site/rst/user/guide_project.rst trunk/src/site/rst/user/guide_results.rst trunk/src/site/rst/user/guide_selection.rst trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/src/site/en/rst/download.rst =================================================================== --- trunk/src/site/en/rst/download.rst 2012-07-16 13:46:59 UTC (rev 1008) +++ trunk/src/site/en/rst/download.rst 2012-07-16 14:14:39 UTC (rev 1009) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric +.. * Copyright (C) 2010 - 2012 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 @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Launch ====== Modified: trunk/src/site/en/rst/index.rst =================================================================== --- trunk/src/site/en/rst/index.rst 2012-07-16 13:46:59 UTC (rev 1008) +++ trunk/src/site/en/rst/index.rst 2012-07-16 14:14:39 UTC (rev 1009) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric +.. * Copyright (C) 2010 - 2012 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 @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Coser ===== Modified: trunk/src/site/en/rst/user/configuration.rst =================================================================== --- trunk/src/site/en/rst/user/configuration.rst 2012-07-16 13:46:59 UTC (rev 1008) +++ trunk/src/site/en/rst/user/configuration.rst 2012-07-16 14:14:39 UTC (rev 1009) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric +.. * Copyright (C) 2010 - 2012 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 @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Configuration ============= Modified: trunk/src/site/en/rst/user/controls.rst =================================================================== --- trunk/src/site/en/rst/user/controls.rst 2012-07-16 13:46:59 UTC (rev 1008) +++ trunk/src/site/en/rst/user/controls.rst 2012-07-16 14:14:39 UTC (rev 1009) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric +.. * Copyright (C) 2010 - 2012 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 @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Controls ======== Modified: trunk/src/site/en/rst/user/dataformat.rst =================================================================== --- trunk/src/site/en/rst/user/dataformat.rst 2012-07-16 13:46:59 UTC (rev 1008) +++ trunk/src/site/en/rst/user/dataformat.rst 2012-07-16 14:14:39 UTC (rev 1009) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric +.. * Copyright (C) 2010 - 2012 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 @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Tables file format ================== Modified: trunk/src/site/en/rst/user/faq.rst =================================================================== --- trunk/src/site/en/rst/user/faq.rst 2012-07-16 13:46:59 UTC (rev 1008) +++ trunk/src/site/en/rst/user/faq.rst 2012-07-16 14:14:39 UTC (rev 1009) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric +.. * Copyright (C) 2010 - 2012 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 @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Frequently Asked Questions ========================== Modified: trunk/src/site/en/rst/user/guide_control.rst =================================================================== --- trunk/src/site/en/rst/user/guide_control.rst 2012-07-16 13:46:59 UTC (rev 1008) +++ trunk/src/site/en/rst/user/guide_control.rst 2012-07-16 14:14:39 UTC (rev 1009) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric +.. * Copyright (C) 2010 - 2012 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 @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Data control step ================= Modified: trunk/src/site/en/rst/user/guide_listcontrols.rst =================================================================== --- trunk/src/site/en/rst/user/guide_listcontrols.rst 2012-07-16 13:46:59 UTC (rev 1008) +++ trunk/src/site/en/rst/user/guide_listcontrols.rst 2012-07-16 14:14:39 UTC (rev 1009) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric +.. * Copyright (C) 2010 - 2012 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 @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Controls list ============= Modified: trunk/src/site/en/rst/user/guide_project.rst =================================================================== --- trunk/src/site/en/rst/user/guide_project.rst 2012-07-16 13:46:59 UTC (rev 1008) +++ trunk/src/site/en/rst/user/guide_project.rst 2012-07-16 14:14:39 UTC (rev 1009) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric +.. * Copyright (C) 2010 - 2012 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 @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Project ======= Modified: trunk/src/site/en/rst/user/guide_results.rst =================================================================== --- trunk/src/site/en/rst/user/guide_results.rst 2012-07-16 13:46:59 UTC (rev 1008) +++ trunk/src/site/en/rst/user/guide_results.rst 2012-07-16 14:14:39 UTC (rev 1009) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric +.. * Copyright (C) 2010 - 2012 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 @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + RSufi Results ============= Modified: trunk/src/site/en/rst/user/guide_selection.rst =================================================================== --- trunk/src/site/en/rst/user/guide_selection.rst 2012-07-16 13:46:59 UTC (rev 1008) +++ trunk/src/site/en/rst/user/guide_selection.rst 2012-07-16 14:14:39 UTC (rev 1009) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric +.. * Copyright (C) 2010 - 2012 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 @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Selection ========= The objective of the selection phase is to create coherent and consistent data tables Modified: trunk/src/site/rst/devel/directory.rst =================================================================== --- trunk/src/site/rst/devel/directory.rst 2012-07-16 13:46:59 UTC (rev 1008) +++ trunk/src/site/rst/devel/directory.rst 2012-07-16 14:14:39 UTC (rev 1009) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Organisation des dossiers des projets Coser ------------------------------------------- Modified: trunk/src/site/rst/devel/struts.rst =================================================================== --- trunk/src/site/rst/devel/struts.rst 2012-07-16 13:46:59 UTC (rev 1008) +++ trunk/src/site/rst/devel/struts.rst 2012-07-16 14:14:39 UTC (rev 1009) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric +.. * Copyright (C) 2010 - 2012 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 @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Struts 2 ======== Modified: trunk/src/site/rst/download.rst =================================================================== --- trunk/src/site/rst/download.rst 2012-07-16 13:46:59 UTC (rev 1008) +++ trunk/src/site/rst/download.rst 2012-07-16 14:14:39 UTC (rev 1009) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric +.. * Copyright (C) 2010 - 2012 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 @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Lancement ========= Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2012-07-16 13:46:59 UTC (rev 1008) +++ trunk/src/site/rst/index.rst 2012-07-16 14:14:39 UTC (rev 1009) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric +.. * Copyright (C) 2010 - 2012 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 @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Accueil ======= @@ -35,7 +36,7 @@ Fonctionnalités -=============== +--------------- * gestion des 4 fichiers de données (captures, strates, tailles, traits). * contrôle des erreurs sur le format des données Modified: trunk/src/site/rst/user/configuration.rst =================================================================== --- trunk/src/site/rst/user/configuration.rst 2012-07-16 13:46:59 UTC (rev 1008) +++ trunk/src/site/rst/user/configuration.rst 2012-07-16 14:14:39 UTC (rev 1009) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric +.. * Copyright (C) 2010 - 2012 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 @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Configuration ============= Modified: trunk/src/site/rst/user/controls.rst =================================================================== --- trunk/src/site/rst/user/controls.rst 2012-07-16 13:46:59 UTC (rev 1008) +++ trunk/src/site/rst/user/controls.rst 2012-07-16 14:14:39 UTC (rev 1009) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric +.. * Copyright (C) 2010 - 2012 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 @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Contrôles ========= Modified: trunk/src/site/rst/user/dataformat.rst =================================================================== --- trunk/src/site/rst/user/dataformat.rst 2012-07-16 13:46:59 UTC (rev 1008) +++ trunk/src/site/rst/user/dataformat.rst 2012-07-16 14:14:39 UTC (rev 1009) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric +.. * Copyright (C) 2010 - 2012 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 @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Format des tables ================= Modified: trunk/src/site/rst/user/faq.rst =================================================================== --- trunk/src/site/rst/user/faq.rst 2012-07-16 13:46:59 UTC (rev 1008) +++ trunk/src/site/rst/user/faq.rst 2012-07-16 14:14:39 UTC (rev 1009) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric +.. * Copyright (C) 2010 - 2012 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 @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Foire aux questions =================== Modified: trunk/src/site/rst/user/guide_control.rst =================================================================== --- trunk/src/site/rst/user/guide_control.rst 2012-07-16 13:46:59 UTC (rev 1008) +++ trunk/src/site/rst/user/guide_control.rst 2012-07-16 14:14:39 UTC (rev 1009) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric +.. * Copyright (C) 2010 - 2012 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 @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Contrôle ======== Modified: trunk/src/site/rst/user/guide_listcontrols.rst =================================================================== --- trunk/src/site/rst/user/guide_listcontrols.rst 2012-07-16 13:46:59 UTC (rev 1008) +++ trunk/src/site/rst/user/guide_listcontrols.rst 2012-07-16 14:14:39 UTC (rev 1009) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric +.. * Copyright (C) 2010 - 2012 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 @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Liste des contrôles =================== Modified: trunk/src/site/rst/user/guide_project.rst =================================================================== --- trunk/src/site/rst/user/guide_project.rst 2012-07-16 13:46:59 UTC (rev 1008) +++ trunk/src/site/rst/user/guide_project.rst 2012-07-16 14:14:39 UTC (rev 1009) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric +.. * Copyright (C) 2010 - 2012 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 @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Projet ====== Modified: trunk/src/site/rst/user/guide_results.rst =================================================================== --- trunk/src/site/rst/user/guide_results.rst 2012-07-16 13:46:59 UTC (rev 1008) +++ trunk/src/site/rst/user/guide_results.rst 2012-07-16 14:14:39 UTC (rev 1009) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric +.. * Copyright (C) 2010 - 2012 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 @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Résultats RSufi =============== Modified: trunk/src/site/rst/user/guide_selection.rst =================================================================== --- trunk/src/site/rst/user/guide_selection.rst 2012-07-16 13:46:59 UTC (rev 1008) +++ trunk/src/site/rst/user/guide_selection.rst 2012-07-16 14:14:39 UTC (rev 1009) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric +.. * Copyright (C) 2010 - 2012 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 @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Sélection ========= Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-07-16 13:46:59 UTC (rev 1008) +++ trunk/src/site/site_en.xml 2012-07-16 14:14:39 UTC (rev 1009) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2010 - 2012 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 @@ -25,7 +25,16 @@ --> <project name="${project.name}"> - + + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.2</version> + </skin> + + <publishDate format="MM-dd-yyyy" position="right"/> + <version position="right"/> + <bannerLeft> <src>http://maven-site.forge.codelutin.com/coser/icons/logo100.png</src> <href>index.html</href> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-07-16 13:46:59 UTC (rev 1008) +++ trunk/src/site/site_fr.xml 2012-07-16 14:14:39 UTC (rev 1009) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2010 - 2012 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 @@ -26,6 +26,15 @@ <project name="${project.name}"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.2</version> + </skin> + + <publishDate format="dd/MM/yyyy" position="right"/> + <version position="right" /> + <bannerLeft> <src>http://maven-site.forge.codelutin.com/coser/icons/logo100.png</src> <href>index.html</href>

1 0

r1008 - in trunk: coser-business/src/main/resources coser-business/src/main/resources/validators/fr/ifremer/coser/data coser-ui/src/main/resources/fr/ifremer/coser/bean
by echatellier＠users.forge.codelutin.com 16 Jul '12

16 Jul '12

Author: echatellier Date: 2012-07-16 15:46:59 +0200 (Mon, 16 Jul 2012) New Revision: 1008 Url: http://forge.codelutin.com/repositories/revision/coser/1008 Log: Utilisation des nouveaux namespace de dtd Modified: trunk/coser-business/src/main/resources/validators.xml trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Catch-error-validation.xml trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-error-validation.xml trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-fatal-validation.xml trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-warning-validation.xml trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Length-error-validation.xml trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Strata-error-validation.xml trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Project-error-validation.xml trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/RSufiResult-error-validation.xml trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Selection-error-validation.xml Modified: trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Catch-error-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Catch-error-validation.xml 2012-07-16 13:46:24 UTC (rev 1007) +++ trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Catch-error-validation.xml 2012-07-16 13:46:59 UTC (rev 1008) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2010 - 2012 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 @@ -22,9 +22,8 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="survey"> <field-validator type="requiredstring"> Modified: trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-error-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-error-validation.xml 2012-07-16 13:46:24 UTC (rev 1007) +++ trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-error-validation.xml 2012-07-16 13:46:59 UTC (rev 1008) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2010 - 2012 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 @@ -22,9 +22,8 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="survey"> <field-validator type="requiredstring"> Modified: trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-fatal-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-fatal-validation.xml 2012-07-16 13:46:24 UTC (rev 1007) +++ trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-fatal-validation.xml 2012-07-16 13:46:59 UTC (rev 1008) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2010 - 2012 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 @@ -22,9 +22,8 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="sweptSurface"> <field-validator type="checkDouble"> Modified: trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-warning-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-warning-validation.xml 2012-07-16 13:46:24 UTC (rev 1007) +++ trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-warning-validation.xml 2012-07-16 13:46:59 UTC (rev 1008) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2010 - 2012 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 @@ -22,9 +22,8 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="lat"> <field-validator type="checkDouble"> Modified: trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Length-error-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Length-error-validation.xml 2012-07-16 13:46:24 UTC (rev 1007) +++ trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Length-error-validation.xml 2012-07-16 13:46:59 UTC (rev 1008) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2010 - 2012 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 @@ -22,9 +22,8 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="survey"> <field-validator type="requiredstring"> Modified: trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Strata-error-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Strata-error-validation.xml 2012-07-16 13:46:24 UTC (rev 1007) +++ trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Strata-error-validation.xml 2012-07-16 13:46:59 UTC (rev 1008) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2010 - 2012 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 @@ -22,9 +22,8 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="survey"> <field-validator type="requiredstring"> Modified: trunk/coser-business/src/main/resources/validators.xml =================================================================== --- trunk/coser-business/src/main/resources/validators.xml 2012-07-16 13:46:24 UTC (rev 1007) +++ trunk/coser-business/src/main/resources/validators.xml 2012-07-16 13:46:59 UTC (rev 1008) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 Ifremer, Codelutin + Copyright (C) 2010 - 2012 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 @@ -25,8 +25,8 @@ --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator Config 1.0//EN" - "http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd"> + "-//Apache Struts//XWork Validator Definition 1.0//EN" + "http://struts.apache.org/dtds/xwork-validator-definition-1.0.dtd"> <validators> <validator name="required" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/> <validator name="requiredstring" class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/> Modified: trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Project-error-validation.xml =================================================================== --- trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Project-error-validation.xml 2012-07-16 13:46:24 UTC (rev 1007) +++ trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Project-error-validation.xml 2012-07-16 13:46:59 UTC (rev 1008) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2010 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -22,9 +22,8 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="regex"> Modified: trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/RSufiResult-error-validation.xml =================================================================== --- trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/RSufiResult-error-validation.xml 2012-07-16 13:46:24 UTC (rev 1007) +++ trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/RSufiResult-error-validation.xml 2012-07-16 13:46:59 UTC (rev 1008) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2010 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -22,9 +22,8 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="regex"> Modified: trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Selection-error-validation.xml =================================================================== --- trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Selection-error-validation.xml 2012-07-16 13:46:24 UTC (rev 1007) +++ trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Selection-error-validation.xml 2012-07-16 13:46:59 UTC (rev 1008) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 Ifremer, Codelutin + Copyright (C) 2010 - 2012 Ifremer, Codelutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -22,9 +22,8 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="regex">

1 0

r1007 - in trunk: coser-business/src/main/java/fr/ifremer/coser/bean coser-ui/src/main/java/fr/ifremer/coser/ui coser-ui/src/main/java/fr/ifremer/coser/ui/freize coser-ui/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com 16 Jul '12

16 Jul '12

Author: echatellier Date: 2012-07-16 15:46:24 +0200 (Mon, 16 Jul 2012) New Revision: 1007 Url: http://forge.codelutin.com/repositories/revision/coser/1007 Log: #1328: Premiere version de la frise Added: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/Freize.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeModel.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/AbstractDataContainer.java 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-business/src/main/java/fr/ifremer/coser/bean/AbstractDataContainer.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/AbstractDataContainer.java 2012-07-16 13:44:46 UTC (rev 1006) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/AbstractDataContainer.java 2012-07-16 13:46:24 UTC (rev 1007) @@ -154,22 +154,22 @@ public void setHistoryCommands(List<Command> historyCommand) { this.historyCommands = historyCommand; - getPropertyChangeSupport().firePropertyChange("historyCommands", null, historyCommands); + getPropertyChangeSupport().firePropertyChange(PROPERTY_HISTORY_COMMANDS, null, historyCommands); } public void addHistoryCommand(Command historyCommand) { historyCommands.add(historyCommand); - getPropertyChangeSupport().firePropertyChange("historyCommands", null, historyCommands); + getPropertyChangeSupport().firePropertyChange(PROPERTY_HISTORY_COMMANDS, null, historyCommands); } public void removeHistoryCommand(Command historyCommand) { historyCommands.remove(historyCommand); - getPropertyChangeSupport().firePropertyChange("historyCommands", null, historyCommands); + getPropertyChangeSupport().firePropertyChange(PROPERTY_HISTORY_COMMANDS, null, historyCommands); } public void clearHistoryCommands() { historyCommands.clear(); - getPropertyChangeSupport().firePropertyChange("historyCommands", null, historyCommands); + getPropertyChangeSupport().firePropertyChange(PROPERTY_HISTORY_COMMANDS, null, historyCommands); } /** 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 2012-07-16 13:44:46 UTC (rev 1006) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx 2012-07-16 13:46:24 UTC (rev 1007) @@ -32,6 +32,7 @@ <CoserFrameHandler id="handler" constructorParams="this" /> <fr.ifremer.coser.bean.Project id="project" javaBean="null" /> + <fr.ifremer.coser.bean.Selection id="selection" javaBean="null" /> <JMenuBar> @@ -82,5 +83,7 @@ <HomeView handler="{getHandler()}" /> </JPanel> - <StatusMessagePanel constraints='BorderLayout.SOUTH' /> + <fr.ifremer.coser.ui.freize.Freize id="freize" constraints='BorderLayout.SOUTH' /> + <fr.ifremer.coser.ui.freize.FreizeModel initializer="freize.getModel()" project="{getProject()}" + selection="{getSelection()}" /> </JFrame> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2012-07-16 13:44:46 UTC (rev 1006) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2012-07-16 13:46:24 UTC (rev 1007) @@ -477,8 +477,9 @@ setWaitCursor(view); try { + view.setSelection(selection); // for freize view.setContextValue(selection); - + view.getParentContainer(CoserFrame.class).getHandler().showSelectionView(selection, selectedTab); SelectionView selectionView = new SelectionView(view); selectionView.setSelection(selection); Added: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/Freize.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/Freize.jaxx (rev 0) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/Freize.jaxx 2012-07-16 13:46:24 UTC (rev 1007) @@ -0,0 +1,105 @@ + +<JPanel layout="{new GridLayout(0, 4)}" + border="{BorderFactory.createLineBorder(Color.BLACK)}"> + + <import> + java.awt.Color + javax.swing.BorderFactory + fr.ifremer.coser.ui.CoserFrame + </import> + + <FreizeModel id="model" javaBean="new FreizeModel()" /> + <FreizeHandler id="handler" constructorParams="this" model="{getModel()}" /> + + <Table id="step0Panel" border="{BorderFactory.createEtchedBorder()}"> + <row> + <cell weightx="1"> + <JLabel text="coser.ui.freize.projectstep" font-weight="bold" /> + </cell> + <cell rows="2"> + <JLabel id="step0Icon" icon="button_ok.png" /> + </cell> + </row> + <row> + <cell> + <JButton text='coser.ui.freize.projectaction' + onActionPerformed="getParentContainer(CoserFrame.class).getHandler().showProjectCreationView()"/> + </cell> + </row> + </Table> + + <Table id="step1Panel" border="{BorderFactory.createEtchedBorder()}" decorator="boxed"> + <row> + <cell weightx="1"> + <JLabel text="coser.ui.freize.controlstep" enabled="{model.isStep1Enabled()}" /> + </cell> + <cell rows="2"> + <JLabel id="step1Icon" icon="stock_lock.png" enabled="{model.isStep1Enabled()}" /> + </cell> + </row> + <row> + <cell> + <JButton text='coser.ui.freize.controlaction' enabled="{model.isStep1Enabled()}" + onActionPerformed="getParentContainer(CoserFrame.class).getHandler().showControlView()"/> + </cell> + </row> + </Table> + + <Table id="step2Panel" border="{BorderFactory.createEtchedBorder()}" decorator="boxed"> + <row> + <cell weightx="1"> + <JLabel text="coser.ui.freize.selectionstep" enabled="{model.isStep2Enabled()}" /> + </cell> + <cell rows="2"> + <JLabel id="step2Icon" icon="agt_action_fail.png" enabled="{model.isStep2Enabled()}" /> + </cell> + </row> + <row> + <cell> + <JButton text='coser.ui.freize.selectionaction' enabled="{model.isStep2Enabled()}" + onActionPerformed="getParentContainer(CoserFrame.class).getHandler().showSelectionView(model.getSelection(), 0)"/> + </cell> + </row> + </Table> + + <Table id="step3Panel" border="{BorderFactory.createEtchedBorder()}" decorator="boxed"> + <row> + <cell weightx="1"> + <JLabel text="coser.ui.freize.resultstep" enabled="{model.isStep3Enabled()}" /> + </cell> + <cell rows="2"> + <JLabel id="step3Icon" icon="agt_action_fail.png" enabled="{model.isStep3Enabled()}" /> + </cell> + </row> + <row> + <cell> + <JButton text='coser.ui.freize.resultaction' enabled="{model.isStep3Enabled()}" + onActionPerformed="getParentContainer(CoserFrame.class).getHandler().showSelectionView(model.getSelection(), 2)"/> + </cell> + </row> + </Table> + +</JPanel> Added: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeHandler.java (rev 0) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeHandler.java 2012-07-16 13:46:24 UTC (rev 1007) @@ -0,0 +1,138 @@ +/* + * #%L + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer, Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ifremer.coser.ui.freize; + +import java.awt.Color; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; + +import javax.swing.Icon; +import javax.swing.ImageIcon; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import fr.ifremer.coser.bean.Project; +import fr.ifremer.coser.bean.Selection; + + +/** + * Panel affichant l'état d'avancement du dans la definition sous forme de frise. + * + * @author echatellier + */ +public class FreizeHandler implements PropertyChangeListener { + + private static final Log log = LogFactory.getLog(FreizeHandler.class); + + protected static final Icon OK_ICON = new ImageIcon(FreizeHandler.class.getResource("/icons/button_ok.png")); + protected static final Icon LOCKED_ICON = new ImageIcon(FreizeHandler.class.getResource("/icons/stock_lock.png")); + protected static final Icon BAD_ICON = new ImageIcon(FreizeHandler.class.getResource("/icons/agt_action_fail.png")); + protected static final Color COMPLETE_COLOR = Color.GREEN; + protected static final Color PENDING_COLOR = Color.YELLOW; + protected static final Color DISABLED_COLOR = null; + + protected FreizeModel model; + + protected Freize view; + + public FreizeHandler(Freize view) { + this.view = view; + } + + public void setModel(FreizeModel model) { + if (this.model != null) { + this.model.removePropertyChangeListener(this); + } + this.model = model; + if (this.model != null) { + this.model.addPropertyChangeListener(this); + } + } + + @Override + public void propertyChange(PropertyChangeEvent evt) { + String propertyName = evt.getPropertyName(); + + if (log.isDebugEnabled()) { + log.debug("Update freize : " + propertyName); + } + + if (FreizeModel.PROPERTY_PROJECT.equals(propertyName)) { + updateUi(); + } else if (FreizeModel.PROPERTY_SELECTION.equals(propertyName)) { + updateUi(); + } else if (FreizeModel.PROPERTY_R_SUFI_RESULT.equals(propertyName)) { + updateUi(); + } + } + + /** + * Met à jour le visuel de la frise. + */ + protected void updateUi() { + + // init with default values + model.setStep1Enabled(false); + model.setStep2Enabled(false); + model.setStep3Enabled(false); + + view.getStep0Panel().setBackground(DISABLED_COLOR); + view.getStep1Panel().setBackground(DISABLED_COLOR); + view.getStep2Panel().setBackground(DISABLED_COLOR); + view.getStep0Icon().setIcon(BAD_ICON); + view.getStep1Icon().setIcon(BAD_ICON); + view.getStep2Icon().setIcon(BAD_ICON); + + Project project = model.getProject(); + if (project != null) { + view.getStep0Icon().setIcon(OK_ICON); + view.getStep0Panel().setBackground(COMPLETE_COLOR); + model.setStep1Enabled(true); + + if (project.getControl().isValidated()) { + view.getStep1Panel().setBackground(COMPLETE_COLOR); + model.setStep2Enabled(true); + if (!project.getSelections().isEmpty()) { + view.getStep1Icon().setIcon(LOCKED_ICON); + } else { + view.getStep1Icon().setIcon(OK_ICON); + } + + Selection selection = model.getSelection(); + if (selection != null && selection.isValidated()) { + view.getStep2Icon().setIcon(OK_ICON); + view.getStep2Panel().setBackground(COMPLETE_COLOR); + model.setStep3Enabled(true); + } else { + view.getStep2Panel().setBackground(PENDING_COLOR); + } + } else { + view.getStep1Panel().setBackground(PENDING_COLOR); + } + } else { + view.getStep0Panel().setBackground(PENDING_COLOR); + view.getStep0Icon().setIcon(BAD_ICON); + } + } +} Property changes on: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeHandler.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeModel.java (rev 0) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeModel.java 2012-07-16 13:46:24 UTC (rev 1007) @@ -0,0 +1,122 @@ +package fr.ifremer.coser.ui.freize; + +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; + +import fr.ifremer.coser.bean.Project; +import fr.ifremer.coser.bean.RSufiResult; +import fr.ifremer.coser.bean.Selection; + +public class FreizeModel { + + public static final String PROPERTY_PROJECT = "project"; + public static final String PROPERTY_SELECTION = "selection"; + public static final String PROPERTY_R_SUFI_RESULT = "rSufiResult"; + public static final String PROPERTY_STEP0_ENABLED = "step0Enabled"; + public static final String PROPERTY_STEP1_ENABLED = "step1Enabled"; + public static final String PROPERTY_STEP2_ENABLED = "step2Enabled"; + public static final String PROPERTY_STEP3_ENABLED = "step3Enabled"; + + protected Project project; + protected Selection selection; + protected RSufiResult rSufiResult; + + protected boolean step0Enabled; + protected boolean step1Enabled; + protected boolean step2Enabled; + protected boolean step3Enabled; + + protected transient PropertyChangeSupport pcs; + + public FreizeModel() { + pcs = new PropertyChangeSupport(this); + } + + public Project getProject() { + return project; + } + + public void setProject(Project project) { + Project oldValue = this.project; + this.project = project; + pcs.firePropertyChange(PROPERTY_PROJECT, oldValue, project); + } + + public Selection getSelection() { + return selection; + } + + public void setSelection(Selection selection) { + Selection oldValue = this.selection; + this.selection = selection; + pcs.firePropertyChange(PROPERTY_SELECTION, oldValue, selection); + } + + public RSufiResult getrSufiResult() { + return rSufiResult; + } + + public void setrSufiResult(RSufiResult rSufiResult) { + RSufiResult oldValue = this.rSufiResult; + this.rSufiResult = rSufiResult; + pcs.firePropertyChange(PROPERTY_R_SUFI_RESULT, oldValue, rSufiResult); + } + + public boolean isStep0Enabled() { + return step0Enabled; + } + + public void setStep0Enabled(boolean step0Enabled) { + boolean oldValue = this.step0Enabled; + this.step0Enabled = step0Enabled; + pcs.firePropertyChange(PROPERTY_STEP0_ENABLED, oldValue, step0Enabled); + } + + public boolean isStep1Enabled() { + return step1Enabled; + } + + public void setStep1Enabled(boolean step1Enabled) { + boolean oldValue = this.step1Enabled; + this.step1Enabled = step1Enabled; + pcs.firePropertyChange(PROPERTY_STEP1_ENABLED, oldValue, step1Enabled); + } + + public boolean isStep2Enabled() { + return step2Enabled; + } + + public void setStep2Enabled(boolean step2Enabled) { + boolean oldValue = this.step2Enabled; + this.step2Enabled = step2Enabled; + pcs.firePropertyChange(PROPERTY_STEP2_ENABLED, oldValue, step2Enabled); + } + + public boolean isStep3Enabled() { + return step3Enabled; + } + + public void setStep3Enabled(boolean step3Enabled) { + boolean oldValue = this.step3Enabled; + this.step3Enabled = step3Enabled; + pcs.firePropertyChange(PROPERTY_STEP3_ENABLED, oldValue, step3Enabled); + } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + pcs.addPropertyChangeListener(listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + pcs.removePropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, + PropertyChangeListener listener) { + pcs.addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(String propertyName, + PropertyChangeListener listener) { + pcs.removePropertyChangeListener(propertyName, listener); + } +} Property changes on: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/freize/FreizeModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2012-07-16 13:44:46 UTC (rev 1006) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2012-07-16 13:46:24 UTC (rev 1007) @@ -60,6 +60,14 @@ coser.ui.error.htmlmessage=An error occurred \: %s coser.ui.error.reportSendTo=A report has been sent to %s coser.ui.error.title=Global application error +coser.ui.freize.controlaction= +coser.ui.freize.controlstep= +coser.ui.freize.projectaction= +coser.ui.freize.projectstep= +coser.ui.freize.resultaction= +coser.ui.freize.resultstep= +coser.ui.freize.selectionaction= +coser.ui.freize.selectionstep= coser.ui.graph.compareNumberCatchLength=Comparison Catch/Length coser.ui.graph.compareNumberCatchLengthTip=Display catch and length number comparison graphs (data are generated only during error check) coser.ui.graph.lengthStructure=Length structure Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2012-07-16 13:44:46 UTC (rev 1006) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2012-07-16 13:46:24 UTC (rev 1007) @@ -60,6 +60,14 @@ coser.ui.error.htmlmessage=Une erreur s'est produite \: %s coser.ui.error.reportSendTo=Un rapport a été envoyé à %s coser.ui.error.title=Erreur globale +coser.ui.freize.controlaction=Contrôle +coser.ui.freize.controlstep=2/4 \: Contrôle +coser.ui.freize.projectaction=Créer +coser.ui.freize.projectstep=1/4 \: Création +coser.ui.freize.resultaction=Ajouter un résultat +coser.ui.freize.resultstep=4/4 \: Résultats +coser.ui.freize.selectionaction=Sélection +coser.ui.freize.selectionstep=3/4 \: Sélection coser.ui.graph.compareNumberCatchLength=Comparaison Captures/Tailles coser.ui.graph.compareNumberCatchLengthTip=Affiche les graphiques de comparaison des nombres entre les captures et les tailles (Les données sont générées uniquement lors de la vérification des erreurs) coser.ui.graph.lengthStructure=Structures en taille

1 0

r1006 - in trunk: . coser-business/src/main/java/fr/ifremer/coser/services
by echatellier＠users.forge.codelutin.com 16 Jul '12

16 Jul '12

Author: echatellier Date: 2012-07-16 15:44:46 +0200 (Mon, 16 Jul 2012) New Revision: 1006 Url: http://forge.codelutin.com/repositories/revision/coser/1006 Log: Downgrade to struts 2.2.3 Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java trunk/pom.xml Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2012-07-13 13:17:30 UTC (rev 1005) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2012-07-16 13:44:46 UTC (rev 1006) @@ -47,11 +47,11 @@ import org.apache.commons.logging.LogFactory; import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.FileManager; import com.opensymphony.xwork2.ValidationAwareSupport; import com.opensymphony.xwork2.config.Configuration; import com.opensymphony.xwork2.config.ConfigurationManager; import com.opensymphony.xwork2.inject.Container; +import com.opensymphony.xwork2.util.FileManager; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; import com.opensymphony.xwork2.validator.ActionValidatorManager; @@ -115,8 +115,9 @@ Container container = conf.getContainer(); // huge improve cache performance - FileManager fileManager = container.getInstance(FileManager.class); - fileManager.setReloadingConfigs(false); + //FileManager fileManager = container.getInstance(FileManager.class); + //fileManager.setReloadingConfigs(false); + FileManager.setReloadingConfigs(false); ValueStackFactory stackFactory = container.getInstance(ValueStackFactory.class); ValueStack vs = stackFactory.createValueStack(); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-13 13:17:30 UTC (rev 1005) +++ trunk/pom.xml 2012-07-16 13:44:46 UTC (rev 1006) @@ -361,7 +361,7 @@ <jaxx.version>2.5.1</jaxx.version> <i18n.version>2.4.1</i18n.version>  - <struts.version>2.3.4</struts.version> + <struts.version>2.2.3</struts.version> </properties> <scm>

1 0