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

r463 - trunk/coser-business/src/main/java/fr/ifremer/coser/storage
by chatellier＠users.labs.libre-entreprise.org 05 Jan '11

05 Jan '11

Author: chatellier Date: 2011-01-05 13:11:17 +0000 (Wed, 05 Jan 2011) New Revision: 463 Log: Add doc Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryDataStorage.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryDataStorage.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryDataStorage.java 2011-01-05 13:09:13 UTC (rev 462) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryDataStorage.java 2011-01-05 13:11:17 UTC (rev 463) @@ -58,11 +58,17 @@ lineIndexStorage = new ArrayList<String>(); } + /** + * Iterator sur les donnnées. + * + * {@link #lineIndexIterator} est aussi géré, seulement pour que le + * remove reste cohérent. + */ public class StringListIterator implements Iterator<String[]> { protected Iterator<String> listIterator; protected Iterator<String> lineIndexIterator; - + public StringListIterator(Iterator<String> internalIterator, Iterator<String> lineIndexIterator) { this.listIterator = internalIterator; this.lineIndexIterator = lineIndexIterator;

1 0

r462 - trunk/coser-business/src/main/java/fr/ifremer/coser/storage
by chatellier＠users.labs.libre-entreprise.org 05 Jan '11

05 Jan '11

Author: chatellier Date: 2011-01-05 13:09:13 +0000 (Wed, 05 Jan 2011) New Revision: 462 Log: Add doc Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryDataStorage.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryDataStorage.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryDataStorage.java 2011-01-05 10:20:01 UTC (rev 461) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryDataStorage.java 2011-01-05 13:09:13 UTC (rev 462) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 Codelutin, Chatellier Eric + * Copyright (C) 2010 - 2011 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 @@ -47,7 +47,10 @@ */ public class MemoryDataStorage implements DataStorage { + /** Stockage des données. */ protected List<String> listStorage; + + /** Stockage des numero de ligne (String) pour une recherche indexOf plus rapide. */ protected List<String> lineIndexStorage; public MemoryDataStorage() {

1 0

r461 - in trunk/coser-web/src/main: java/fr/ifremer/coser/web/actions resources/fr/ifremer/coser/web webapp/WEB-INF/content webapp/WEB-INF/decorators
by chatellier＠users.labs.libre-entreprise.org 05 Jan '11

05 Jan '11

Author: chatellier Date: 2011-01-05 10:20:01 +0000 (Wed, 05 Jan 2011) New Revision: 461 Log: Update struts i18n Added: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_en.properties trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties Removed: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/ Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java 2011-01-04 17:25:09 UTC (rev 460) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java 2011-01-05 10:20:01 UTC (rev 461) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2010 - 2011 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 @@ -40,7 +40,7 @@ import fr.ifremer.coser.web.ServiceFactory; /** - * Action index, ecupere la date de derniere mise à jour. + * Action index, recupere la date de derniere mise à jour. * * @author chatellier * @version $Revision$ Copied: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties (from rev 454, trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction.properties) =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties (rev 0) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package.properties 2011-01-05 10:20:01 UTC (rev 461) @@ -0,0 +1,41 @@ +### +# #%L +# Coser :: Web +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2010 - 2011 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% +### +message.layout.title=Populations and communities indices, resulting from Ifremer monitoring halieutics survey +message.layout.oceanicdatatitle=Gestion des donn\u00E9es des campagnes oc\u00E9anographiques +message.layout.oceanicdata1=le Syst\u00E8me d'informations scientifiques pour la mer de l'Ifremer (SISMER) +message.layout.oceanicdata2=le Syst\u00E8me d'information halieutique de l'Ifremer (SIH) +message.index.title=Home +message.index.paragraph1=Ce site a \u00E9t\u00E9 con\u00E7u pour fournir en libre acc\u00E8s des donn\u00E9es brutes et des donn\u00E9es \u00E9labor\u00E9es relatives aux campagnes scientifiques d''observation halieutique conduites par l''Ifremer le long des c\u00F4tes fran\u00E7aises. +message.index.paragraph2=Toutes les donn\u00E9es mises \u00E0 disposition ont fait l''objet de qualification selon des protocoles sp\u00E9cifiques. La qualit\u00E9 des interpr\u00E9tations \u00E9tant directement li\u00E9e \u00E0 la nature des donn\u00E9es source, les utilisateurs de donn\u00E9es sont invit\u00E9s \u00E0 consid\u00E9rer avec attention les descriptions des protocoles mis en \u0153uvre ainsi que les niveaux de qualit\u00E9 contr\u00F4l\u00E9s. +message.index.paragraph3=Chaque s\u00E9rie de campagnes est conduite selon une strat\u00E9gie d''\u00E9chantillonnage sp\u00E9cifique. Sauf cas particuliers, les analyses et interpr\u00E9tations doivent \u00EAtre conduites par s\u00E9rie, en prenant en compte les strat\u00E9gies d''\u00E9chantillonnage propres \u00E0 chacune de ces s\u00E9ries. Sur le site, les donn\u00E9es sont pr\u00E9sent\u00E9es par s\u00E9rie. +message.index.paragraph4=Dans les tables de donn\u00E9es, toutes les esp\u00E8ces sont identifi\u00E9es selon le r\u00E9f\u00E9rentiel taxinomique du Syst\u00E8me d''informations halieutiques de l''Ifremer ({0}). +message.index.datatypetitle=Quatre types de donn\u00E9es sont pr\u00E9sent\u00E9es +message.index.datatype1=Des donn\u00E9es par op\u00E9ration d''\u00E9chantillonnage (en g\u00E9n\u00E9ral par trait de chalut) +message.index.datatype2=Des cartes de distribution par esp\u00E8ce et par zone +message.index.datatype3=Des indices biologiques par esp\u00E8ce et par zone +message.index.datatype4=Des indices de communaut\u00E9 par zone. +message.index.quotetitle=Pour citer ce site +message.index.quotemessage=Ifremer {0,date,yyyy}. Indices de populations et de communautés issus des campagnes de surveillance halieutique de l''Ifremer. {1} ({0,date,dd MMMM}) +message.index.qualitytitle=Avertissement qualit\u00E9 +message.index.qualitymessage=Avertissement qualit\u00E9 Copied: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_en.properties (from rev 454, trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction_en.properties) =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_en.properties (rev 0) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_en.properties 2011-01-05 10:20:01 UTC (rev 461) @@ -0,0 +1,41 @@ +### +# #%L +# Coser :: Web +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2010 - 2011 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% +### +message.layout.title=Populations and communities indices, resulting from Ifremer monitoring halieutics survey +message.layout.oceanicdatatitle=Gestion des donn\u00E9es des campagnes oc\u00E9anographiques +message.layout.oceanicdata1=le Syst\u00E8me d'informations scientifiques pour la mer de l'Ifremer (SISMER) +message.layout.oceanicdata2=le Syst\u00E8me d'information halieutique de l'Ifremer (SIH) +message.index.title=Home +message.index.paragraph1=Ce site a \u00E9t\u00E9 con\u00E7u pour fournir en libre acc\u00E8s des donn\u00E9es brutes et des donn\u00E9es \u00E9labor\u00E9es relatives aux campagnes scientifiques d''observation halieutique conduites par l''Ifremer le long des c\u00F4tes fran\u00E7aises. +message.index.paragraph2=Toutes les donn\u00E9es mises \u00E0 disposition ont fait l''objet de qualification selon des protocoles sp\u00E9cifiques. La qualit\u00E9 des interpr\u00E9tations \u00E9tant directement li\u00E9e \u00E0 la nature des donn\u00E9es source, les utilisateurs de donn\u00E9es sont invit\u00E9s \u00E0 consid\u00E9rer avec attention les descriptions des protocoles mis en \u0153uvre ainsi que les niveaux de qualit\u00E9 contr\u00F4l\u00E9s. +message.index.paragraph3=Chaque s\u00E9rie de campagnes est conduite selon une strat\u00E9gie d''\u00E9chantillonnage sp\u00E9cifique. Sauf cas particuliers, les analyses et interpr\u00E9tations doivent \u00EAtre conduites par s\u00E9rie, en prenant en compte les strat\u00E9gies d''\u00E9chantillonnage propres \u00E0 chacune de ces s\u00E9ries. Sur le site, les donn\u00E9es sont pr\u00E9sent\u00E9es par s\u00E9rie. +message.index.paragraph4=Dans les tables de donn\u00E9es, toutes les esp\u00E8ces sont identifi\u00E9es selon le r\u00E9f\u00E9rentiel taxinomique du Syst\u00E8me d''informations halieutiques de l''Ifremer ({0}). +message.index.datatypetitle=Quatre types de donn\u00E9es sont pr\u00E9sent\u00E9es +message.index.datatype1=Des donn\u00E9es par op\u00E9ration d''\u00E9chantillonnage (en g\u00E9n\u00E9ral par trait de chalut) +message.index.datatype2=Des cartes de distribution par esp\u00E8ce et par zone +message.index.datatype3=Des indices biologiques par esp\u00E8ce et par zone +message.index.datatype4=Des indices de communaut\u00E9 par zone. +message.index.quotetitle=Pour citer ce site +message.index.quotemessage=Ifremer {0,date,yyyy}. Indices de populations et de communautés issus des campagnes de surveillance halieutique de l''Ifremer. {1} ({0,date,dd MMMM}) +message.index.qualitytitle=Avertissement qualit\u00E9 +message.index.qualitymessage=Avertissement qualit\u00E9 Copied: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties (from rev 454, trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction_fr.properties) =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties (rev 0) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/package_fr.properties 2011-01-05 10:20:01 UTC (rev 461) @@ -0,0 +1,41 @@ +### +# #%L +# Coser :: Web +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2010 - 2011 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% +### +message.layout.title=Indices de populations et de communauté issus des campagnes de surveillance halieutique de l'Ifremer +message.layout.oceanicdatatitle=Gestion des donn\u00E9es des campagnes oc\u00E9anographiques +message.layout.oceanicdata1=le Syst\u00E8me d'informations scientifiques pour la mer de l'Ifremer (SISMER) +message.layout.oceanicdata2=le Syst\u00E8me d'information halieutique de l'Ifremer (SIH) +message.index.title=Accueil +message.index.paragraph1=Ce site a \u00E9t\u00E9 con\u00E7u pour fournir en libre acc\u00E8s des donn\u00E9es brutes et des donn\u00E9es \u00E9labor\u00E9es relatives aux campagnes scientifiques d''observation halieutique conduites par l''Ifremer le long des c\u00F4tes fran\u00E7aises. +message.index.paragraph2=Toutes les donn\u00E9es mises \u00E0 disposition ont fait l''objet de qualification selon des protocoles sp\u00E9cifiques. La qualit\u00E9 des interpr\u00E9tations \u00E9tant directement li\u00E9e \u00E0 la nature des donn\u00E9es source, les utilisateurs de donn\u00E9es sont invit\u00E9s \u00E0 consid\u00E9rer avec attention les descriptions des protocoles mis en \u0153uvre ainsi que les niveaux de qualit\u00E9 contr\u00F4l\u00E9s. +message.index.paragraph3=Chaque s\u00E9rie de campagnes est conduite selon une strat\u00E9gie d''\u00E9chantillonnage sp\u00E9cifique. Sauf cas particuliers, les analyses et interpr\u00E9tations doivent \u00EAtre conduites par s\u00E9rie, en prenant en compte les strat\u00E9gies d''\u00E9chantillonnage propres \u00E0 chacune de ces s\u00E9ries. Sur le site, les donn\u00E9es sont pr\u00E9sent\u00E9es par s\u00E9rie. +message.index.paragraph4=Dans les tables de donn\u00E9es, toutes les esp\u00E8ces sont identifi\u00E9es selon le r\u00E9f\u00E9rentiel taxinomique du Syst\u00E8me d''informations halieutiques de l''Ifremer ({0}). +message.index.datatypetitle=Quatre types de donn\u00E9es sont pr\u00E9sent\u00E9es +message.index.datatype1=Des donn\u00E9es par op\u00E9ration d''\u00E9chantillonnage (en g\u00E9n\u00E9ral par trait de chalut) +message.index.datatype2=Des cartes de distribution par esp\u00E8ce et par zone +message.index.datatype3=Des indices biologiques par esp\u00E8ce et par zone +message.index.datatype4=Des indices de communaut\u00E9 par zone. +message.index.quotetitle=Pour citer ce site +message.index.quotemessage=Ifremer {0,date,yyyy}. Indices de populations et de communautés issus des campagnes de surveillance halieutique de l''Ifremer. {1} ({0,date,dd MMMM}) +message.index.qualitytitle=Avertissement qualit\u00E9 +message.index.qualitymessage=Avertissement qualit\u00E9 Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp 2011-01-04 17:25:09 UTC (rev 460) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/index.jsp 2011-01-05 10:20:01 UTC (rev 461) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2010 - 2011 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 @@ -26,64 +26,44 @@ <%@taglib uri="/struts-tags" prefix="s" %> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> - <title>Coser</title> + <title><s:text name="message.index.title" /></title> </head> <body> - <div class="maintitle"><s:text name="message.index.title" /></div> + <div class="maintitle"> + <s:text name="message.index.title" /> + </div> - <p>Ce site présente des indices de populations et de communauté calculés à partir des - données du réseau des campagnes de surveillance halieutiques opérées par l'Ifremer - en mer du Nord, Manche, Atlantique et Méditerranée. - Il contient des informations relatives à 15 séries de campagnes</p> - - <a href="http://www.ifremer.fr/SIH-indices-campagnes/fichiers/Web_EstPopInd_Presenta…" - target="_blank">Les campagnes de surveillance halieutique de l'Ifremer</a> - - <h3>Les indices de populations et de communauté</h3> - <ul> - <li>10 indices de populations et 4 indices de communauté</li> - <li>168 taxons pris en compte</li> - </ul> - - <table> - <tr> - <td>Informations sur les</td> - <td>populations</td> - <td>/</td> - <td>Communautés</td> - </tr> - <tr> - <td>Les indices calculés</td> - <td style="text-align:center"> - <a href="http://www.ifremer.fr/SIH-indices-campagnes/fichiers/Web_EstPopInd_Presenta…">X</a> - </td> - <td /> - <td style="text-align:center"> - <a href="http://www.ifremer.fr/SIH-indices-campagnes/fichiers/Web_EstComInd_Presenta…">X</a> - </td> - </tr> - <tr> - <td>Accès aux données</td> - <td style="text-align:center"> - <s:a action="select-zone">X</s:a> - </td> - <td /> - <td style="text-align:center"> - <s:a action="select-zone">X</s:a> - </td> - </tr> - </table> + <p><s:text name="message.index.paragraph1" /></p> + <p><s:text name="message.index.paragraph2" /></p> + <p><s:text name="message.index.paragraph3" /></p> - <p><b>Pour citer ce site :</b> Ifremer <s:date name="dataUpdateDate" format="yyyy" />. Indices de populations et de communautés - issus des campagnes de surveillance halieutique de l'Ifremer. - <span style="white-space: nowrap;"><s:property value="contextUrl"/></span> (<s:date name="dataUpdateDate" format="dd MMMM" />).</p> + <p> + <span style="font-weight:bold"><s:text name="message.index.datatypetitle" /> :</span><br /> + <ul> + <li><s:a action="select-zone"><s:text name="message.index.datatype1" /></s:a></li> + <li><s:a action="select-zone"><s:text name="message.index.datatype2" /></s:a></li> + <li><s:a action="select-zone"><s:text name="message.index.datatype3" /></s:a></li> + <li><s:a action="select-zone"><s:text name="message.index.datatype4" /></s:a></li> + </ul> + </p> + + <p> + <s:text name="message.index.paragraph4"> + <s:param><a href="http://www.ifremer.fr/sih/">www.ifremer.fr/sih/</a></s:param> + </s:text> + </p> + + <p> + <span style="font-weight:bold"><s:text name="message.index.qualitytitle"/> :</span> + <s:a action="quality"><s:text name="message.index.qualitymessage" /></s:a> + </p> - <p>Gestion des données des campagnes océanographiques : - <ul> - <li><a href="http://www.ifremer.fr/sismer/index_FR.htm">le Système d'informations scientifiques pour la mer de l'Ifremer (SISMER)</a></li> - <li><a href="http://www.ifremer.fr/sih">le Système d'information halieutique de l'Ifremer (SIH)</a></li> - </ul></p> - + <p> + <span style="font-weight:bold"><s:text name="message.index.quotetitle"/> :</span> + <s:text name="message.index.quotemessage"> + <s:param value="dataUpdateDate"/> + <s:param value="contextUrl"/> + </s:text></p> </body> </html> \ No newline at end of file Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2011-01-04 17:25:09 UTC (rev 460) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2011-01-05 10:20:01 UTC (rev 461) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2010 - 2011 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 @@ -36,10 +36,18 @@ <%@ include file="header.jsp" %> + <s:text name="message.layout.title" /> + <div class="main"> <decorator:body/> </div> + <p><s:text name="message.layout.oceanicdatatitle" /> + <ul> + <li><a href="http://www.ifremer.fr/sismer/index_FR.htm"><s:text name="message.layout.oceanicdata1" /></a></li> + <li><a href="http://www.ifremer.fr/sih"><s:text name="message.layout.oceanicdata2" /></a></li> + </ul></p> + <%@ include file="footer.jsp" %> </body> </html> \ No newline at end of file

1 0

r460 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common
by chatellier＠users.labs.libre-entreprise.org 04 Jan '11

04 Jan '11

Author: chatellier Date: 2011-01-04 17:25:09 +0000 (Tue, 04 Jan 2011) New Revision: 460 Log: Utilisation des filtres de nuiton matrix pour avoir de la coh?\195?\169rence entre le graphique et les donn?\195?\169es Added: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixFilter.java Removed: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixRenderer.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java 2011-01-03 16:20:32 UTC (rev 459) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java 2011-01-04 17:25:09 UTC (rev 460) @@ -32,6 +32,7 @@ import org.nuiton.math.matrix.MatrixND; import org.nuiton.math.matrix.viewer.MatrixViewerPanel; +import org.nuiton.math.matrix.viewer.renderer.MatrixChartRenderer; import org.nuiton.math.matrix.viewer.renderer.MatrixInfoTableRenderer; import org.nuiton.widget.SwingSession; @@ -73,8 +74,9 @@ JFrame matrixViewerFrame = new JFrame(_("coser.ui.graph.lengthStructure")); matrixViewerFrame.setName("lengthstructureframe"); MatrixViewerPanel panel = new MatrixViewerPanel(); - panel.addMatrixRenderer(new LengthStructureMatrixRenderer(project, container)); + panel.addMatrixRenderer(new MatrixChartRenderer()); panel.addMatrixRenderer(new MatrixInfoTableRenderer()); + panel.addMatrixFilter(new LengthStructureMatrixFilter(project, container)); panel.addMatrix(matrix); matrixViewerFrame.add(panel); matrixViewerFrame.pack(); Copied: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixFilter.java (from rev 421, trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixRenderer.java) =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixFilter.java (rev 0) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixFilter.java 2011-01-04 17:25:09 UTC (rev 460) @@ -0,0 +1,127 @@ +/* + * #%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 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.common; + +import java.util.ArrayList; +import java.util.List; + +import org.jfree.util.Log; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.math.matrix.viewer.MatrixFilter; + +import fr.ifremer.coser.bean.AbstractDataContainer; +import fr.ifremer.coser.bean.Project; +import fr.ifremer.coser.bean.Selection; + +/** + * Filtre qui ajoute les trou dans les données (valeur intermédiares absentes) + * et qui supprime les bornes sans valeures ensuite. + * + * Modifie egalement le titre de la matrice. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class LengthStructureMatrixFilter implements MatrixFilter { + + protected Project project; + + protected AbstractDataContainer container; + + public LengthStructureMatrixFilter(Project project, AbstractDataContainer container) { + this.project = project; + this.container = container; + } + + @Override + public MatrixND filter(MatrixND matrix) { + + // modifie le titre de la matrice + String title = "Coser: " + project.getName(); + if (container instanceof Selection) { + title += ": " + ((Selection)container).getName(); + } + matrix.setName(title); + + MatrixND filteredMatrix = matrix; + + String semantic0Name = matrix.getDimensionName(0); + if ("coser.business.common.length".equals(semantic0Name)) { + + List<?> semantic0 = matrix.getSemantic(0); + double first = (Double)matrix.getSemantic(0).get(0); + double last = (Double)matrix.getSemantic(0).get(matrix.getSemantic(0).size() - 1); + + // on cherche les bornes qui ont des valeurs sup à 0.0 + // sinon, ya du vide autour des choses demandées + // mais le vide entre est requis (trou de données) + for (Object categorySem : matrix.getSemantic(0)) { + for (Object serieSem : matrix.getSemantic(1)) { + Double value = matrix.getValue(new Object[] { categorySem, serieSem }); + if (value > 0.0) { + double category = (Double)categorySem; + if (first > category) { + first = category; + } + if (last < category) { + last = category; + } + } + } + } + + // on verifie toutes les valeurs pour savoir si c'est un + // pas entier ou un demi pas + boolean haltStep = false; + for (Object number : semantic0) { + double dNumber = (Double)number; + if (dNumber - Math.floor(dNumber) > 0) { + haltStep = true; + break; + } + } + + List<Double> newLengthSemantic = new ArrayList<Double>(); + for (double index = first ; index <= last ; index += (haltStep) ? 0.5 : 1) { + newLengthSemantic.add(index); + } + + // nouvelle matrix remplit avec des zero + // avec la nouvelle semantique pour les tailles + List<?>[] semantics = new List<?>[matrix.getSemantics().length]; + semantics[0] = newLengthSemantic; + System.arraycopy(matrix.getSemantics(), 1, semantics, 1, matrix.getSemantics().length - 1); + filteredMatrix = MatrixFactory.getInstance().create(matrix.getName(), semantics); + + // copy des elements en fonction des semantiques + filteredMatrix.pasteSemantics(matrix); + } + + return filteredMatrix; + } +} Deleted: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixRenderer.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixRenderer.java 2011-01-03 16:20:32 UTC (rev 459) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixRenderer.java 2011-01-04 17:25:09 UTC (rev 460) @@ -1,144 +0,0 @@ -/* - * #%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 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.common; - -import static org.nuiton.i18n.I18n._; - -import java.util.List; - -import org.jfree.chart.JFreeChart; -import org.jfree.data.category.CategoryDataset; -import org.jfree.data.category.DefaultCategoryDataset; -import org.nuiton.math.matrix.MatrixND; -import org.nuiton.math.matrix.viewer.renderer.MatrixChartRenderer; -import org.nuiton.math.matrix.viewer.renderer.jfreechart.GraphMatrixNDDataset; - -import fr.ifremer.coser.bean.AbstractDataContainer; -import fr.ifremer.coser.bean.Project; -import fr.ifremer.coser.bean.Selection; - -/** - * JFreeChart matrix panel renderer. - * - * Only redefine {@link #getCategoryDataset(MatrixND)} because in coser, we need to - * generate graph with missing value. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class LengthStructureMatrixRenderer extends MatrixChartRenderer { - - protected Project project; - - protected AbstractDataContainer container; - - public LengthStructureMatrixRenderer(Project project, AbstractDataContainer container) { - this.project = project; - this.container = container; - } - - /** - * Pour modification du titre du graphique. - * - * Coser : projecttitle : selectiontitle - */ - protected JFreeChart getJFreeChart(MatrixND matrix) { - String title = "Coser: " + project.getName(); - if (container instanceof Selection) { - title += ": " + ((Selection)container).getName(); - } - JFreeChart chart = new JFreeChart(title, JFreeChart.DEFAULT_TITLE_FONT, - getCategoryPlot(matrix), true); - return chart; - } - - @Override - protected CategoryDataset getCategoryDataset(MatrixND matrix) { - return getLengthStructureDataSet(matrix); - } - - protected CategoryDataset getLengthStructureDataSet(MatrixND matrix) { - CategoryDataset dataset = null; - - String semantic0Name = matrix.getDimensionName(0); - if ("coser.business.common.length".equals(semantic0Name)) { - DefaultCategoryDataset defaultDataset = new DefaultCategoryDataset(); - List<?> semantic0 = matrix.getSemantic(0); - double first = Double.MAX_VALUE; - double last = Double.MIN_VALUE; - - // on cherche les bornes qui ont des valeurs sup à 0.0 - // sinon, ya du vide autour des choses demandées - // mais le vide entre est requis (trou de données) - for (Object categorySem : matrix.getSemantic(0)) { - for (Object serieSem : matrix.getSemantic(1)) { - Double value = matrix.getValue(new Object[] { categorySem, serieSem }); - if (value > 0.0) { - double category = (Double)categorySem; - if (first > category) { - first = category; - } - if (last < category) { - last = category; - } - } - } - } - - // on verifie toutes les valeurs pour savoir si c'est un - // pas entier ou un demi pas - boolean haltStep = false; - for (Object number : semantic0) { - double dNumber = (Double)number; - if (dNumber - Math.floor(dNumber) > 0) { - haltStep = true; - break; - } - } - - for (double index = first ; index <= last ; index += (haltStep) ? 0.5 : 1) { - - for (Object serieSem : matrix.getSemantic(1)) { - Double value = null; - - // il n'y a pas de valeur dans la matrices - // pour les pas intermédiaires ajouté - if (semantic0.contains(index)) { - value = matrix.getValue(new Object[] { index, serieSem }); - } - - defaultDataset.setValue((Number)value, (Comparable)serieSem, (Comparable)index); - } - } - dataset = defaultDataset; - } - else { - dataset = new GraphMatrixNDDataset(matrix); - } - return dataset; - } -}

1 0

r459 - in trunk/src/site: . resources resources/images rst rst/user
by chatellier＠users.labs.libre-entreprise.org 03 Jan '11

03 Jan '11

Author: chatellier Date: 2011-01-03 16:20:32 +0000 (Mon, 03 Jan 2011) New Revision: 459 Log: Update du site (screenshots) Added: trunk/src/site/resources/ trunk/src/site/resources/images/ trunk/src/site/resources/images/01-noproject.png trunk/src/site/resources/images/02-createproject.png trunk/src/site/resources/images/03-openproject.png trunk/src/site/resources/images/04-projectsummary.png trunk/src/site/resources/images/10-controlmain.png trunk/src/site/resources/images/20-selectiondetail.png trunk/src/site/resources/images/21-selectionyears.png trunk/src/site/resources/images/22-selectionstrata.png trunk/src/site/resources/images/23-selectionspecies.png trunk/src/site/resources/images/24-selectionlists.png trunk/src/site/resources/images/25-selectionresults.png trunk/src/site/resources/images/90-configurationpath.png trunk/src/site/resources/images/91-configurationvalues.png trunk/src/site/resources/images/Sans titre.xcf trunk/src/site/rst/user/configuration.rst trunk/src/site/rst/user/controls.rst trunk/src/site/rst/user/faq.rst Removed: trunk/src/site/rst/user/validation.rst Modified: trunk/src/site/rst/index.rst trunk/src/site/site_fr.xml Added: trunk/src/site/resources/images/01-noproject.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/01-noproject.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/images/02-createproject.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/02-createproject.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/images/03-openproject.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/03-openproject.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/images/04-projectsummary.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/04-projectsummary.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/images/10-controlmain.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/10-controlmain.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/images/20-selectiondetail.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/20-selectiondetail.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/images/21-selectionyears.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/21-selectionyears.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/images/22-selectionstrata.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/22-selectionstrata.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/images/23-selectionspecies.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/23-selectionspecies.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/images/24-selectionlists.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/24-selectionlists.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/images/25-selectionresults.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/25-selectionresults.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/images/90-configurationpath.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/90-configurationpath.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/images/91-configurationvalues.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/91-configurationvalues.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/images/Sans titre.xcf =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/Sans titre.xcf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2011-01-03 16:19:58 UTC (rev 458) +++ trunk/src/site/rst/index.rst 2011-01-03 16:20:32 UTC (rev 459) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric +.. * Copyright (C) 2010 - 2011 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,8 +22,26 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - -Coser -===== +Accueil +======= -Contrôle et Sélection RSufi. +Coser (Contrôle et Sélection RSufi) est une application de contrôle de données +(export CSV à partir d'une base de données) et de sélection de données avant +traitement par une application externe : RSufi. +Les résultats issus de RSufi sont ensuite enregistrés dans l'application coser +en vue d'être sélectionné pour être publié sur le site : +http://www.ifremer.fr/SIH-indices-campagnes/. + + +Fonctionnalités +=============== + + * gestion des 4 fichiers de données (captures, strates, tailles, traits). + * controle des erreurs sur le format des données + * controle en lien avec le référentiel taxonomique (reftax) + * historisation des modifications + * rapport de modification + * génération de graphique + * selection des listes d'especes pour RSUfi (L1, L2, L3, L4) + * enregistrement des résultats RSUfi Added: trunk/src/site/rst/user/configuration.rst =================================================================== --- trunk/src/site/rst/user/configuration.rst (rev 0) +++ trunk/src/site/rst/user/configuration.rst 2011-01-03 16:20:32 UTC (rev 459) @@ -0,0 +1,29 @@ +.. - +.. * #%L +.. * Coser +.. * +.. * $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% +.. - +Configuration +============= + +Source : http://struts.apache.org/2.x/docs/validation.html + Copied: trunk/src/site/rst/user/controls.rst (from rev 207, trunk/src/site/rst/user/validation.rst) =================================================================== --- trunk/src/site/rst/user/controls.rst (rev 0) +++ trunk/src/site/rst/user/controls.rst 2011-01-03 16:20:32 UTC (rev 459) @@ -0,0 +1,29 @@ +.. - +.. * #%L +.. * Coser +.. * +.. * $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% +.. - +Validation +========== + +Source : http://struts.apache.org/2.x/docs/validation.html + Added: trunk/src/site/rst/user/faq.rst =================================================================== --- trunk/src/site/rst/user/faq.rst (rev 0) +++ trunk/src/site/rst/user/faq.rst 2011-01-03 16:20:32 UTC (rev 459) @@ -0,0 +1,32 @@ +.. - +.. * #%L +.. * Coser +.. * +.. * $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% +.. - +Foire aux questions +=================== + +.. contents:: + +Au lancement de l'application JavaWebStart le message "Impossible de lancer l'application" apparait +--------------------------------------------------------------------------------------------------- + Deleted: trunk/src/site/rst/user/validation.rst =================================================================== --- trunk/src/site/rst/user/validation.rst 2011-01-03 16:19:58 UTC (rev 458) +++ trunk/src/site/rst/user/validation.rst 2011-01-03 16:20:32 UTC (rev 459) @@ -1,29 +0,0 @@ -.. - -.. * #%L -.. * Coser -.. * -.. * $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% -.. - -Validation -========== - -Source : http://struts.apache.org/2.x/docs/validation.html - Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2011-01-03 16:19:58 UTC (rev 458) +++ trunk/src/site/site_fr.xml 2011-01-03 16:20:32 UTC (rev 459) @@ -57,7 +57,11 @@ <item name="Accueil" href="index.html" /> <item name="Lancement" href="download.html" /> <item name="Utilisateur" href="user.html"> - <item name="Validation" href="user/validation.html" /> + <item name="Configuration" href="user/configuration.html" /> + <item name="Projet" href="user/guide_project.html" /> + <item name="Control" href="user/guide_project.html" /> + <item name="Controles" href="user/controls.html" /> + <item name="FAQ" href="user/faq.html" /> </item> <item name="Développeur" href="developer.html"> <item name="Coser Project layout" href="directory.html" />

1 0

r458 - in trunk: coser-business/src/main/java/fr/ifremer/coser coser-business/src/main/java/fr/ifremer/coser/services coser-web/src/main/java/fr/ifremer/coser/web/actions coser-web/src/main/webapp/WEB-INF/content
by chatellier＠users.labs.libre-entreprise.org 03 Jan '11

03 Jan '11

Author: chatellier Date: 2011-01-03 16:19:58 +0000 (Mon, 03 Jan 2011) New Revision: 458 Log: Fix des indicateurs en fonction des especes Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SelectIndicatorAction.java trunk/coser-web/src/main/webapp/WEB-INF/content/select-indicator.jsp trunk/coser-web/src/main/webapp/WEB-INF/content/select-species.jsp Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java 2011-01-03 14:14:02 UTC (rev 457) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java 2011-01-03 16:19:58 UTC (rev 458) @@ -41,6 +41,9 @@ /** CSV Separator. */ public static final char CSV_SEPARATOR_CHAR = ';'; + /** CSV Separator for result file (estcomind/estpopind). */ + public static final char CSV_RESULT_SEPARATOR_CHAR = '\t'; + /** CSV File encoding. */ public static final String CSV_FILE_ENCODING = "UTF-8"; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java 2011-01-03 14:14:02 UTC (rev 457) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java 2011-01-03 16:19:58 UTC (rev 458) @@ -88,7 +88,7 @@ * @param project project * @param category category * @param file file to load - * @return project + * @return data storage with file content * @throws CoserBusinessException */ public DataStorage loadCSVFile(Project project, Category category, File file) throws CoserBusinessException { @@ -102,7 +102,7 @@ * @param category category * @param file file to load * @param progress progress monitor (can be null) - * @return project + * @return data storage with file content * @throws CoserBusinessException */ public DataStorage loadCSVFile(Project project, Category category, File file, ProgressMonitor progress) throws CoserBusinessException { @@ -118,7 +118,7 @@ * @param progress progress monitor (can be null) * @param originalLoading dans le cas d'un reload, la colonne "line" est a prendre en compte * pour les data (elle est absente dans les jeux de données originaux) - * @return project + * @return data storage with file content * @throws CoserBusinessException */ public DataStorage loadCSVFile(Project project, Category category, File file, ProgressMonitor progress, boolean originalLoading) throws CoserBusinessException { @@ -327,4 +327,49 @@ return content; } + + /** + * Charge un fichier de résultat (estcomind/estpopind). C'est a peu pret + * le meme code qu'au dessus, sauf que le storage est simplement retourné + * et que les séparateurs ne sont pas les même. + * + * @param file file to load + * @return data storage with file content + * @throws CoserBusinessException + */ + public DataStorage loadResultCSVFile(File file) throws CoserBusinessException { + + DataStorage content = new MemoryDataStorage(); + + CSVReader csvReader = null; + try { + + InputStream stream = new FileInputStream(file); + Reader reader = new BufferedReader(new InputStreamReader(stream, CoserConstants.CSV_FILE_ENCODING)); + csvReader = new CSVReader(reader, CoserConstants.CSV_RESULT_SEPARATOR_CHAR); + + // check header + String[] line = csvReader.readNext(); + if (line == null || line.length <= 1) { + throw new CoserBusinessException(_("Can't read file '%s'. Check CSV file separator", + file.getAbsolutePath())); + } + else { + content.add(line); + } + + while ((line = csvReader.readNext()) != null) { + if (line.length>1) { + content.add(line); + } + } + } catch (IOException ex) { + throw new CoserBusinessException("Can't read file", ex); + } + finally { + IOUtils.closeQuietly(csvReader); + } + + return content; + } } Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-01-03 14:14:02 UTC (rev 457) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-01-03 16:19:58 UTC (rev 458) @@ -40,10 +40,12 @@ import fr.ifremer.coser.CoserBusinessConfig; import fr.ifremer.coser.CoserBusinessException; +import fr.ifremer.coser.CoserConstants; import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.bean.RSufiResult; import fr.ifremer.coser.bean.Selection; import fr.ifremer.coser.data.Catch; +import fr.ifremer.coser.storage.DataStorage; /** * Service for web server. @@ -60,11 +62,14 @@ protected CoserBusinessConfig config; + protected ImportService importService; + protected ProjectService projectService; public WebService(CoserBusinessConfig config) { this.config = config; + importService = new ImportService(config); projectService = new ProjectService(config); } @@ -103,6 +108,7 @@ Map<String, String> result = new TreeMap<String, String>(); + // parcours des resultats disponibles File webDirectory = config.getWebServerDirectory(); File newDirectory = new File(webDirectory, "tutu"); File[] projectFiles = newDirectory.listFiles(); @@ -110,13 +116,14 @@ for (File projectFile : projectFiles) { if (projectFile.isDirectory()) { Project project = projectService.openProject(projectFile.getName(), newDirectory); - + for (Selection selection : project.getSelections().values()) { boolean resultFound = false; for (RSufiResult rsufiResult : selection.getRsufiResults()) { + + // extraction des especes pour le résultat demandé if (rsufiResult.getZone() != null && rsufiResult.getZone().equals(zone)) { - projectService.loadSelectionData(project, selection); Map<String, String> resultSpecies = getRsufiResultSpecies(project, selection, rsufiResult); result.putAll(resultSpecies); resultFound = true; @@ -139,13 +146,14 @@ * Recupere la liste de toutes les especes nom sci et nom off à partir * d'un resultat. * - * @param project - * @param selection - * @param rsufiResult - * @return + * @param project project + * @param selection selection + * @param rsufiResult rsufi result + * @return map with each species code/species name + * @throws CoserBusinessException */ protected Map<String, String> getRsufiResultSpecies(Project project, - Selection selection, RSufiResult rsufiResult) { + Selection selection, RSufiResult rsufiResult) throws CoserBusinessException { Map<String, String> result = new HashMap<String, String>(); // load reftax in memory @@ -163,61 +171,129 @@ } // get this selection data - // FIXME echatellier sould be result data, but there is no such data - Iterator<String[]> catchIterator = selection.getCatch().iterator(); - catchIterator.next(); // skip header - while (catchIterator.hasNext()) { - String[] tuple = catchIterator.next(); - - String specyCode = tuple[Catch.INDEX_SPECIES]; + + // un peu lourd mais reconstruit le path jusqu'au fichier estcomind + File webDirectory = config.getWebServerDirectory(); + File newDirectory = new File(webDirectory, "tutu"); + File projectDirectory = new File(newDirectory, project.getName()); + File selectionsDirectory = new File(projectDirectory, CoserConstants.STORAGE_SELECTION_DIRECTORY); + File selectionDirectory = new File(selectionsDirectory, selection.getName()); + File resultsDirectory = new File(selectionDirectory, CoserConstants.STORAGE_RESULTS_DIRECTORY); + File resultDirectory = new File(resultsDirectory, rsufiResult.getName()); + File estPopIndFile = new File(resultDirectory, rsufiResult.getEstPopIndName()); + + // Campagne Indicateur Liste Espece Strate Annee Estimation EcartType CV + DataStorage dataStorage = importService.loadResultCSVFile(estPopIndFile); + + Iterator<String[]> estPopIndIterator = dataStorage.iterator(); + estPopIndIterator.next(); // skip header + while (estPopIndIterator.hasNext()) { + String[] tuple = estPopIndIterator.next(); + + String specyCode = tuple[3]; String specyName = speciesNames.get(specyCode); - + if (StringUtils.isNotEmpty(specyName)) { result.put(specyCode, specyName); } } - + return result; } /** - * Retourne les indicateurs calculables. + * Retourne les indicateurs calculés. * * @param zone zone * @param species especes * @return la liste des indicateurs + * @throws CoserBusinessException */ - public Map<String, String> getIndicators(String zone, String species) { + public Map<String, String> getIndicators(String zone, String species) throws CoserBusinessException { Map<String, String> indicators = new TreeMap<String, String>(); - // populations - indicators.put("Abundance", "Abundance"); - indicators.put("lnN", "lnN"); - //indicators.put("Dbar", "Dbar"); - indicators.put("Wbar", "Wbar"); - indicators.put("Biomass", "Biomass"); - indicators.put("Lbar", "Lbar"); - //indicators.put("propMat", "propMat"); - indicators.put("L50", "L50"); - //indicators.put("sexRatio", "sexRatio"); - //indicators.put("Zmoy", "Zmoy"); + // parcours des resultats disponibles + File webDirectory = config.getWebServerDirectory(); + File newDirectory = new File(webDirectory, "tutu"); + File[] projectFiles = newDirectory.listFiles(); + if (projectFiles != null) { + for (File projectFile : projectFiles) { + if (projectFile.isDirectory()) { + Project project = projectService.openProject(projectFile.getName(), newDirectory); - // communauté - indicators.put("Delta", "Delta"); - indicators.put("Gtot", "Gtot"); - //indicators.put("Shannonmod", "Shannonmod"); - indicators.put("meanWbar", "meanWbar"); - indicators.put("NBWtot", "NBWtot"); - //indicators.put("propL", "propL"); - indicators.put("propLW", "propLW"); - indicators.put("meanQuant", "meanQuant"); - //indicators.put("biomSmall", "biomSmall"); - //indicators.put("biomBig", "biomBig"); + for (Selection selection : project.getSelections().values()) { + boolean resultFound = false; + + for (RSufiResult rsufiResult : selection.getRsufiResults()) { + + // extraction des especes pour le résultat demandé + if (rsufiResult.getZone() != null && rsufiResult.getZone().equals(zone)) { + // data loading not necessary here + Map<String, String> resultIndicators = getRsufiResultIndicators(project, selection, rsufiResult, species); + indicators.putAll(resultIndicators); + resultFound = true; + break; + } + } + + if (resultFound) { + break; + } + } + } + } + } return indicators; } /** + * Recupere la liste de toutes les especes nom sci et nom off à partir + * d'un resultat. + * + * @param project + * @param selection + * @param rsufiResult + * @param species to get indicator + * @return indicator for species + * @throws CoserBusinessException + */ + protected Map<String, String> getRsufiResultIndicators(Project project, + Selection selection, RSufiResult rsufiResult, String species) throws CoserBusinessException { + Map<String, String> result = new HashMap<String, String>(); + + // on peu lours mais reconstruit le path jusqu'au fichier estcomind + File webDirectory = config.getWebServerDirectory(); + File newDirectory = new File(webDirectory, "tutu"); + File projectDirectory = new File(newDirectory, project.getName()); + File selectionsDirectory = new File(projectDirectory, CoserConstants.STORAGE_SELECTION_DIRECTORY); + File selectionDirectory = new File(selectionsDirectory, selection.getName()); + File resultsDirectory = new File(selectionDirectory, CoserConstants.STORAGE_RESULTS_DIRECTORY); + File resultDirectory = new File(resultsDirectory, rsufiResult.getName()); + + // le fichier estcomind + File estPopIndFile = new File(resultDirectory, rsufiResult.getEstPopIndName()); + + // Campagne Indicateur Liste Espece Strate Annee Estimation EcartType CV + DataStorage dataStorage = importService.loadResultCSVFile(estPopIndFile); + + Iterator<String[]> estPopIndIterator = dataStorage.iterator(); + estPopIndIterator.next(); // skip header + while (estPopIndIterator.hasNext()) { + String[] tuple = estPopIndIterator.next(); + + String specyCode = tuple[3]; + if (specyCode.equals(species)) { + + String indicatorCode = tuple[1]; + result.put(indicatorCode, indicatorCode); + } + } + + return result; + } + + /** * Generer les données du graph et genere la liste des parametres pour * les generateurs de graph (eastwood ou jfreechart). * Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SelectIndicatorAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SelectIndicatorAction.java 2011-01-03 14:14:02 UTC (rev 457) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/SelectIndicatorAction.java 2011-01-03 16:19:58 UTC (rev 458) @@ -24,9 +24,14 @@ import java.util.Map; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import com.opensymphony.xwork2.ActionSupport; +import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.services.WebService; +import fr.ifremer.coser.web.CoserWebException; import fr.ifremer.coser.web.ServiceFactory; /** @@ -43,6 +48,8 @@ /** serialVersionUID. */ private static final long serialVersionUID = 1663244944108703571L; + private static final Log log = LogFactory.getLog(SelectIndicatorAction.class); + protected String zone; protected String species; @@ -72,10 +79,18 @@ @Override public String execute() { + if (log.isInfoEnabled()) { + log.info(String.format("Looking for indicator for zone %s and species %s", zone, species)); + } + WebService webService = ServiceFactory.getWebService(); - - indicators = webService.getIndicators(zone, species); + try { + indicators = webService.getIndicators(zone, species); + } catch (CoserBusinessException ex) { + throw new CoserWebException("Can't get indicators", ex); + } + return SUCCESS; } } Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/select-indicator.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/select-indicator.jsp 2011-01-03 14:14:02 UTC (rev 457) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/select-indicator.jsp 2011-01-03 16:19:58 UTC (rev 458) @@ -36,8 +36,8 @@ <s:form action="show-graph" method="get"> <s:select name="indicator" list="indicators" label="Select an indicator" /> - <s:hidden name="zone" value="zone" /> - <s:hidden name="species" value="species" /> + <s:hidden name="zone" property="zone"/> + <s:hidden name="species" property="species"/> <s:submit label="Suite"/> </s:form> </body> Modified: trunk/coser-web/src/main/webapp/WEB-INF/content/select-species.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/content/select-species.jsp 2011-01-03 14:14:02 UTC (rev 457) +++ trunk/coser-web/src/main/webapp/WEB-INF/content/select-species.jsp 2011-01-03 16:19:58 UTC (rev 458) @@ -37,7 +37,7 @@ <s:form action="select-indicator" method="get"> <s:select name="species" list="species" label="Select a species" /> - <s:hidden name="zone" value="zone" /> + <s:hidden name="zone" property="zone"/> <s:submit label="Suite"/> </s:form> </body>

1 0

r457 - in trunk/coser-ui/src/main: java/fr/ifremer/coser/ui java/fr/ifremer/coser/ui/option resources/i18n
by chatellier＠users.labs.libre-entreprise.org 03 Jan '11

03 Jan '11

Author: chatellier Date: 2011-01-03 14:14:02 +0000 (Mon, 03 Jan 2011) New Revision: 457 Log: Add home view with lorem ipsum text Added: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/HomeView.jaxx Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/OptionHandler.java trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx 2011-01-03 09:53:04 UTC (rev 456) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx 2011-01-03 14:14:02 UTC (rev 457) @@ -60,13 +60,14 @@ <fr.ifremer.coser.ui.widgets.LookAndFeelViewMenuItem text="coser.ui.mainframe.menu.view.lookandfeel" onPropertyChange="getHandler().saveLookAndFeelConfiguration(event)"/> </JMenu> - + <JMenu id='menuHelp' text="coser.ui.mainframe.menu.help"> <JMenuItem text="coser.ui.mainframe.menu.website" onActionPerformed="getHandler().showCoserWebsite()"/> </JMenu> </JMenuBar> <JPanel id="mainViewContent" layout="{new BorderLayout()}" constraints="BorderLayout.CENTER"> + <HomeView handler="{getHandler()}" /> </JPanel> <StatusMessagePanel constraints='BorderLayout.SOUTH' /> 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 2011-01-03 09:53:04 UTC (rev 456) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2011-01-03 14:14:02 UTC (rev 457) @@ -107,6 +107,15 @@ } /** + * Show home view. + */ + public void showHomeView() { + HomeView homeView = new HomeView(); + homeView.setHandler(this); + setMainComponent(homeView); + } + + /** * Display new creation view in main view. */ public void showProjectCreationView() { @@ -231,9 +240,9 @@ * Ferme le projet. */ public void closeProject() { - setMainComponent(null); view.setProject(null); view.setTitle(_("coser.ui.mainview.titleempty")); + showHomeView(); } /** Added: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/HomeView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/HomeView.jaxx (rev 0) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/HomeView.jaxx 2011-01-03 14:14:02 UTC (rev 457) @@ -0,0 +1,32 @@ + +<JPanel layout="{new BorderLayout()}"> + + <CoserFrameHandler id="handler" javaBean="null" /> + + <JLabel text='coser.ui.home.text' constraints="BorderLayout.CENTER" + horizontalAlignment="{SwingConstants.CENTER}" /> + +</JPanel> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/OptionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/OptionHandler.java 2011-01-03 09:53:04 UTC (rev 456) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/OptionHandler.java 2011-01-03 14:14:02 UTC (rev 457) @@ -28,16 +28,12 @@ import java.net.URL; import java.util.List; -import javax.swing.JComponent; -import javax.swing.JPanel; -import javax.swing.plaf.PanelUI; import javax.swing.tree.TreePath; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jdesktop.jxlayer.plaf.BufferedLayerUI; import org.nuiton.util.Resource; import fr.ifremer.coser.CoserConfig; 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 2011-01-03 09:53:04 UTC (rev 456) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2011-01-03 14:14:02 UTC (rev 457) @@ -62,6 +62,7 @@ coser.ui.graph.compareNumberCatchLength=Comparison Catch/Length coser.ui.graph.compareNumberCatchLengthTip=Display catch and length number comparison graphs (data are generated only during error check) coser.ui.graph.lengthStructure=Length structure +coser.ui.home.text=Pro viri copia cum lassatis cuius inopia est sine provenisset pauloque frumentum horreis indolis consule provenisset<br />actitatum provenisset segetum etiam provenisset negotium integre textum tempore copia sine viri sine negotium dedit<br />regeret indolis dedit destinatis dedit destinatis provenisset Romano sine actitatum negotium<br />sine iam provenisset sine Africam iam praeclarae copia cum Africam viri actitatum frumentum tempore victus Romano pauloque<br />sine textum pro Africam praeclarae est actitatum copia restituit negotium esse indolis<br />iam copia cum regeret novimus consule horreis frumentum indolis cum postea cuius lassatis cum indoli<br />copia lassatis cum novimus mora ex praeclarae iam pro horreis Romano ex regeret indolis etiam. coser.ui.locale.mustRestart=You must restart application to take effect coser.ui.locale.title=Locale modification coser.ui.mainframe.menu.closeProject=Close project 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 2011-01-03 09:53:04 UTC (rev 456) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2011-01-03 14:14:02 UTC (rev 457) @@ -62,6 +62,7 @@ coser.ui.graph.compareNumberCatchLength=Comparaison Captures/Tailles coser.ui.graph.compareNumberCatchLengthTip=Affiche les graphiques de comparaison des nombres entre les captures et les tailles (Les donn\u00E9es sont g\u00E9n\u00E9r\u00E9es uniquement lors de la v\u00E9rification des erreurs) coser.ui.graph.lengthStructure=Structures en taille +coser.ui.home.text=<html><center>Pro viri copia cum lassatis cuius inopia est sine provenisset pauloque frumentum horreis <b>indolis consule provenisset</b><br />actitatum provenisset segetum etiam provenisset negotium integre textum tempore copia sine viri sine negotium dedit<br />regeret indolis dedit destinatis dedit destinatis provenisset Romano sine actitatum negotium<br />sine iam provenisset sine Africam iam praeclarae copia cum Africam viri actitatum frumentum tempore victus Romano pauloque<br />sine textum pro Africam praeclarae est actitatum copia restituit negotium esse indolis<br />iam copia cum regeret novimus consule horreis frumentum indolis cum postea cuius lassatis cum indoli<br />copia lassatis cum novimus mora ex praeclarae iam pro horreis Romano ex regeret indolis etiam.</center></html> coser.ui.locale.mustRestart=Vous devez red\u00E9marrer l'application pour prendre en compte la modification. coser.ui.locale.title=Modification de la langue coser.ui.mainframe.menu.closeProject=Fermer le projet

1 0

r456 - in trunk: coser-ui/src/main/java/fr/ifremer/coser coser-ui/src/main/java/fr/ifremer/coser/ui coser-web/src/main/java/fr/ifremer/coser/web/actions
by chatellier＠users.labs.libre-entreprise.org 03 Jan '11

03 Jan '11

Author: chatellier Date: 2011-01-03 09:53:04 +0000 (Mon, 03 Jan 2011) New Revision: 456 Log: Remove deprecated converter Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java 2011-01-03 09:49:59 UTC (rev 455) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java 2011-01-03 09:53:04 UTC (rev 456) @@ -27,11 +27,6 @@ import static org.nuiton.i18n.I18n._; -import java.util.Locale; - -import org.apache.commons.beanutils.ConvertUtils; -import org.nuiton.util.LocaleConverter; - /** * Coser application configuration. * @@ -44,7 +39,6 @@ public class CoserConfig extends CoserBusinessConfig { public CoserConfig() { - ConvertUtils.register(new LocaleConverter(), Locale.class); // init configuration with default options for (CoserOption o : CoserOption.values()) { 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 2011-01-03 09:49:59 UTC (rev 455) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2011-01-03 09:53:04 UTC (rev 456) @@ -32,7 +32,6 @@ import java.io.File; import java.io.IOException; import java.net.URI; -import java.net.URL; import java.util.List; import java.util.Locale; @@ -45,7 +44,6 @@ import jaxx.runtime.swing.editor.config.ConfigUI; import jaxx.runtime.swing.editor.config.ConfigUIHelper; -import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.widget.SwingSession; @@ -56,7 +54,6 @@ import fr.ifremer.coser.CoserException; import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.bean.Selection; -import fr.ifremer.coser.data.Catch; import fr.ifremer.coser.services.ProjectService; import fr.ifremer.coser.ui.common.CommonHandler; import fr.ifremer.coser.ui.control.ControlHandler; Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java 2011-01-03 09:49:59 UTC (rev 455) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/IndexAction.java 2011-01-03 09:53:04 UTC (rev 456) @@ -28,7 +28,6 @@ import java.util.Date; import java.util.Properties; -import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import org.apache.struts2.ServletActionContext;

1 0

r455 - in trunk/coser-web/src/main: resources webapp/WEB-INF/decorators webapp/images
by chatellier＠users.labs.libre-entreprise.org 03 Jan '11

03 Jan '11

Author: chatellier Date: 2011-01-03 09:49:59 +0000 (Mon, 03 Jan 2011) New Revision: 455 Log: Mise ?\195?\160 jour du logo sih Added: trunk/coser-web/src/main/webapp/images/logo_sih.png Removed: trunk/coser-web/src/main/webapp/images/logo_sih.gif Modified: trunk/coser-web/src/main/resources/struts.xml trunk/coser-web/src/main/webapp/WEB-INF/decorators/header.jsp Modified: trunk/coser-web/src/main/resources/struts.xml =================================================================== --- trunk/coser-web/src/main/resources/struts.xml 2011-01-03 09:25:40 UTC (rev 454) +++ trunk/coser-web/src/main/resources/struts.xml 2011-01-03 09:49:59 UTC (rev 455) @@ -25,5 +25,8 @@ <!DOCTYPE struts PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" "http://struts.apache.org/dtds/struts-2.0.dtd"> <struts> +  <constant name="struts.multipart.maxSize" value="100097152"/> +  </struts> Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/header.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/header.jsp 2011-01-03 09:25:40 UTC (rev 454) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/header.jsp 2011-01-03 09:49:59 UTC (rev 455) @@ -26,7 +26,7 @@ <div> <img src="images/logo_ifremer.gif" style="width:333px;heigth:69px" /> - <img src="images/logo_sih.gif" /> + <img src="images/logo_sih.png" style="width:178px;heigth:89px" /> <s:url id="localeEN" namespace="/" action="locale"> <s:param name="request_locale" >en</s:param> Deleted: trunk/coser-web/src/main/webapp/images/logo_sih.gif =================================================================== (Binary files differ) Added: trunk/coser-web/src/main/webapp/images/logo_sih.png =================================================================== (Binary files differ) Property changes on: trunk/coser-web/src/main/webapp/images/logo_sih.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r454 - in trunk: . coser-ui coser-web/src/main/java/fr/ifremer/coser/web coser-web/src/main/resources coser-web/src/main/resources/fr/ifremer/coser/web/actions coser-web/src/main/webapp/WEB-INF coser-web/src/main/webapp/styles
by chatellier＠users.labs.libre-entreprise.org 03 Jan '11

03 Jan '11

Author: chatellier Date: 2011-01-03 09:25:40 +0000 (Mon, 03 Jan 2011) New Revision: 454 Log: Fix build (scope) and headers Modified: trunk/coser-ui/pom.xml trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConstants.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebException.java trunk/coser-web/src/main/java/fr/ifremer/coser/web/ServiceFactory.java trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction.properties trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction_en.properties trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction_fr.properties trunk/coser-web/src/main/resources/log4j.properties trunk/coser-web/src/main/resources/struts.xml trunk/coser-web/src/main/webapp/WEB-INF/decorators.xml trunk/coser-web/src/main/webapp/styles/coser.css trunk/pom.xml Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2010-12-30 20:22:46 UTC (rev 453) +++ trunk/coser-ui/pom.xml 2011-01-03 09:25:40 UTC (rev 454) @@ -30,6 +30,14 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> Modified: trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConstants.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConstants.java 2010-12-30 20:22:46 UTC (rev 453) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebConstants.java 2011-01-03 09:25:40 UTC (rev 454) @@ -1,25 +1,22 @@ /* * #%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. + * 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/main/java/fr/ifremer/coser/web/CoserWebException.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebException.java 2010-12-30 20:22:46 UTC (rev 453) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/CoserWebException.java 2011-01-03 09:25:40 UTC (rev 454) @@ -6,18 +6,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 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 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>. + * 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/main/java/fr/ifremer/coser/web/ServiceFactory.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/ServiceFactory.java 2010-12-30 20:22:46 UTC (rev 453) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/ServiceFactory.java 2011-01-03 09:25:40 UTC (rev 454) @@ -1,25 +1,22 @@ /* * #%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. + * 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/main/resources/fr/ifremer/coser/web/actions/IndexAction.properties =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction.properties 2010-12-30 20:22:46 UTC (rev 453) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction.properties 2011-01-03 09:25:40 UTC (rev 454) @@ -1 +1,24 @@ +### +# #%L +# Coser :: Web +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2010 - 2011 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% +### message.index.title=Default Populations and communities indices, resulting from Ifremer monitoring halieutics survey \ No newline at end of file Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction_en.properties =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction_en.properties 2010-12-30 20:22:46 UTC (rev 453) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction_en.properties 2011-01-03 09:25:40 UTC (rev 454) @@ -1 +1,24 @@ +### +# #%L +# Coser :: Web +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2010 - 2011 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% +### message.index.title=Populations and communities indices, resulting from Ifremer monitoring halieutics survey \ No newline at end of file Modified: trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction_fr.properties =================================================================== --- trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction_fr.properties 2010-12-30 20:22:46 UTC (rev 453) +++ trunk/coser-web/src/main/resources/fr/ifremer/coser/web/actions/IndexAction_fr.properties 2011-01-03 09:25:40 UTC (rev 454) @@ -1 +1,24 @@ +### +# #%L +# Coser :: Web +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2010 - 2011 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% +### message.index.title=Indices de populations et de communauté issus des campagnes de surveillance halieutique de l'Ifremer \ No newline at end of file Modified: trunk/coser-web/src/main/resources/log4j.properties =================================================================== --- trunk/coser-web/src/main/resources/log4j.properties 2010-12-30 20:22:46 UTC (rev 453) +++ trunk/coser-web/src/main/resources/log4j.properties 2011-01-03 09:25:40 UTC (rev 454) @@ -1,25 +1,22 @@ ### # #%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. +# 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/main/resources/struts.xml =================================================================== --- trunk/coser-web/src/main/resources/struts.xml 2010-12-30 20:22:46 UTC (rev 453) +++ trunk/coser-web/src/main/resources/struts.xml 2011-01-03 09:25:40 UTC (rev 454) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8" ?> + + <!DOCTYPE struts PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" "http://struts.apache.org/dtds/struts-2.0.dtd"> <struts> <constant name="struts.multipart.maxSize" value="100097152"/> Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators.xml 2010-12-30 20:22:46 UTC (rev 453) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators.xml 2011-01-03 09:25:40 UTC (rev 454) @@ -1,3 +1,26 @@ + <decorators defaultdir="/WEB-INF/decorators"> <excludes> <pattern>/styles/*</pattern> Modified: trunk/coser-web/src/main/webapp/styles/coser.css =================================================================== --- trunk/coser-web/src/main/webapp/styles/coser.css 2010-12-30 20:22:46 UTC (rev 453) +++ trunk/coser-web/src/main/webapp/styles/coser.css 2011-01-03 09:25:40 UTC (rev 454) @@ -1,3 +1,26 @@ +/* + * #%L + * Coser :: Web + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 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% + */ body { background-color: #1F7DCB; color: #2A2A2A; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-30 20:22:46 UTC (rev 453) +++ trunk/pom.xml 2011-01-03 09:25:40 UTC (rev 454) @@ -110,7 +110,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>1.5.2</version> + <version>1.5.3</version> <scope>compile</scope> </dependency> @@ -236,7 +236,7 @@ <groupId>org.apache.struts</groupId> <artifactId>struts2-sitemesh-plugin</artifactId> <version>${struts.version}</version> - <scope>compile</scope> + <scope>runtime</scope> </dependency> <dependency> @@ -298,7 +298,7 @@ <license.organizationName>Ifremer, Codelutin</license.organizationName>  - <jaxx.version>2.2.4</jaxx.version> + <jaxx.version>2.2.5</jaxx.version> <i18n.version>2.0.1</i18n.version> <struts.version>2.2.1.1</struts.version> </properties>

1 0