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

r642 - trunk/coser-business/src/main/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 02 Feb '11

02 Feb '11

Author: chatellier Date: 2011-02-02 10:05:56 +0000 (Wed, 02 Feb 2011) New Revision: 642 Log: Name extracted result archive as Coserextract<dateofday> Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-02-02 10:00:57 UTC (rev 641) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-02-02 10:05:56 UTC (rev 642) @@ -37,6 +37,8 @@ import java.io.StringWriter; import java.io.Writer; import java.nio.charset.Charset; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collection; import java.util.Date; @@ -71,6 +73,7 @@ import org.apache.http.entity.mime.content.StringBody; import org.apache.http.impl.client.DefaultHttpClient; import org.nuiton.util.FileUtil; +import org.nuiton.util.Resource; import org.nuiton.util.StringUtil; import org.nuiton.util.ZipUtil; import org.w3c.dom.Document; @@ -334,8 +337,18 @@ public File performResultExtract(Collection<RSufiResultPath> selectedResults, Collection<RSufiResultPath> publishDataResults, File extractDirectory) throws CoserBusinessException { File prepareZip = null; try { - prepareZip = File.createTempFile("coserextract-", ".zip", extractDirectory); + // create zip file name not random name + if (extractDirectory == null) { + prepareZip = File.createTempFile("Coserextract-", ".zip"); + } + else { + // cas extraction vers un répertoire specifique + DateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); + String zipName = "Coserextract" + dateFormat.format(new Date()) + ".zip"; + prepareZip = new File(extractDirectory, zipName); + } + // copy selectively all data to target directory MultipleFileFilter mFileFilters = new MultipleFileFilter(); for (RSufiResultPath path : selectedResults) {

1 0

r641 - trunk/coser-ui/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 02 Feb '11

02 Feb '11

Author: chatellier Date: 2011-02-02 10:00:57 +0000 (Wed, 02 Feb 2011) New Revision: 641 Log: Fix i18n Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 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-02-02 09:42:02 UTC (rev 640) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2011-02-02 10:00:57 UTC (rev 641) @@ -229,7 +229,7 @@ coser.ui.selection.tab.lists=Listes des esp\u00E8ces coser.ui.selection.tab.rsufi=RSufi coser.ui.uploadresult.addResults=Ajouter le r\u00E9sultat -coser.ui.uploadresult.availableResults=R\u00E9sultats disponible \: +coser.ui.uploadresult.availableResults=R\u00E9sultats disponibles \: coser.ui.uploadresult.creationDate=Date de cr\u00E9ation coser.ui.uploadresult.explanation=Bienvenue dans l'interface de s\u00E9lection des r\u00E9sultats \u00E0 envoyer sur le serveur Coser. Seul les administrateurs disposant du mot de passe peuvent effectuer cette action. coser.ui.uploadresult.exportUploadTitle=Exporter/Uploader

1 0

r640 - in trunk: coser-ui/src/main/java/fr/ifremer/coser/ui coser-ui/src/main/resources/icons coser-web/src/main/webapp coser-web/src/main/webapp/WEB-INF/decorators coser-web/src/main/webapp/images
by chatellier＠users.labs.libre-entreprise.org 02 Feb '11

02 Feb '11

Author: chatellier Date: 2011-02-02 09:42:02 +0000 (Wed, 02 Feb 2011) New Revision: 640 Log: Add coser logo and favicon Added: trunk/coser-ui/src/main/resources/icons/logo.png trunk/coser-ui/src/main/resources/icons/logo300.png trunk/coser-web/src/main/webapp/images/logo.png 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-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp trunk/coser-web/src/main/webapp/favicon.png 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-02-02 09:38:20 UTC (rev 639) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx 2011-02-02 09:42:02 UTC (rev 640) @@ -23,7 +23,8 @@ #L% --> <JFrame title="coser.ui.mainview.titleempty" layout="{new BorderLayout()}" - name="mainFrame" onWindowClosing="getHandler().quit()"> + name="mainFrame" onWindowClosing="getHandler().quit()" + iconImage='{SwingUtil.createImageIcon("logo.png").getImage()}'> <CoserFrameHandler id="handler" constructorParams="this" /> <fr.ifremer.coser.bean.Project id="project" javaBean="null" /> 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-02-02 09:38:20 UTC (rev 639) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2011-02-02 09:42:02 UTC (rev 640) @@ -26,11 +26,13 @@ import static org.nuiton.i18n.I18n._; import java.awt.BorderLayout; +import java.awt.Color; import java.awt.Component; import java.awt.Desktop; import java.beans.PropertyChangeEvent; import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.net.URI; import java.util.Locale; @@ -43,8 +45,11 @@ import jaxx.runtime.swing.editor.config.ConfigUI; import jaxx.runtime.swing.editor.config.ConfigUIHelper; +import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.Resource; +import org.nuiton.widget.AboutFrame; import org.nuiton.widget.SwingSession; import fr.ifremer.coser.CoserBusinessConfig; @@ -240,12 +245,42 @@ */ public void showAboutView() { CoserConfig config = view.getContextValue(CoserConfig.class); + + /* Logo doesn't not display with that version AboutPanel aboutPanel = new AboutPanel(view); + aboutPanel.setIconPath("/icons/logo300.png"); aboutPanel.setTitle(_("coser.ui.about.title")); aboutPanel.setAboutText(_("coser.ui.about.about", config.getApplicationVersion())); aboutPanel.setLicenseFile("META-INF/coser-ui-LICENSE.txt"); aboutPanel.setThirdpartyFile("META-INF/coser-ui-THIRD-PARTY.txt"); - aboutPanel.showInDialog(view, true); + aboutPanel.init(); + aboutPanel.showInDialog(view, true);*/ + + AboutFrame aboutFrame = new AboutFrame(); + aboutFrame.setTitle(_("coser.ui.about.title")); + aboutFrame.setAboutHtmlText(_("coser.ui.about.about", config.getApplicationVersion())); + aboutFrame.setIconPath("/icons/logo300.png"); + aboutFrame.setIconImage(Resource.getIcon("/icons/logo300.png").getImage()); + InputStream licenseStream = getClass().getResourceAsStream("/META-INF/coser-ui-LICENSE.txt"); + try { + if (licenseStream != null) { + aboutFrame.setLicenseText(IOUtils.toString(licenseStream)); + } + else { + aboutFrame.setLicenseText("No license file found"); + } + } catch (IOException ex) { + if (log.isWarnEnabled()) { + log.warn("Can't read licence file", ex); + } + } + finally { + IOUtils.closeQuietly(licenseStream); + } + aboutFrame.setBackgroundColor(Color.WHITE); + aboutFrame.setSize(600, 600); + aboutFrame.setLocationRelativeTo(view); + aboutFrame.setVisible(true); } /** Added: trunk/coser-ui/src/main/resources/icons/logo.png =================================================================== (Binary files differ) Property changes on: trunk/coser-ui/src/main/resources/icons/logo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/coser-ui/src/main/resources/icons/logo300.png =================================================================== (Binary files differ) Property changes on: trunk/coser-ui/src/main/resources/icons/logo300.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2011-02-02 09:38:20 UTC (rev 639) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2011-02-02 09:42:02 UTC (rev 640) @@ -32,6 +32,7 @@ <script type="text/javascript" language="javascript" src="<s:url value='/js/jquery-1.4.4.min.js' />"></script> <script type="text/javascript" language="javascript" src="<s:url value='/js/coser.js' />"></script> <link rel="stylesheet" type="text/css" href="<s:url value='/styles/coser.css' />" /> + <link rel="icon" type="image/png" href="<s:url value='/favicon.png' />" /> <decorator:head/> </head> <body> Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp 2011-02-02 09:38:20 UTC (rev 639) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp 2011-02-02 09:42:02 UTC (rev 640) @@ -32,6 +32,7 @@ <script type="text/javascript" language="javascript" src="<s:url value='/js/jquery-1.4.4.min.js' />"></script> <script type="text/javascript" language="javascript" src="<s:url value='/js/coser.js' />"></script> <link rel="stylesheet" type="text/css" href="<s:url value='/styles/coser.css' />" /> + <link rel="icon" type="image/png" href="<s:url value='/favicon.png' />" /> <decorator:head/> </head> <body> Modified: trunk/coser-web/src/main/webapp/favicon.png =================================================================== (Binary files differ) Added: trunk/coser-web/src/main/webapp/images/logo.png =================================================================== (Binary files differ) Property changes on: trunk/coser-web/src/main/webapp/images/logo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r639 - trunk
by chatellier＠users.labs.libre-entreprise.org 02 Feb '11

02 Feb '11

Author: chatellier Date: 2011-02-02 09:38:20 +0000 (Wed, 02 Feb 2011) New Revision: 639 Log: Use nuiton-widget stable Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-01 17:12:16 UTC (rev 638) +++ trunk/pom.xml 2011-02-02 09:38:20 UTC (rev 639) @@ -187,7 +187,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-widgets</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1</version> <scope>compile</scope> </dependency>

1 0

r638 - in trunk: coser-business/src/main/java/fr/ifremer/coser coser-business/src/main/java/fr/ifremer/coser/bean coser-business/src/main/java/fr/ifremer/coser/services coser-ui/src/main/java/fr/ifremer/coser/ui/result coser-ui/src/main/java/fr/ifremer/coser/ui/selection coser-ui/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 01 Feb '11

01 Feb '11

Author: chatellier Date: 2011-02-01 17:12:16 +0000 (Tue, 01 Feb 2011) New Revision: 638 Log: Ajout d'info suppl?\195?\169mentaire dans la table des r?\195?\169sultats rsufi Added: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableRenderer.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java trunk/coser-business/src/main/java/fr/ifremer/coser/bean/RSufiResult.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableModel.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionRsufiView.jaxx trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java 2011-02-01 16:23:29 UTC (rev 637) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java 2011-02-01 17:12:16 UTC (rev 638) @@ -64,6 +64,9 @@ /** Nom du dossier de stockage des maps (project AND results). */ public static final String STORAGE_MAPS_DIRECTORY = "maps"; + + /** Nom du dossier de stockage des autres fichier de resultats rsufi. */ + public static final String STORAGE_OTHERS_DIRECTORY = "others"; /** Suffix des nom de fichiers data apres control. */ public static final String STORAGE_CONTROL_SUFFIX = "_co"; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/RSufiResult.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/RSufiResult.java 2011-02-01 16:23:29 UTC (rev 637) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/RSufiResult.java 2011-02-01 17:12:16 UTC (rev 638) @@ -64,6 +64,11 @@ /** Utilisé seulement pour la validation (sinon, non valorisé). */ protected String mapsPath; + /** Utilisé seulement dans l'ui de visu des resultats (presence de carte ou non). */ + protected boolean mapsAvailable; + /** Utilisé seulement dans l'ui de visu des resultats (presence d'autres fichiers ou non). */ + protected boolean otherFilesAvailable; + /** Result publiable. */ protected boolean publiableResult; @@ -173,6 +178,22 @@ return mapsPath; } + public boolean isMapsAvailable() { + return mapsAvailable; + } + + public void setMapsAvailable(boolean mapsAvailable) { + this.mapsAvailable = mapsAvailable; + } + + public boolean isOtherFilesAvailable() { + return otherFilesAvailable; + } + + public void setOtherFilesAvailable(boolean otherFilesAvailable) { + this.otherFilesAvailable = otherFilesAvailable; + } + public void setPubliableResult(boolean publiableResult) { boolean oldValue = this.publiableResult; this.publiableResult = publiableResult; 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 2011-02-01 16:23:29 UTC (rev 637) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2011-02-01 17:12:16 UTC (rev 638) @@ -543,6 +543,14 @@ RSufiResult rsufiResult = getRSufiResult(resultDirectory); rsufiResult.setName(resultDirectory.getName()); results.add(rsufiResult); + + // maps dir exists + File mapsDir = new File(resultDirectory, CoserConstants.STORAGE_MAPS_DIRECTORY); + rsufiResult.setMapsAvailable(mapsDir.isDirectory()); + + // other files dir + File othersDir = new File(resultDirectory, CoserConstants.STORAGE_OTHERS_DIRECTORY); + rsufiResult.setOtherFilesAvailable(othersDir.isDirectory()); } } } @@ -1077,7 +1085,7 @@ } // sauvegarde des fichiers autre - File otherFilesDirectory = new File(rsufiResultDirectory, "others"); + File otherFilesDirectory = new File(rsufiResultDirectory, CoserConstants.STORAGE_OTHERS_DIRECTORY); for (File othersFile : othersFiles) { if (othersFile.isDirectory()) { FileUtils.copyDirectoryToDirectory(othersFile, otherFilesDirectory); @@ -1094,6 +1102,14 @@ throw new CoserBusinessException("Can't save result properties file", ex); } + // maps dir exists + File mapsDir = new File(rsufiResultDirectory, CoserConstants.STORAGE_MAPS_DIRECTORY); + rsufiResult.setMapsAvailable(mapsDir.isDirectory()); + + // other files dir + File othersDir = new File(rsufiResultDirectory, CoserConstants.STORAGE_OTHERS_DIRECTORY); + rsufiResult.setOtherFilesAvailable(othersDir.isDirectory()); + List<RSufiResult> results = selection.getRsufiResults(); results.add(rsufiResult); // this way to fire change event (do not remove) Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableModel.java 2011-02-01 16:23:29 UTC (rev 637) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableModel.java 2011-02-01 17:12:16 UTC (rev 638) @@ -69,7 +69,7 @@ */ @Override public int getColumnCount() { - return 4; + return 7; } @@ -85,11 +85,20 @@ name = _("coser.ui.result.table.rsufiVersion"); break; case 2: + name = _("coser.ui.result.table.zone"); + break; + case 3: name = _("coser.ui.result.table.estComIndFile"); break; - case 3: + case 4: name = _("coser.ui.result.table.estPopIndFile"); break; + case 5: + name = _("coser.ui.result.table.maps"); + break; + case 6: + name = _("coser.ui.result.table.otherfiles"); + break; } return name; } @@ -110,11 +119,20 @@ result = rsufiResult.getRsufiVersion(); break; case 2: + result = rsufiResult.getZone(); + break; + case 3: result = rsufiResult.getEstComIndName(); break; - case 3: + case 4: result = rsufiResult.getEstPopIndName(); break; + case 5: + result = rsufiResult.isMapsAvailable(); + break; + case 6: + result = rsufiResult.isOtherFilesAvailable(); + break; } return result; Added: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableRenderer.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableRenderer.java (rev 0) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableRenderer.java 2011-02-01 17:12:16 UTC (rev 638) @@ -0,0 +1,90 @@ +/* + * #%L + * $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 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.result; + +import static org.nuiton.i18n.I18n._; + +import java.awt.Component; + +import javax.swing.JTable; +import javax.swing.table.DefaultTableCellRenderer; + +import fr.ifremer.coser.CoserBusinessException; +import fr.ifremer.coser.CoserException; +import fr.ifremer.coser.services.WebService; +import fr.ifremer.coser.ui.selection.SelectionRsufiView; + +/** + * Selection result table renderer. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class ResultTableRenderer extends DefaultTableCellRenderer { + + /** serialVersionUID. */ + private static final long serialVersionUID = -9030155088814184637L; + + protected SelectionRsufiView view; + + public ResultTableRenderer(SelectionRsufiView view) { + this.view = view; + } + + @Override + public Component getTableCellRendererComponent(JTable table, Object value, + boolean isSelected, boolean hasFocus, int row, int column) { + + Object localValue = value; + + switch (column) { + case 2: + if (value != null) { + // get web service + try { + WebService webService = view.getContextValue(WebService.class); + localValue = webService.getZoneFullName((String)value); + } catch (CoserBusinessException ex) { + throw new CoserException("Can't get zone name", ex); + } + } + break; + case 5: + case 6: + boolean availale = (Boolean)value; + if (availale) { + localValue = _("coser.ui.common.yes"); + } + else { + localValue = _("coser.ui.common.no"); + } + break; + } + return super.getTableCellRendererComponent(table, localValue, isSelected, hasFocus, + row, column); + } +} Property changes on: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultTableRenderer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionRsufiView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionRsufiView.jaxx 2011-02-01 16:23:29 UTC (rev 637) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionRsufiView.jaxx 2011-02-01 17:12:16 UTC (rev 638) @@ -23,6 +23,12 @@ #L% --> <Table> + <script><![CDATA[ + void $afterCompleteSetup() { + fr.ifremer.coser.ui.result.ResultTableRenderer renderer = new fr.ifremer.coser.ui.result.ResultTableRenderer(this); + selectionResultsTable.setDefaultRenderer(Object.class, renderer); + } + ]]></script> <SelectionHandler id="handler" javaBean="null" /> <row> <cell weightx="1" fill="horizontal" > 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-02-01 16:23:29 UTC (rev 637) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2011-02-01 17:12:16 UTC (rev 638) @@ -12,12 +12,14 @@ coser.ui.about.about=<html><b>Coser</b><br /><br />Version %s<br /><br />Usefull links \:<ul><li><a href\="http\://coser.labs.libre-entreprise.org/">Documentation</a></li><li><a href\="http\://labs.libre-entreprise.org/tracker/?atid\=721&group_id\=164">Bug report</a></li></ul><br /><br />Copyright 2010 - 2011 <a href\="http\://www.ifremer.fr">Ifremer</a>, <a href\="http\://www.codelutin.com">Code Lutin</a><html> coser.ui.about.title=About Coser coser.ui.common.cancel=Cancel +coser.ui.common.no=No coser.ui.common.selectAll=Select all coser.ui.common.selectAll.short=All coser.ui.common.selectFile=Select\u2026 coser.ui.common.unselectAll=Unselect all coser.ui.common.unselectAll.short=None coser.ui.common.valid=Valid +coser.ui.common.yes=Yes coser.ui.config.title=Configuration coser.ui.control.categorylabel=Displayed data \: coser.ui.control.checkData=Check data @@ -153,8 +155,11 @@ coser.ui.result.saveError=Save error coser.ui.result.table.estComIndFile=ESTCOMind file coser.ui.result.table.estPopIndFile=ESTPOPind file +coser.ui.result.table.maps=Maps +coser.ui.result.table.otherfiles=Others files coser.ui.result.table.resultName=Result name coser.ui.result.table.rsufiVersion=RSufi Version +coser.ui.result.table.zone=Zone coser.ui.result.validEditResult=Modify result coser.ui.result.validNewResult=Add this result coser.ui.result.zone=Zone \: 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-02-01 16:23:29 UTC (rev 637) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2011-02-01 17:12:16 UTC (rev 638) @@ -12,12 +12,14 @@ coser.ui.about.about=<html><b>Coser</b><br /><br />Version %s<br /><br />Liens utiles \:<ul><li><a href\="http\://coser.labs.libre-entreprise.org/">Documentation</a></li><li><a href\="http\://labs.libre-entreprise.org/tracker/?atid\=721&group_id\=164">Rapport de bug</a></li></ul><br /><br />Copyright 2010 - 2011 <a href\="http\://www.ifremer.fr">Ifremer</a>, <a href\="http\://www.codelutin.com">Code Lutin</a><html> coser.ui.about.title=\u00C0 propos de Coser coser.ui.common.cancel=Annuler +coser.ui.common.no=Non coser.ui.common.selectAll=S\u00E9lectionner tout coser.ui.common.selectAll.short=Tout coser.ui.common.selectFile=S\u00E9lectionner\u2026 coser.ui.common.unselectAll=D\u00E9s\u00E9lectionner tout coser.ui.common.unselectAll.short=Aucun coser.ui.common.valid=Valider +coser.ui.common.yes=Oui coser.ui.config.title=Configuration coser.ui.control.categorylabel=Donn\u00E9es affich\u00E9es \: coser.ui.control.checkData=V\u00E9rifier les donn\u00E9es @@ -153,8 +155,11 @@ coser.ui.result.saveError=Erreur de sauvegarde coser.ui.result.table.estComIndFile=Fichier ESTCOMind coser.ui.result.table.estPopIndFile=Fichier ESTPOPind +coser.ui.result.table.maps=Cartes +coser.ui.result.table.otherfiles=Autres fichiers coser.ui.result.table.resultName=Nom du r\u00E9sultat coser.ui.result.table.rsufiVersion=Version de RSufi +coser.ui.result.table.zone=Zone coser.ui.result.validEditResult=Modifier le r\u00E9sultat coser.ui.result.validNewResult=Ajouter le r\u00E9sultat coser.ui.result.zone=Zone \:

1 0

r637 - in trunk/coser-ui/src/main/java/fr/ifremer/coser/ui: result selection
by chatellier＠users.labs.libre-entreprise.org 01 Feb '11

01 Feb '11

Author: chatellier Date: 2011-02-01 16:23:29 +0000 (Tue, 01 Feb 2011) New Revision: 637 Log: Nom par defaut des r?\195?\169sultats rsufi Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/SelectionAddResultDialog.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/SelectionAddResultDialog.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/SelectionAddResultDialog.jaxx 2011-02-01 16:09:23 UTC (rev 636) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/SelectionAddResultDialog.jaxx 2011-02-01 16:23:29 UTC (rev 637) @@ -44,7 +44,7 @@ <JLabel text="coser.ui.result.resultName" /> </cell> <cell fill="horizontal" columns="2"> - <JTextField id="resultNameField" /> + <JTextField id="resultNameField" text="{getRsufiResult().getName()}"/> <javax.swing.text.Document javaBean="resultNameField.getDocument()" onInsertUpdate='getRsufiResult().setName(resultNameField.getText())' onRemoveUpdate='getRsufiResult().setName(resultNameField.getText())' /> 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 2011-02-01 16:09:23 UTC (rev 636) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2011-02-01 16:23:29 UTC (rev 637) @@ -1065,7 +1065,14 @@ */ public void showAddResultDialog(SelectionRsufiView view) { SelectionAddResultDialog addResultView = new SelectionAddResultDialog(view); - addResultView.setRsufiResult(new RSufiResult()); + + // Mettre RSUFI_RESULTS_nomduprojet par defaut + // dans le nom du resultat. + Project project = view.getContextValue(Project.class); + RSufiResult rsufiresult = new RSufiResult(); + rsufiresult.setName("RSUFI_RESULTS_" + project.getName()); + + addResultView.setRsufiResult(rsufiresult); addResultView.getValidatorRSufiResult().setBean(addResultView.getRsufiResult()); addResultView.setHandler(this); addResultView.pack();

1 0

r636 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection
by chatellier＠users.labs.libre-entreprise.org 01 Feb '11

01 Feb '11

Author: chatellier Date: 2011-02-01 16:09:23 +0000 (Tue, 01 Feb 2011) New Revision: 636 Log: Fix selection data reloading (species lists) Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2011-02-01 16:03:37 UTC (rev 635) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2011-02-01 16:09:23 UTC (rev 636) @@ -184,8 +184,7 @@ } /** - * Initialise la listes des années disponible dans les données - * chargées. + * Initialise la listes des années disponible dans les données chargées. * * @param view view */ @@ -203,6 +202,9 @@ view.getFilteredSpeciesList().clearSelection(); view.getSelectedSpeciesListModel().setSpecies(new ArrayList<String>()); view.getSelectedSpeciesList().clearSelection(); + + // clear species list to renable filtering + selection.getSelectedSpecies().clear(); } /**

1 0

r635 - in trunk/coser-ui/src/main/java/fr/ifremer/coser/ui: common control
by chatellier＠users.labs.libre-entreprise.org 01 Feb '11

01 Feb '11

Author: chatellier Date: 2011-02-01 16:03:37 +0000 (Tue, 01 Feb 2011) New Revision: 635 Log: Open graph frame only once Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.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-02-01 14:05:29 UTC (rev 634) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java 2011-02-01 16:03:37 UTC (rev 635) @@ -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 General Public License as @@ -30,6 +30,8 @@ import javax.swing.JFrame; import javax.swing.SwingUtilities; +import jaxx.runtime.JAXXContext; + import org.nuiton.math.matrix.MatrixND; import org.nuiton.math.matrix.viewer.MatrixViewerPanel; import org.nuiton.math.matrix.viewer.renderer.MatrixChartRenderer; @@ -70,6 +72,12 @@ // get matrix MatrixND matrix = projectService.getLengthStructure(project, container); + // close previous opened + JFrame previousFrame = (JFrame)((JAXXContext)parent).getContextValue(JFrame.class, "lengthstructureframe"); + if (previousFrame != null) { + previousFrame.dispose(); + } + // display matrix viewer component JFrame matrixViewerFrame = new JFrame(_("coser.ui.graph.lengthStructure")); matrixViewerFrame.setName("lengthstructureframe"); @@ -81,9 +89,12 @@ matrixViewerFrame.add(panel); matrixViewerFrame.pack(); matrixViewerFrame.setLocationRelativeTo(parent); + session.add(matrixViewerFrame); // session restore matrixViewerFrame.toFront(); - session.add(matrixViewerFrame); // session restore matrixViewerFrame.setVisible(true); + + // register current frame + ((JAXXContext)parent).setContextValue(matrixViewerFrame, "lengthstructureframe"); } finally { setDefaultCursor(parent); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2011-02-01 14:05:29 UTC (rev 634) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2011-02-01 16:03:37 UTC (rev 635) @@ -42,6 +42,7 @@ import java.util.Set; import java.util.UUID; +import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenuItem; import javax.swing.JOptionPane; @@ -58,6 +59,7 @@ import javax.swing.event.TreeSelectionEvent; import javax.swing.tree.TreePath; +import jaxx.runtime.JAXXContext; import jaxx.runtime.JAXXUtil; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; @@ -872,6 +874,12 @@ Map<String, JFreeChart> charts = view.getContextValue(Map.class, "CompareCatchLengthGraph"); List<String> species = new ArrayList<String>(charts.keySet()); + // close previous opened + JFrame previousFrame = (JFrame)view.getContextValue(JFrame.class, "comparenumberframe"); + if (previousFrame != null) { + previousFrame.dispose(); + } + ControlGraphFrame frame = new ControlGraphFrame(view); frame.setHandler(ControlHandler.this); frame.setContextValue(charts); @@ -883,7 +891,11 @@ frame.pack(); frame.setLocationRelativeTo(view); session.add(frame); // session restore + frame.toFront(); frame.setVisible(true); + + // register current frame + view.setContextValue(frame, "comparenumberframe"); } /**

1 0

r634 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result
by chatellier＠users.labs.libre-entreprise.org 01 Feb '11

01 Feb '11

Author: chatellier Date: 2011-02-01 14:05:29 +0000 (Tue, 01 Feb 2011) New Revision: 634 Log: Gestion des resultats sans type (suppression de r?\195?\169sultats) Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java 2011-02-01 13:25:48 UTC (rev 633) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java 2011-02-01 14:05:29 UTC (rev 634) @@ -162,7 +162,7 @@ // get result selected by user SelectUploadResultView parentView = view.getContextValue(SelectUploadResultView.class, JAXXUtil.PARENT); final Collection<RSufiResultPath> selectedResults = parentView.getSelectedResultTableModel().getResultPaths(); - final Collection<RSufiResultPath> indicatorResults = parentView.getSelectedResultTableModel().getResultPaths(); + final Collection<RSufiResultPath> indicatorResults = parentView.getSelectedResultTableModel().getIndicatorResults(); final Collection<RSufiResultPath> mapResults = parentView.getSelectedResultTableModel().getMapResults(); final Collection<RSufiResultPath> publishDataResults = parentView.getSelectedResultTableModel().getPublishDataResults(); if (CollectionUtils.isNotEmpty(selectedResults)) {

1 0

r633 - trunk/coser-business/src/main/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 01 Feb '11

01 Feb '11

Author: chatellier Date: 2011-02-01 13:25:48 +0000 (Tue, 01 Feb 2011) New Revision: 633 Log: Gestion des resultats sans type (suppression de r?\195?\169sultats) Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-02-01 13:19:15 UTC (rev 632) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-02-01 13:25:48 UTC (rev 633) @@ -675,8 +675,16 @@ ZipUtil.uncompress(archiveFile, tempDirectory); File projectsDirectory = config.getWebIndicatorsProjectsDirectory(); + File mapsDirectory = config.getWebMapsProjectsDirectory(); + + // suppression des resultats qui ont été envoyé mais + // ne sont ni maps result, ni indicator result + List<String> noTypeResultZoneIds = getZonesIds(tempDirectory, false, false); + cleanCurrentProjectDirectory(projectsDirectory, noTypeResultZoneIds); + cleanCurrentProjectDirectory(mapsDirectory, noTypeResultZoneIds); + // recuperation des noms zone des nouveau fichiers - List<String> indicatorsResultZoneIds = getZonesIds(tempDirectory, false); + List<String> indicatorsResultZoneIds = getZonesIds(tempDirectory, true, false); // suppression dans l'ancien répertoire des resultat deja present // dans le nouveau (pour les conflits) cleanCurrentProjectDirectory(projectsDirectory, indicatorsResultZoneIds); @@ -686,9 +694,8 @@ //FileUtils.copyDirectory(tempDirectory, projectsDirectory, indicatorsFileFilter); customCopyDirectory(tempDirectory, projectsDirectory, indicatorsFileFilter); - File mapsDirectory = config.getWebMapsProjectsDirectory(); // recuperation des noms zone des nouveau fichiers - List<String> mapsResultZoneIds = getZonesIds(tempDirectory, true); + List<String> mapsResultZoneIds = getZonesIds(tempDirectory, false, true); // suppression dans l'ancien répertoire des resultat deja present // dans le nouveau (pour les conflits) cleanCurrentProjectDirectory(mapsDirectory, mapsResultZoneIds); @@ -816,11 +823,12 @@ * Recupere dans un repertoire donné, les zoneid des resultat. * * @param scanDirectory le repertoire a scanner - * @param mapResults if true get only map result (otherwise, get indicator results) + * @param indicatorResults if true get indicator results + * @param mapResults if true get map results * @return la liste des resultid * @throws CoserBusinessException */ - protected List<String> getZonesIds(File scanDirectory, boolean mapResults) throws CoserBusinessException { + protected List<String> getZonesIds(File scanDirectory, boolean indicatorResults, boolean mapResults) throws CoserBusinessException { List<String> resultIds = new ArrayList<String>(); File[] projectFiles = scanDirectory.listFiles(); @@ -842,8 +850,8 @@ RSufiResult rsufiResult = projectService.getRSufiResult(resultFile); // return result depending on result type - if ( (mapResults && rsufiResult.isMapsResult()) || - (!mapResults && rsufiResult.isIndicatorsResult())) { + if ( rsufiResult.isIndicatorsResult() == indicatorResults && + rsufiResult.isMapsResult() == mapResults ) { String resultResultId = rsufiResult.getZone(); if (StringUtils.isNotBlank(resultResultId)) { resultIds.add(resultResultId);

1 0