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 \: