August 2009 - Isis-fish-commits - mailman.cloud.codelutin.com

r2535 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org Aug. 26, 2009

Aug. 26, 2009

Author: chatellier Date: 2009-08-26 15:11:28 +0000 (Wed, 26 Aug 2009) New Revision: 2535 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Encore les flottilles Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-08-26 15:08:51 UTC (rev 2534) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-08-26 15:11:28 UTC (rev 2535) @@ -127,7 +127,7 @@ isisfish.common.population=Population isisfish.common.populationGroup=Groupe de population isisfish.common.populations=Populations -isisfish.common.port=port +isisfish.common.port=Port isisfish.common.prev=Pr\u00E9c\u00E9dent isisfish.common.region=R\u00E9gion isisfish.common.remove=Supprimer @@ -970,7 +970,7 @@ isisfish.strategy.inactivity=Equation d'inactivit\u00E9 isisfish.strategy.inactivityEquationUsed=Utiliser une \u00E9quation d'inactivit\u00E9 isisfish.strategy.name=Nom -isisfish.strategy.proportionSetOfVessels=Proportion des flottilles +isisfish.strategy.proportionSetOfVessels=Proportion de la flottille isisfish.strategy.title=Caract\u00E9ristiques isisfish.strategyMonthInfo.metier=M\u00E9tier isisfish.strategyMonthInfo.minInactivityDays=Jour minimums d'inactivit\u00E9

1 0

r2534 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org Aug. 26, 2009

Aug. 26, 2009

Author: chatellier Date: 2009-08-26 15:08:51 +0000 (Wed, 26 Aug 2009) New Revision: 2534 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Flotille > Flottille Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-08-26 15:06:45 UTC (rev 2533) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-08-26 15:08:51 UTC (rev 2534) @@ -137,7 +137,7 @@ isisfish.common.saveModel=Sauver comme mod\u00E8le isisfish.common.saveNextSimulation=Sauver pour la prochaine simulation isisfish.common.season=Saison -isisfish.common.setOfVessels=Flotille +isisfish.common.setOfVessels=Flottille isisfish.common.simulate=Simuler isisfish.common.stop=Arr\u00EAter isisfish.common.strategies=Strat\u00E9gies @@ -494,7 +494,7 @@ isisfish.input.continueMetiers=Continuer vers les metiers isisfish.input.continuePopulations=Continuer vers les populations isisfish.input.continuePorts=Continuer vers les ports -isisfish.input.continueSetOfVessels=Continuer vers les flotilles +isisfish.input.continueSetOfVessels=Continuer vers les flottilles isisfish.input.continueSpecies=Continuer vers les esp\u00E8ces isisfish.input.continueStrategies=Continuer vers les strat\u00E9gies isisfish.input.continueTripTypes=Continuer vers les types de trajets @@ -970,7 +970,7 @@ isisfish.strategy.inactivity=Equation d'inactivit\u00E9 isisfish.strategy.inactivityEquationUsed=Utiliser une \u00E9quation d'inactivit\u00E9 isisfish.strategy.name=Nom -isisfish.strategy.proportionSetOfVessels=Proportion des flotilles +isisfish.strategy.proportionSetOfVessels=Proportion des flottilles isisfish.strategy.title=Caract\u00E9ristiques isisfish.strategyMonthInfo.metier=M\u00E9tier isisfish.strategyMonthInfo.minInactivityDays=Jour minimums d'inactivit\u00E9

1 0

r2533 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org Aug. 26, 2009

Aug. 26, 2009

Author: chatellier Date: 2009-08-26 15:06:45 +0000 (Wed, 26 Aug 2009) New Revision: 2533 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Fix translations Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-08-26 14:51:07 UTC (rev 2532) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-08-26 15:06:45 UTC (rev 2533) @@ -137,7 +137,7 @@ isisfish.common.saveModel=Sauver comme mod\u00E8le isisfish.common.saveNextSimulation=Sauver pour la prochaine simulation isisfish.common.season=Saison -isisfish.common.setOfVessels=Ensemble de navires +isisfish.common.setOfVessels=Flotille isisfish.common.simulate=Simuler isisfish.common.stop=Arr\u00EAter isisfish.common.strategies=Strat\u00E9gies @@ -494,7 +494,7 @@ isisfish.input.continueMetiers=Continuer vers les metiers isisfish.input.continuePopulations=Continuer vers les populations isisfish.input.continuePorts=Continuer vers les ports -isisfish.input.continueSetOfVessels=Continuer vers les ensembles de navires +isisfish.input.continueSetOfVessels=Continuer vers les flotilles isisfish.input.continueSpecies=Continuer vers les esp\u00E8ces isisfish.input.continueStrategies=Continuer vers les strat\u00E9gies isisfish.input.continueTripTypes=Continuer vers les types de trajets @@ -970,7 +970,7 @@ isisfish.strategy.inactivity=Equation d'inactivit\u00E9 isisfish.strategy.inactivityEquationUsed=Utiliser une \u00E9quation d'inactivit\u00E9 isisfish.strategy.name=Nom -isisfish.strategy.proportionSetOfVessels=Proportion des ensembles de navires +isisfish.strategy.proportionSetOfVessels=Proportion des flotilles isisfish.strategy.title=Caract\u00E9ristiques isisfish.strategyMonthInfo.metier=M\u00E9tier isisfish.strategyMonthInfo.minInactivityDays=Jour minimums d'inactivit\u00E9

1 0

r2532 - isis-fish/trunk/src/main/resources
by chatellier＠users.labs.libre-entreprise.org Aug. 26, 2009

Aug. 26, 2009

Author: chatellier Date: 2009-08-26 14:51:07 +0000 (Wed, 26 Aug 2009) New Revision: 2532 Modified: isis-fish/trunk/src/main/resources/sensitivity.properties Log: Can be factorizable Modified: isis-fish/trunk/src/main/resources/sensitivity.properties =================================================================== --- isis-fish/trunk/src/main/resources/sensitivity.properties 2009-08-26 12:25:46 UTC (rev 2531) +++ isis-fish/trunk/src/main/resources/sensitivity.properties 2009-08-26 14:51:07 UTC (rev 2532) @@ -15,11 +15,6 @@ Metier.Zone Population.Capturability Population.GeographicId -PopulationGroup.Age -PopulationGroup.MaxLength -PopulationGroup.MeanWeight -PopulationGroup.MinLength -PopulationGroup.Price PopulationGroup.ReproductionRate Population.Growth Population.GrowthReverse @@ -27,7 +22,6 @@ Population.MeanWeight Population.MonthGapBetweenReproRecrutement Population.NaturalDeathRate -Population.NaturalDeathRateMatrix Population.PlusGroup Population.Price Population.RecruitmentDistribution

1 0

r2531 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org Aug. 26, 2009

Aug. 26, 2009

Author: chatellier Date: 2009-08-26 12:25:46 +0000 (Wed, 26 Aug 2009) New Revision: 2531 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Ferme les flux ?\195?\160 la lecture/?\195?\169criture du fichier de sauvegarde des simulations en cours. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-08-26 12:24:48 UTC (rev 2530) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-08-26 12:25:46 UTC (rev 2531) @@ -24,6 +24,8 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.rmi.RemoteException; import java.util.Collection; import java.util.Comparator; @@ -153,10 +155,12 @@ public void reloadConfig(final SimulationService service) { if (monitorFile.canRead()) { + InputStream is = null; try { - properties.load(new FileInputStream(monitorFile)); + is = new FileInputStream(monitorFile); + properties.load(is); - // in a thead + // in a thread // don't temporize UI loading new Thread() { public void run() { @@ -168,6 +172,17 @@ log.error("Can't reload monitor file", e); } } + finally { + if (is != null) { + try { + is.close(); + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("Can't close monitor file", e); + } + } + } + } } } @@ -284,7 +299,9 @@ monitorValue += MONITORFILESEPARATOR + planList; properties.put(monitorKey, monitorValue); + OutputStream out = null; try { + out = new FileOutputStream(monitorFile); properties.store(new FileOutputStream(monitorFile), "Simulation added at " + new Date()); } catch (IOException e) { @@ -292,6 +309,17 @@ log.error("Can't save monitor file", e); } } + finally { + if (out != null) { + try { + out.close(); + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("Can't close monitor file", e); + } + } + } + } if (log.isInfoEnabled()) { log.info("Saving simulation " + monitorKey + " as started"); @@ -322,18 +350,31 @@ String monitorKey = job.getId(); properties.remove(monitorKey); + OutputStream out = null; try { if (properties.isEmpty()) { monitorFile.delete(); } else { - properties.store(new FileOutputStream(monitorFile), - "Simulation delete at " + new Date()); + out = new FileOutputStream(monitorFile); + properties.store(out, "Simulation delete at " + new Date()); + } } catch (IOException e) { if (log.isErrorEnabled()) { log.error("Can't save monitor file", e); } } + finally { + try { + if (out != null) { + out.close(); + } + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("Can't close monitor file", e); + } + } + } if (log.isInfoEnabled()) { log.info("Saving simulation " + monitorKey + " as stopped");

1 0

r2530 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org Aug. 26, 2009

Aug. 26, 2009

Author: chatellier Date: 2009-08-26 12:24:48 +0000 (Wed, 26 Aug 2009) New Revision: 2530 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx Log: AJout d'un todo sur la selection des cellules meme si on fait un clic droit... Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-08-26 12:24:06 UTC (rev 2529) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-08-26 12:24:48 UTC (rev 2530) @@ -89,16 +89,18 @@ @Override public boolean mouseClicked(MouseEvent e) { boolean result = false; - if (e.getButton() == MouseEvent.BUTTON1) { + // TODO a fixer, le clic droit du menu contextuel + // passe aussi par ici et change la selection + //if (e.getButton() == MouseEvent.BUTTON1) { for (Cell c : cellMap.getSelectedCells()) { if (getBean() != null) { if (!c.getTopiaId().equals(getBean().getTopiaId())) { jaxx.runtime.SwingUtil.fillComboBox(fieldCell,getRegion().getCell(), c); - return true; + result = true; } } } - } + //} return result; } };

1 0

r2529 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org Aug. 26, 2009

Aug. 26, 2009

Author: chatellier Date: 2009-08-26 12:24:06 +0000 (Wed, 26 Aug 2009) New Revision: 2529 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: Ajout de divers synchronized pour eviter les modification concurrentes (arrive par exemple lorsqu'on recherche la liste des simulation ?\195?\160 l'ouverture d'isis) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-08-26 08:42:32 UTC (rev 2528) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-08-26 12:24:06 UTC (rev 2529) @@ -222,11 +222,11 @@ return executors.values(); } - public Set<SimulationJob> getJobs() { + public synchronized Set<SimulationJob> getJobs() { return jobs; } - public Set<SimulationJob> getJobDones() { + public synchronized Set<SimulationJob> getJobDones() { return jobDones; } @@ -269,7 +269,7 @@ * les listener {@link SimulationServiceListener#simulationStart}. * @param job */ - protected void fireStartEvent(SimulationJob job) { + protected synchronized void fireStartEvent(SimulationJob job) { // on ajoute au cas on il n'y serait pas if (jobs.add(job)) { idJobs.add(job.getItem().getControl().getId()); @@ -287,7 +287,7 @@ * {@link SimulationServiceListener#simulationStop}. * @param job */ - protected void fireStopEvent(SimulationJob job) { + protected synchronized void fireStopEvent(SimulationJob job) { jobs.remove(job); idJobs.remove(job.getItem().getControl().getId());

1 0

r2528 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/ui/input src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org Aug. 26, 2009

Aug. 26, 2009

Author: chatellier Date: 2009-08-26 08:42:32 +0000 (Wed, 26 Aug 2009) New Revision: 2528 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CopyMapToClipboardListener.java Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Add a contextual menu on maps to copy current displayed map to system clipboard. Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-08-25 15:40:19 UTC (rev 2527) +++ isis-fish/trunk/changelog.txt 2009-08-26 08:42:32 UTC (rev 2528) @@ -1,5 +1,6 @@ isis-fish (3.2.0.5) stable; urgency=low + * Can copy openmap map to system clipboard * Don't extract database for sensitivity analysis (excepted first) * Add user script javadoc generation * Move script import/export to Jaxx Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-08-25 15:40:19 UTC (rev 2527) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-08-26 08:42:32 UTC (rev 2528) @@ -40,6 +40,8 @@ setButtonTitle(_("isisfish.input.continueZones")); setNextPath("$root/$zones"); cellMap.addMapMouseListener(getMapListener()); +// add copy to clipboard support +cellMap.addMapMouseListener(new CopyMapToClipboardListener(cellMap)); toolSet.setupListeners(cellMap); toolMap.add((Tool)toolSet); @@ -86,15 +88,18 @@ mapListener = new OpenMapEvents(cellMap, new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) { @Override public boolean mouseClicked(MouseEvent e) { - for (Cell c : cellMap.getSelectedCells()) { - if (getBean() != null) { - if (!c.getTopiaId().equals(getBean().getTopiaId())) { - jaxx.runtime.SwingUtil.fillComboBox(fieldCell,getRegion().getCell(), c); - return true; + boolean result = false; + if (e.getButton() == MouseEvent.BUTTON1) { + for (Cell c : cellMap.getSelectedCells()) { + if (getBean() != null) { + if (!c.getTopiaId().equals(getBean().getTopiaId())) { + jaxx.runtime.SwingUtil.fillComboBox(fieldCell,getRegion().getCell(), c); + return true; + } } } } - return true; + return result; } }; } Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CopyMapToClipboardListener.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CopyMapToClipboardListener.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CopyMapToClipboardListener.java 2009-08-26 08:42:32 UTC (rev 2528) @@ -0,0 +1,201 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.ui.input; + +import static org.codelutin.i18n.I18n._; + +import java.awt.Graphics; +import java.awt.GraphicsEnvironment; +import java.awt.Image; +import java.awt.Toolkit; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.UnsupportedFlavorException; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseEvent; +import java.awt.image.BufferedImage; +import java.io.IOException; + +import javax.swing.JMenuItem; +import javax.swing.JPopupMenu; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import com.bbn.openmap.MapBean; +import com.bbn.openmap.event.MapMouseListener; + +/** + * Listener for openmap map bean to display popop menu on rigth clic. + * + * Currently, this listener can : + * - copy current map to system clip board + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class CopyMapToClipboardListener implements ActionListener, + MapMouseListener { + + /** Class logger. */ + private static Log log = LogFactory + .getLog(CopyMapToClipboardListener.class); + + /** Copy to clic board action command. */ + protected static final String COPY_TO_CLICBOARD_COMMAND = "copytoclipboard"; + + /** Popop menu. */ + public JPopupMenu menu; + + /** Open map bean. */ + protected MapBean mapBean; + + /** + * Constructor with map. + * + * @param mapBean open map bean + */ + public CopyMapToClipboardListener(MapBean mapBean) { + this.mapBean = mapBean; + + menu = new JPopupMenu(); + JMenuItem copyClicboardItem = new JMenuItem(); + copyClicboardItem.setText(_("isisfish.input.map.copytoclicboard")); + copyClicboardItem.setActionCommand(COPY_TO_CLICBOARD_COMMAND); + copyClicboardItem.addActionListener(this); + menu.add(copyClicboardItem); + } + + public MapBean getMapBean() { + return mapBean; + } + + protected void copyToClipBoard() { + + // Get image from mapBean + int width = getMapBean().getWidth(); + int height = getMapBean().getHeight(); + BufferedImage image = new BufferedImage(width, height, + BufferedImage.TYPE_INT_RGB); + GraphicsEnvironment ge = GraphicsEnvironment + .getLocalGraphicsEnvironment(); + Graphics g = ge.createGraphics(image); + g.setClip(0, 0, width, height); + getMapBean().paintAll(g); + ImageSelection imgSel = new ImageSelection(image); + + Toolkit.getDefaultToolkit().getSystemClipboard().setContents(imgSel, + null); + + if (log.isInfoEnabled()) { + log.info("Copy current image to system clipboard"); + } + } + + // This class is used to hold an image while on the clipboard. + public static class ImageSelection implements Transferable { + private Image image; + + public ImageSelection(Image image) { + this.image = image; + } + + // Returns supported flavors + public DataFlavor[] getTransferDataFlavors() { + return new DataFlavor[] { DataFlavor.imageFlavor }; + } + + // Returns true if flavor is supported + public boolean isDataFlavorSupported(DataFlavor flavor) { + return DataFlavor.imageFlavor.equals(flavor); + } + + // Returns image + public Object getTransferData(DataFlavor flavor) + throws UnsupportedFlavorException, IOException { + if (!DataFlavor.imageFlavor.equals(flavor)) { + throw new UnsupportedFlavorException(flavor); + } + return image; + } + } + + @Override + public String[] getMouseModeServiceList() { + return null; + } + + @Override + public boolean mouseClicked(MouseEvent e) { + + // seulement en menu contextuel + if (e.getButton() == MouseEvent.BUTTON3) { + menu.show(mapBean, e.getX(), e.getY()); + } + return false; + } + + @Override + public boolean mouseDragged(MouseEvent arg0) { + return false; + } + + @Override + public void mouseEntered(MouseEvent arg0) { + + } + + @Override + public void mouseExited(MouseEvent arg0) { + + } + + @Override + public void mouseMoved() { + + } + + @Override + public boolean mouseMoved(MouseEvent arg0) { + return false; + } + + @Override + public boolean mousePressed(MouseEvent arg0) { + return false; + } + + @Override + public boolean mouseReleased(MouseEvent arg0) { + return false; + } + + @Override + public void actionPerformed(ActionEvent e) { + + if (e.getActionCommand().equals(COPY_TO_CLICBOARD_COMMAND)) { + copyToClipBoard(); + } + + } +} Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CopyMapToClipboardListener.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-08-25 15:40:19 UTC (rev 2527) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-08-26 08:42:32 UTC (rev 2528) @@ -32,6 +32,9 @@ toolSet.setupListeners(cellMap); toolMap.add((Tool)toolSet); +// add copy to clipboard support +cellMap.addMapMouseListener(new CopyMapToClipboardListener(cellMap)); + setButtonTitle(_("isisfish.input.continueCells")); setNextPath("$root/$cells"); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-08-25 15:40:19 UTC (rev 2527) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-08-26 08:42:32 UTC (rev 2528) @@ -39,6 +39,10 @@ toolSet.setupListeners(portMap); toolMap.add((Tool)toolSet); + +// add copy to clipboard support +portMap.addMapMouseListener(new CopyMapToClipboardListener(portMap)); + setMapListener(); setButtonTitle(_("isisfish.input.continueSpecies")); setNextPath("$root/$species"); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-08-25 15:40:19 UTC (rev 2527) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-08-26 08:42:32 UTC (rev 2528) @@ -36,6 +36,10 @@ toolSet.setupListeners(zoneMap); toolMap.add((Tool)toolSet); + +// add copy to clipboard support +zoneMap.addMapMouseListener(new CopyMapToClipboardListener(zoneMap)); + zoneMap.addMapMouseListener(getMapListener()); setButtonTitle(_("isisfish.input.continuePorts")); setNextPath("$root/$ports"); Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-08-25 15:40:19 UTC (rev 2527) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-08-26 08:42:32 UTC (rev 2528) @@ -500,6 +500,7 @@ isisfish.input.continueTripTypes=Continue to trip types isisfish.input.continueVesselTypes=Continue to vessel types isisfish.input.continueZones=Continue to zones +isisfish.input.map.copytoclicboard=Copy to clipboard isisfish.input.menu.addRegion=Add region isisfish.input.menu.commit=Commit change isisfish.input.menu.copyRegion=Copy region Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-08-25 15:40:19 UTC (rev 2527) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-08-26 08:42:32 UTC (rev 2528) @@ -500,6 +500,7 @@ isisfish.input.continueTripTypes=Continuer vers les types de trajets isisfish.input.continueVesselTypes=Continuer vers les types de navires isisfish.input.continueZones=Continuer vers les zones +isisfish.input.map.copytoclicboard=Copier vers de presse-papiers isisfish.input.menu.addRegion=Ajouter une r\u00E9gion isisfish.input.menu.commit=Sauvegarder les changements isisfish.input.menu.copyRegion=Copier r\u00E9gion

1 0

r2527 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org Aug. 25, 2009

Aug. 25, 2009

Author: chatellier Date: 2009-08-25 15:40:19 +0000 (Tue, 25 Aug 2009) New Revision: 2527 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: Il manquait la liste des exports de sensibilit?\195?\169. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-08-25 14:05:36 UTC (rev 2526) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-08-25 15:40:19 UTC (rev 2527) @@ -64,6 +64,7 @@ import fr.ifremer.isisfish.datastore.ScriptStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.datastore.SimulatorStorage; +import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.mexico.MexicoHelper; import fr.ifremer.isisfish.rule.Rule; import fr.ifremer.isisfish.simulator.AnalysePlan; @@ -943,6 +944,16 @@ new File(tmpDirectory, ExportStorage.EXPORT_PATH + File.separator + name)); } + + // copie de tous les exports de sensitivity a utiliser + for (SensitivityExport sensitivity : param.getSensitivityExport()) { + String name = ExportStorage.getName(sensitivity); + name = name.endsWith(".java") ? name : name + ".java"; + FileUtil.copy( + new File(ExportStorage.getExportDirectory(), name), + new File(tmpDirectory, ExportStorage.EXPORT_PATH + + File.separator + name)); + } // copie de tous les scripts a utiliser FileUtil.copyRecursively(ScriptStorage.getScriptDirectory(),

1 0

r2526 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: map ui/input
by chatellier＠users.labs.libre-entreprise.org Aug. 25, 2009

Aug. 25, 2009

Author: chatellier Date: 2009-08-25 14:05:36 +0000 (Tue, 25 Aug 2009) New Revision: 2526 Removed: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/OpenMapToolPanel.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx Log: Les hacks jaxx pour contourner les hacks faits pour swixat c'est pas indispensable... :-) Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/OpenMapToolPanel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/OpenMapToolPanel.java 2009-08-25 13:41:58 UTC (rev 2525) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/OpenMapToolPanel.java 2009-08-25 14:05:36 UTC (rev 2526) @@ -1,62 +0,0 @@ -/* - * *##% Copyright (C) 2005 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin - * - * 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 2 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, write to the Free Software Foundation, Inc., 59 Temple - * Place - Suite 330, Boston, MA 02111-1307, USA. ##% - */ - -package fr.ifremer.isisfish.map; - -import java.awt.Component; - -import com.bbn.openmap.gui.Tool; -import com.bbn.openmap.gui.ToolPanel; - -/** - * Hack class to permit ToolPanel work with SwiXml, because SwiXml call only - * add(Component) and not add(Tool). - * - * EC-20090825 : The hack is still used in Jaxx UI. - * - * Created: 6 septembre 2005 00:01:18 CEST - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * - * @version $Revision$ - * - * Last update: $Date$ by : $Author$ - */ -public class OpenMapToolPanel extends ToolPanel { // OpenMapToolPanel - - /** serialVersionUID. */ - private static final long serialVersionUID = -1961465978756124241L; - - protected boolean inAdd = false; - - public Component add(Component child) { - if (child instanceof Tool && !inAdd) { - inAdd = true; - try { - super.add((Tool) child); - } finally { - inAdd = false; - } - } else { - super.add(child); - } - return child; - } - -} // OpenMapToolPanel - Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-08-25 13:41:58 UTC (rev 2525) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-08-25 14:05:36 UTC (rev 2526) @@ -23,11 +23,14 @@ <fr.ifremer.isisfish.entities.CellImpl id='bean' javaBean='null'/> <script><![CDATA[ +import java.awt.event.MouseEvent; import fr.ifremer.isisfish.entities.Cell; import fr.ifremer.isisfish.entities.CellImpl; +import com.bbn.openmap.gui.Tool; import com.bbn.openmap.gui.OMToolSet; import com.bbn.openmap.event.SelectMouseMode; import fr.ifremer.isisfish.map.CellSelectionLayer; +import fr.ifremer.isisfish.map.CellSelectionLayer; import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI; protected OMToolSet toolSet = new OMToolSet(); @@ -38,7 +41,7 @@ setNextPath("$root/$zones"); cellMap.addMapMouseListener(getMapListener()); toolSet.setupListeners(cellMap); -toolMap.add((Component)toolSet); +toolMap.add((Tool)toolSet); addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { @@ -82,7 +85,7 @@ if (mapListener == null){ mapListener = new OpenMapEvents(cellMap, new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) { @Override - public boolean onMouseClicked() { + public boolean mouseClicked(MouseEvent e) { for (Cell c : cellMap.getSelectedCells()) { if (getBean() != null) { if (!c.getTopiaId().equals(getBean().getTopiaId())) { @@ -187,7 +190,7 @@ </row> </Table> <JPanel id='map' layout='{new BorderLayout()}'> - <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' constraints='BorderLayout.NORTH' decorator='boxed'/> + <com.bbn.openmap.gui.ToolPanel id='toolMap' javaBean='new com.bbn.openmap.gui.ToolPanel()' constraints='BorderLayout.NORTH' decorator='boxed'/> <fr.ifremer.isisfish.map.IsisMapBean id='cellMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' selectionMode="1" selectedCells='{getBean()}' fisheryRegion='{getRegion()}' constraints='BorderLayout.CENTER' decorator='boxed'/> </JPanel> </JSplitPane> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-08-25 13:41:58 UTC (rev 2525) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-08-25 14:05:36 UTC (rev 2526) @@ -25,11 +25,12 @@ <script><![CDATA[ import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.entities.FisheryRegionImpl; +import com.bbn.openmap.gui.Tool; import com.bbn.openmap.gui.OMToolSet; protected OMToolSet toolSet = new OMToolSet(); toolSet.setupListeners(cellMap); -toolMap.add((Component)toolSet); +toolMap.add((Tool)toolSet); setButtonTitle(_("isisfish.input.continueCells")); setNextPath("$root/$cells"); @@ -294,7 +295,7 @@ </row> </Table> <JPanel id='map' layout='{new BorderLayout()}'> - <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' + <com.bbn.openmap.gui.ToolPanel id='toolMap' javaBean='new com.bbn.openmap.gui.ToolPanel()' constraints='BorderLayout.NORTH' decorator='boxed'/> <fr.ifremer.isisfish.map.IsisMapBean id='cellMap' selectionMode="0" javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' fisheryRegion='{getBean()}' constraints='BorderLayout.CENTER' decorator='boxed'/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.java 2009-08-25 13:41:58 UTC (rev 2525) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.java 2009-08-25 14:05:36 UTC (rev 2526) @@ -26,6 +26,7 @@ import com.bbn.openmap.event.ProjectionEvent; import com.bbn.openmap.event.SelectMouseMode; +import fr.ifremer.isisfish.map.CellSelectionLayer; import fr.ifremer.isisfish.map.IsisMapBean; /** @@ -44,6 +45,66 @@ /** serialVersionUID. */ private static final long serialVersionUID = -8365120112075269288L; + /** + * SelectMouseMode property: Null, Distance, Nav, Select + */ + protected MapMouseMode mouseMode; + protected IsisMapBean map; + + protected int selectMode = CellSelectionLayer.SINGLE_SELECTION; + + /** + * OnMouseDragged property. + * + * @deprecated as of 3.2.0.5 unused + */ + protected String onMouseDragged = null; + + /** + * OnMouseEntered property. + * + * @deprecated as of 3.2.0.5 unused + */ + protected String onMouseEntered = null; + + /** + * OnMouseExited property. + * + * @deprecated as of 3.2.0.5 unused + */ + protected String onMouseExited = null; + + /** + * OnMouseMoved property. + * + * @deprecated as of 3.2.0.5 unused + */ + protected String onMouseMoved = null; + + /** + * OnMousePressed property. + * + * @deprecated as of 3.2.0.5 unused + */ + protected String onMousePressed = null; + + /** + * OnMouseReleased property. + * + * @deprecated as of 3.2.0.5 unused + */ + protected String onMouseReleased = null; + + /** + * Constructor. + * + * Register himself to {@code map} mapMouseListener. + * Also set mouseMode and selectMode on map. + * + * @param map map bean + * @param mouseMode mouse mode + * @param selectMode select mode + */ public OpenMapEvents(IsisMapBean map, MapMouseMode mouseMode, int selectMode) { super(); this.mouseMode = mouseMode; @@ -55,26 +116,17 @@ } + @Override public void projectionChanged(ProjectionEvent e) { // do nothing, it's not reel layer } /** - * SelectMouseMode property: Null, Distance, Nav, Select - */ - protected MapMouseMode mouseMode = null; - protected IsisMapBean map = null; - protected int selectMode = 1; - - /** - * OnMouseDragged property. - */ - protected String onMouseDragged = null; - - /** * Get onMouseDragged property. * * @return OnMouseDragged property. + * + * @deprecated as of 3.2.0.5 unused */ public String getOnMouseDragged() { return this.onMouseDragged; @@ -84,20 +136,19 @@ * Set onMouseDragged property. * * @param onMouseDragged New onMouseDragged property. + * + * @deprecated as of 3.2.0.5 unused */ public void setOnMouseDragged(String onMouseDragged) { this.onMouseDragged = onMouseDragged; } /** - * OnMouseEntered property. - */ - protected String onMouseEntered = null; - - /** * Get onMouseEntered property. * * @return OnMouseEntered property. + * + * @deprecated as of 3.2.0.5 unused */ public String getOnMouseEntered() { return this.onMouseEntered; @@ -107,20 +158,19 @@ * Set onMouseEntered property. * * @param onMouseEntered New onMouseEntered property. + * + * @deprecated as of 3.2.0.5 unused */ public void setOnMouseEntered(String onMouseEntered) { this.onMouseEntered = onMouseEntered; } /** - * OnMouseExited property. - */ - protected String onMouseExited = null; - - /** * Get onMouseExited property. * * @return OnMouseExited property. + * + * @deprecated as of 3.2.0.5 unused */ public String getOnMouseExited() { return this.onMouseExited; @@ -130,20 +180,19 @@ * Set onMouseExited property. * * @param onMouseExited New onMouseExited property. + * + * @deprecated as of 3.2.0.5 unused */ public void setOnMouseExited(String onMouseExited) { this.onMouseExited = onMouseExited; } /** - * OnMouseMoved property. - */ - protected String onMouseMoved = null; - - /** * Get onMouseMoved property. * * @return OnMouseMoved property. + * + * @deprecated as of 3.2.0.5 unused */ public String getOnMouseMoved() { return this.onMouseMoved; @@ -153,20 +202,19 @@ * Set onMouseMoved property. * * @param onMouseMoved New onMouseMoved property. + * + * @deprecated as of 3.2.0.5 unused */ public void setOnMouseMoved(String onMouseMoved) { this.onMouseMoved = onMouseMoved; } /** - * OnMousePressed property. - */ - protected String onMousePressed = null; - - /** * Get onMousePressed property. * * @return OnMousePressed property. + * + * @deprecated as of 3.2.0.5 unused */ public String getOnMousePressed() { return this.onMousePressed; @@ -176,20 +224,19 @@ * Set onMousePressed property. * * @param onMousePressed New onMousePressed property. + * + * @deprecated as of 3.2.0.5 unused */ public void setOnMousePressed(String onMousePressed) { this.onMousePressed = onMousePressed; } /** - * OnMouseReleased property. - */ - protected String onMouseReleased = null; - - /** * Get onMouseReleased property. * * @return OnMouseReleased property. + * + * @deprecated as of 3.2.0.5 unused */ public String getOnMouseReleased() { return this.onMouseReleased; @@ -199,44 +246,53 @@ * Set onMouseReleased property. * * @param onMouseReleased New onMouseReleased property. + * + * @deprecated as of 3.2.0.5 unused */ public void setOnMouseReleased(String onMouseReleased) { this.onMouseReleased = onMouseReleased; } + @Override public String[] getMouseModeServiceList() { return new String[] { SelectMouseMode.modeID }; } + @Override public boolean mouseClicked(MouseEvent e) { - onMouseClicked(); return true; } - + + @Override public boolean mouseDragged(MouseEvent e) { return false; } + @Override public void mouseEntered(MouseEvent e) { } + @Override public void mouseExited(MouseEvent e) { } + @Override public void mouseMoved() { } + @Override public boolean mouseMoved(MouseEvent e) { return false; } + @Override public boolean mousePressed(MouseEvent e) { return false; } + @Override public boolean mouseReleased(MouseEvent e) { return false; } - public abstract boolean onMouseClicked(); } // OpenMapEvents Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-08-25 13:41:58 UTC (rev 2525) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-08-25 14:05:36 UTC (rev 2526) @@ -27,6 +27,7 @@ import fr.ifremer.isisfish.entities.Port; import fr.ifremer.isisfish.entities.PortImpl; import fr.ifremer.isisfish.entities.Cell; +import com.bbn.openmap.gui.Tool; import com.bbn.openmap.gui.OMToolSet; import fr.ifremer.isisfish.map.CellSelectionLayer; import com.bbn.openmap.event.SelectMouseMode; @@ -37,7 +38,7 @@ boolean portChanged = true; toolSet.setupListeners(portMap); -toolMap.add((Component)toolSet); +toolMap.add((Tool)toolSet); setMapListener(); setButtonTitle(_("isisfish.input.continueSpecies")); setNextPath("$root/$species"); @@ -88,7 +89,7 @@ if (mapListener == null) { mapListener = new OpenMapEvents(portMap, new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) { @Override - public boolean onMouseClicked() { + public boolean mouseClicked(MouseEvent e) { for (Cell c : portMap.getSelectedCells()) { if (getBean() != null) { if (getBean().getCell() != null) { @@ -174,7 +175,7 @@ </row> </Table> <JPanel id='map' layout='{new BorderLayout()}'> - <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' constraints='BorderLayout.NORTH' decorator='boxed'/> + <com.bbn.openmap.gui.ToolPanel id='toolMap' javaBean='new com.bbn.openmap.gui.ToolPanel()' constraints='BorderLayout.NORTH' decorator='boxed'/> <fr.ifremer.isisfish.map.IsisMapBean id='portMap' selectedCells='{getBean().getCell()}' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' constraints='BorderLayout.CENTER' selectionMode="1" decorator='boxed' fisheryRegion='{getRegion()}'/> </JPanel> </JSplitPane> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-08-25 13:41:58 UTC (rev 2525) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-08-25 14:05:36 UTC (rev 2526) @@ -28,13 +28,14 @@ import fr.ifremer.isisfish.entities.ZoneImpl; import fr.ifremer.isisfish.map.CellSelectionLayer; import com.bbn.openmap.event.SelectMouseMode; +import com.bbn.openmap.gui.Tool; import com.bbn.openmap.gui.OMToolSet; protected OMToolSet toolSet = new OMToolSet(); protected OpenMapEvents mapListener = null; toolSet.setupListeners(zoneMap); -toolMap.add((Component)toolSet); +toolMap.add((Tool)toolSet); zoneMap.addMapMouseListener(getMapListener()); setButtonTitle(_("isisfish.input.continuePorts")); setNextPath("$root/$ports"); @@ -96,7 +97,7 @@ if (mapListener == null) { mapListener = new OpenMapEvents(zoneMap, new SelectMouseMode(false), CellSelectionLayer.MULT_SELECTION) { @Override - public boolean onMouseClicked() { + public boolean mouseClicked(MouseEvent e) { getBean().setCell(zoneMap.getSelectedCells()); if (getBean().getCell() != null){ zoneCells.setSelectedValues(getBean().getCell().toArray()); @@ -184,8 +185,8 @@ </row> </Table> <JPanel id='map' layout='{new BorderLayout()}'> - <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' - javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' + <com.bbn.openmap.gui.ToolPanel id='toolMap' + javaBean='new com.bbn.openmap.gui.ToolPanel()' decorator='boxed' constraints='BorderLayout.NORTH'/> <fr.ifremer.isisfish.map.IsisMapBean id='zoneMap'

1 0

r2525 - isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org Aug. 25, 2009

Aug. 25, 2009

Author: chatellier Date: 2009-08-25 13:41:58 +0000 (Tue, 25 Aug 2009) New Revision: 2525 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java Log: Ya un pb sur l'isolation des tests... Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2009-08-25 13:29:03 UTC (rev 2524) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2009-08-25 13:41:58 UTC (rev 2525) @@ -191,7 +191,7 @@ File archive = new File("src" + File.separator + "test" + File.separator + "resources" + File.separator + "simulations" + File.separator + "test-nonregression-20090203.zip"); - File dest = new File(getCurrentDatabaseDirectory(), "testunzip"); + File dest = new File(getCurrentDatabaseDirectory(), "testunzip2"); String pattern = ".*/scripts/.*"; if (log.isInfoEnabled()) {

1 0

r2524 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org Aug. 25, 2009

Aug. 25, 2009

Author: chatellier Date: 2009-08-25 13:29:03 +0000 (Tue, 25 Aug 2009) New Revision: 2524 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java Log: Make new method filtered uncompress deprecated (will be in lutinutil). Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-08-25 13:18:04 UTC (rev 2523) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-08-25 13:29:03 UTC (rev 2524) @@ -1059,6 +1059,8 @@ * @param targetDir destination file * @param excludes excludes pattern * @throws IOException + * + * @Deprecated this code may be in lutin util later... */ protected void uncompressFiltred(File file, File targetDir, String... excludes) throws IOException { ZipInputStream in = new ZipInputStream(new FileInputStream(file));

1 0

r2523 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/simulator/launcher src/main/resources/i18n src/test/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org Aug. 25, 2009

Aug. 25, 2009

Author: chatellier Date: 2009-08-25 13:18:04 +0000 (Tue, 25 Aug 2009) New Revision: 2523 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java Log: Don't extract everything only in AS case. Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-08-25 08:24:53 UTC (rev 2522) +++ isis-fish/trunk/changelog.txt 2009-08-25 13:18:04 UTC (rev 2523) @@ -1,5 +1,6 @@ isis-fish (3.2.0.5) stable; urgency=low + * Don't extract database for sensitivity analysis (excepted first) * Add user script javadoc generation * Move script import/export to Jaxx * Fix nano time problem (not related to real date) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-08-25 08:24:53 UTC (rev 2522) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-08-25 13:18:04 UTC (rev 2523) @@ -20,10 +20,14 @@ import static org.codelutin.i18n.I18n._; +import java.io.BufferedOutputStream; import java.io.File; import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.StringWriter; import java.io.Writer; import java.rmi.RemoteException; @@ -32,6 +36,8 @@ import java.util.Map; import java.util.Properties; import java.util.concurrent.Semaphore; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; @@ -385,8 +391,17 @@ // FIXME too slow methods //SimulationStorage.importZip(resultZipFile); //Tbz2Util.uncompress(resultArchiveFile, SimulationStorage.getSimulationDirectory()); - ZipUtil.uncompress(resultArchiveFile, SimulationStorage.getSimulationDirectory()); - + //ZipUtil.uncompress(resultArchiveFile, SimulationStorage.getSimulationDirectory()); + + // FIXME big hacks here, only extract non first simulation + // only for AS + if (control.getId().startsWith("as_") && !control.getId().endsWith("_0")) { + uncompressFiltred(resultArchiveFile, SimulationStorage.getSimulationDirectory(), ".*/data/.*"); + } + else { + uncompressFiltred(resultArchiveFile, SimulationStorage.getSimulationDirectory()); + } + if (log.isDebugEnabled()) { log.debug("Simulation imported : " + resultArchiveFile.getAbsolutePath()); } @@ -1036,4 +1051,49 @@ return remotePath; } + + /** + * Unzip compressed archive and keep non exluded patterns. + * + * @param file archive file + * @param targetDir destination file + * @param excludes excludes pattern + * @throws IOException + */ + protected void uncompressFiltred(File file, File targetDir, String... excludes) throws IOException { + ZipInputStream in = new ZipInputStream(new FileInputStream(file)); + ZipEntry entry; + while ((entry = in.getNextEntry()) != null) { + + String name = entry.getName(); + + // add continue to break loop + if (excludes != null) { + boolean excludeEntry = false; + for (String exclude : excludes) { + if (name.matches(exclude)) { + excludeEntry = true; + } + } + if (excludeEntry) { + continue; + } + } + + File target = new File(targetDir, name); + if (entry.isDirectory()) { + target.mkdirs(); + } else { + target.getParentFile().mkdirs(); + OutputStream out = new BufferedOutputStream(new FileOutputStream(target)); + byte[] buffer = new byte[8 * 1024]; + int len; + while ((len = in.read(buffer, 0, 8 * 1024)) != -1) { + out.write(buffer, 0, len); + } + out.close(); + } + } + in.close(); + } } Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-08-25 08:24:53 UTC (rev 2522) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-08-25 13:18:04 UTC (rev 2523) @@ -877,7 +877,6 @@ isisfish.script.menu.edit=\u00C9dition isisfish.script.menu.evaluate=Evaluer isisfish.script.menu.file=Fichier -isisfish.script.menu.generatejavadoc=G\u00E9n\u00E9rer la javadoc isisfish.script.menu.javadocgenerate=G\u00E9n\u00E9rer la javadoc isisfish.script.menu.javadocgenerated=Javadoc g\u00E9n\u00E9r\u00E9e dans %s isisfish.script.menu.javadocgenerating=Javadoc en cours de g\u00E9n\u00E9ration dans %s... Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2009-08-25 08:24:53 UTC (rev 2522) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2009-08-25 13:18:04 UTC (rev 2523) @@ -18,14 +18,20 @@ package fr.ifremer.isisfish.simulator.launcher; +import java.io.File; import java.io.IOException; import junit.framework.Assert; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.Test; +import com.sun.source.tree.AssertTree; + import fr.ifremer.isisfish.AbstractIsisFishTest; import fr.ifremer.isisfish.IsisFish; +import fr.ifremer.isisfish.simulator.SimulationHelperTest; import freemarker.template.TemplateException; /** @@ -40,6 +46,9 @@ */ public class SshSimulatorLauncherTest extends AbstractIsisFishTest { + /** Commons logging log. */ + private static Log log = LogFactory.getLog(SshSimulatorLauncherTest.class); + /** * Test l'instantiation du script qsub (caparmor). * @@ -65,15 +74,16 @@ SIMULATIONZIP, SIMULATIONRESULTZIP, SIMULATIONPRESCRIPT); // simulation parameters - Assert.assertTrue("String \"" + SIMULATIONID + Assert + .assertTrue("String \"" + SIMULATIONID + "\" not found in template", content .indexOf(SIMULATIONID) > 0); Assert.assertTrue("String \"" + SIMULATIONZIP + "\" not found in template", content.indexOf(SIMULATIONZIP) > 0); Assert.assertTrue("String \"" + SIMULATIONRESULTZIP - + "\" not found in template", - content.indexOf(SIMULATIONRESULTZIP) > 0); + + "\" not found in template", content + .indexOf(SIMULATIONRESULTZIP) > 0); Assert.assertTrue("String \"" + SIMULATIONPRESCRIPT + "\" not found in template", content .indexOf(SIMULATIONPRESCRIPT) > 0); @@ -113,17 +123,18 @@ SIMULATIONZIP, SIMULATIONRESULTZIP, SIMULATIONPRESCRIPT); // simulation parameters - Assert.assertTrue("String \"" + SIMULATIONID + Assert + .assertTrue("String \"" + SIMULATIONID + "\" not found in template", content .indexOf(SIMULATIONID) > 0); Assert.assertTrue("String \"" + SIMULATIONZIP + "\" not found in template", content.indexOf(SIMULATIONZIP) > 0); Assert.assertTrue("String \"" + SIMULATIONRESULTZIP - + "\" not found in template", - content.indexOf(SIMULATIONRESULTZIP) > 0); - Assert.assertTrue("Action --simulateRemotelly not on script", - content.indexOf(" --simulateRemotelly ") > 0); + + "\" not found in template", content + .indexOf(SIMULATIONRESULTZIP) > 0); + Assert.assertTrue("Action --simulateRemotelly not on script", content + .indexOf(" --simulateRemotelly ") > 0); // isis location Assert.assertTrue("String \"" + ISISHOME + "\" not found in template", @@ -141,11 +152,55 @@ public void testValidQsubScript() throws IOException { SSHSimulatorLauncher launcher = new SSHSimulatorLauncher(); String content = launcher.getSimulationScriptLaunchContent( - SSHSimulatorLauncher.QSUB_SCRIPT_TEMPLATE, "", - "", "", ""); + SSHSimulatorLauncher.QSUB_SCRIPT_TEMPLATE, "", "", "", ""); // simulation parameters Assert.assertTrue("Invalid qsub script is used", content - .indexOf("!/bin/csh") > 0); + .indexOf("!/bin/csh") > 0); } + + /** + * Test la fonction de decompression sans filtres. + * + * @throws IOException + */ + @Test + public void testPartialUncompress() throws IOException { + File archive = new File("src" + File.separator + "test" + + File.separator + "resources" + File.separator + "simulations" + + File.separator + "test-nonregression-20090203.zip"); + File dest = new File(getCurrentDatabaseDirectory(), "testunzip"); + + if (log.isInfoEnabled()) { + log.info("Extracting " + archive + " to " + dest); + } + + SSHSimulatorLauncher launcher = new SSHSimulatorLauncher(); + launcher.uncompressFiltred(archive, dest); + File ruleFile = new File(dest, "test-nonregression-20090203" + File.separator + "scripts" + File.separator + "RuleUtil.java"); + Assert.assertTrue(ruleFile.exists()); + } + + /** + * Test la fonction de decompression avec filtres. + * + * @throws IOException + */ + @Test + public void testPartialUncompressFiltred() throws IOException { + File archive = new File("src" + File.separator + "test" + + File.separator + "resources" + File.separator + "simulations" + + File.separator + "test-nonregression-20090203.zip"); + File dest = new File(getCurrentDatabaseDirectory(), "testunzip"); + String pattern = ".*/scripts/.*"; + + if (log.isInfoEnabled()) { + log.info("Extracting " + archive + " to " + dest + " without " + pattern); + } + + SSHSimulatorLauncher launcher = new SSHSimulatorLauncher(); + launcher.uncompressFiltred(archive, dest, pattern); + File ruleFile = new File(dest, "test-nonregression-20090203" + File.separator + "scripts" + File.separator + "RuleUtil.java"); + Assert.assertFalse(ruleFile.exists()); + } } \ No newline at end of file

1 0

r2522 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map
by chatellier＠users.labs.libre-entreprise.org Aug. 25, 2009

Aug. 25, 2009

Author: chatellier Date: 2009-08-25 08:24:53 +0000 (Tue, 25 Aug 2009) New Revision: 2522 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/OpenMapToolPanel.java Log: Update hack comments. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/OpenMapToolPanel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/OpenMapToolPanel.java 2009-08-25 08:13:15 UTC (rev 2521) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/OpenMapToolPanel.java 2009-08-25 08:24:53 UTC (rev 2522) @@ -16,18 +16,6 @@ * Place - Suite 330, Boston, MA 02111-1307, USA. ##% */ -/******************************************************************************* - * OpenMapToolPanel.java - * - * Created: 6 septembre 2005 00:01:18 CEST - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * - * @version $Revision$ - * - * Last update: $Date$ by : $Author$ - */ - package fr.ifremer.isisfish.map; import java.awt.Component; @@ -38,10 +26,20 @@ /** * Hack class to permit ToolPanel work with SwiXml, because SwiXml call only * add(Component) and not add(Tool). + * + * EC-20090825 : The hack is still used in Jaxx UI. + * + * Created: 6 septembre 2005 00:01:18 CEST + * + * @author Benjamin POUSSIN <poussin at codelutin.com> + * + * @version $Revision$ + * + * Last update: $Date$ by : $Author$ */ public class OpenMapToolPanel extends ToolPanel { // OpenMapToolPanel - /** */ + /** serialVersionUID. */ private static final long serialVersionUID = -1961465978756124241L; protected boolean inAdd = false;

1 0

r2521 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map
by chatellier＠users.labs.libre-entreprise.org Aug. 25, 2009

Aug. 25, 2009

Author: chatellier Date: 2009-08-25 08:13:15 +0000 (Tue, 25 Aug 2009) New Revision: 2521 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Coordinate.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMap.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMapInfo.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMapList.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DefaultDataMap.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Motif.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Scale.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java Log: Add comment, fix javadocn and some code format. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java 2009-08-25 07:35:18 UTC (rev 2520) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java 2009-08-25 08:13:15 UTC (rev 2521) @@ -1,18 +1,23 @@ +/* *##% + * Copyright (C) 2002, 2009 Code Lutin + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + package fr.ifremer.isisfish.map; -/** -* CellSelectionLayer.java -* Ce layer permet de dessinner un cadrillage avec une latitude/longitude max et min, -* ainsi qu un pas de maille. Dans ce cadrillage, il est ensuite possible de selectionner -* des carres. Cette selection peut se faire avec la souris. Il y a diiferents mode de -* de selections qui sont NO_SELECTION,SINGLE_SELECTION et MULT_SELECTION. -* -* Created: Mon Jan 21 13:42:55 2002 -* -* @author <a href="mailto:seb.regnier at free.fr"></a> -* @version -*/ - import java.awt.Color; import java.awt.event.MouseEvent; import java.util.ArrayList; @@ -30,98 +35,124 @@ import fr.ifremer.isisfish.entities.FisheryRegion; -public class CellSelectionLayer extends ZoneDelimiterLayer implements MapMouseListener { +/** + * Ce layer permet de dessinner un cadrillage avec une latitude/longitude max et min, + * ainsi qu'un pas de maille. Dans ce cadrillage, il est ensuite possible de selectionner + * des carres. Cette selection peut se faire avec la souris. Il y a diiferents mode de + * de selections qui sont {@link #NO_SELECTION}, {@link #SINGLE_SELECTION} et + * {@link #MULT_SELECTION}. + * + * Created: Mon Jan 21 13:42:55 2002 + * + * @author <a href="mailto:seb.regnier at free.fr"></a> + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class CellSelectionLayer extends ZoneDelimiterLayer implements + MapMouseListener { - /** */ + /** serialVersionUID */ private static final long serialVersionUID = 6952137313443302883L; - /* Type de selections possibles */ + + /** Current layer selection mode. */ + protected int selectionMode; - protected int selectionMode; + /** No selection enabled. */ public static final int NO_SELECTION = 0; + /** Only single celle selection enabled. */ public static final int SINGLE_SELECTION = 1; + /** Multi selection enabled. */ public static final int MULT_SELECTION = 2; - public CellSelectionLayer (FisheryRegion fisheryRegion, int selectionMode) throws TopiaException { + public CellSelectionLayer(FisheryRegion fisheryRegion, int selectionMode) + throws TopiaException { super(fisheryRegion); this.selectionMode = selectionMode; } /** - * Get the value of selectionMode. - * @return value of selectionMode. - */ + * Get the value of selectionMode. + * @return value of selectionMode. + */ public int getSelectionMode() { return selectionMode; } /** - * Set the value of selectionMode. - * @param v Value to assign to selectionMode. - */ - public void setSelectionMode(int v) { + * Set the value of selectionMode. + * @param v Value to assign to selectionMode. + */ + public void setSelectionMode(int v) { this.selectionMode = v; } /** - * Permet de retrouver le carre incluant le point donne. - * @param pt le point pour lequel on cherche le carre correspondant - * @return le carre correspondant au point donne sinon renvoie null. - */ - public OMGraphic findXY(LatLonPoint pt){ + * Permet de retrouver le carre incluant le point donne. + * @param pt le point pour lequel on cherche le carre correspondant + * @return le carre correspondant au point donne sinon renvoie null. + */ + public OMGraphic findXY(LatLonPoint pt) { // Recupere le vecteur de tous les carres possibles. List<OMRect> allRect = graphics.getTargets(); // Parcours le vecteur, et cherche le carre, et le renvoie si il existe - for(OMRect rect:allRect){ - if (pt.getLatitude()>=rect.getSouthLat() && pt.getLatitude()<rect.getNorthLat() && - pt.getLongitude()>=rect.getWestLon() && pt.getLongitude()<rect.getEastLon()) - return rect; + for (OMRect rect : allRect) { + if (pt.getLatitude() >= rect.getSouthLat() + && pt.getLatitude() < rect.getNorthLat() + && pt.getLongitude() >= rect.getWestLon() + && pt.getLongitude() < rect.getEastLon()) { + return rect; + } } // Renvoie null si pas trouve return null; } /** - * Renvoie tous les carres selectionnes. - * @return le vecteur contenant des LatLonPoint des carres selectionnes. - */ - public List<LatLonPoint> getSelected(){ + * Renvoie tous les carres selectionnes. + * @return le vecteur contenant des LatLonPoint des carres selectionnes. + */ + public List<LatLonPoint> getSelected() { // Recupere le vecteur de tous les carres possibles. List<OMRect> allRect = graphics.getTargets(); List<LatLonPoint> result = new ArrayList<LatLonPoint>(); // Parcours le vecteur de tous les carres possibles. - for(OMRect rect: allRect){ + for (OMRect rect : allRect) { // Si le carre est selectionne, on rajoute ses coordonnees au vector results - if (rect.getFillPaint() != null && !OMGraphic.isClear(rect.getFillPaint())){ - result.add(new LatLonPoint(rect.getSouthLat(),rect.getWestLon())); + if (rect.getFillPaint() != null + && !OMGraphic.isClear(rect.getFillPaint())) { + result.add(new LatLonPoint(rect.getSouthLat(), rect + .getWestLon())); } } return result; } /** - * Deselectionne tous les carres. - */ - public void unSelectAll(){ + * Deselectionne tous les carres. + */ + public void unSelectAll() { // Recupere le vecteur de tous les carres possibles. List<OMRect> allRect = graphics.getTargets(); // Parcours le vecteur et met a null la couleur de fond de chaque carre - for(OMRect rect:allRect){ + for (OMRect rect : allRect) { rect.setFillPaint(null); } - // Raffraichit le layer + // Rafraichit le layer repaint(); } /** - * Permet de selectionner le carre incluant le point donne. - * @param pt le point pour lequel on cherche le carre correspondant - * @return true si reussi sinon false. - */ - public boolean select(LatLonPoint pt){ + * Permet de selectionner le carre incluant le point donne. + * @param pt le point pour lequel on cherche le carre correspondant + * @return true si reussi sinon false. + */ + public boolean select(LatLonPoint pt) { // Recherche le carre correspondant au point donne OMGraphic select = findXY(pt); @@ -130,7 +161,8 @@ return false; // si trouve et pas deja selectionne - if (select.getFillPaint() == null || OMGraphic.isClear(select.getFillPaint())){ + if (select.getFillPaint() == null + || OMGraphic.isClear(select.getFillPaint())) { // Si on est en mode SINGLE_SELECTION, on deselectionne tous les carres avant. if (getSelectionMode() == SINGLE_SELECTION) unSelectAll(); @@ -143,127 +175,130 @@ } /** - * Permet de selectionner le carre incluant le point donne en latitude et longitude. - * @param latitude la latitude du point - * @param longitude la longitude du point - * @return true si reussi sinon false. - */ - public boolean select(float latitude,float longitude){ - return select(new LatLonPoint(latitude,longitude)); + * Permet de selectionner le carre incluant le point donne en latitude et longitude. + * @param latitude la latitude du point + * @param longitude la longitude du point + * @return true si reussi sinon false. + */ + public boolean select(float latitude, float longitude) { + return select(new LatLonPoint(latitude, longitude)); } - /** - * Permet de deselectionner le carre incluant le point donne. - * @param pt le point pour lequel on cherche le carre correspondant - * @return true si reussi sinon false. - */ - public boolean unSelect(LatLonPoint pt){ + * Permet de deselectionner le carre incluant le point donne. + * @param pt le point pour lequel on cherche le carre correspondant + * @return true si reussi sinon false. + */ + public boolean unSelect(LatLonPoint pt) { OMGraphic select = findXY(pt); - if (select == null) + if (select == null) { return false; - OMRect rect = (OMRect)select; + } + OMRect rect = (OMRect) select; rect.setFillPaint(null); repaint(); return true; } /** - * Permet de deselectionner le carre incluant le point donne en latitude et longitude. - * @param latitude la latitude du point - * @param longitude la longitude du point - * @return true si reussi sinon false. - */ - public boolean unSelect(float latitude, float longitude){ - return unSelect(new LatLonPoint(latitude,longitude)); + * Permet de deselectionner le carre incluant le point donne en latitude et longitude. + * @param latitude la latitude du point + * @param longitude la longitude du point + * @return true si reussi sinon false. + */ + public boolean unSelect(float latitude, float longitude) { + return unSelect(new LatLonPoint(latitude, longitude)); } /** - * Return a list of the modes that are interesting to the - * MapMouseListener. The source MouseEvents will only get sent to - * the MapMouseListener if the mode is set to one that the - * listener is interested in. - * Layers interested in receiving events should register for - * receiving events in "select" mode. - * <code> - * <pre> - * return new String[1] { - * SelectMouseMode.modeID - * }; - * </pre> - * <code> - * @see NavMouseMode#modeID - * @see SelectMouseMode#modeID - * @see NullMouseMode#modeID - */ + * Return a list of the modes that are interesting to the + * MapMouseListener. The source MouseEvents will only get sent to + * the MapMouseListener if the mode is set to one that the + * listener is interested in. + * Layers interested in receiving events should register for + * receiving events in "select" mode. + * <code> + * <pre> + * return new String[1] { + * SelectMouseMode.modeID + * }; + * </pre> + * <code> + * @see NavMouseMode#modeID + * @see SelectMouseMode#modeID + * @see NullMouseMode#modeID + */ public String[] getMouseModeServiceList() { - return new String[] { - SelectMouseMode.modeID - }; + return new String[] { SelectMouseMode.modeID }; } /** - * Note: A layer interested in receiving amouse events should - * implement this function . Otherwise, return the default, which - * is null. - */ + * Note: A layer interested in receiving amouse events should + * implement this function . Otherwise, return the default, which + * is null. + */ public synchronized MapMouseListener getMapMouseListener() { return this; } /** - * Invoked when a mouse button has been pressed on a component. - * @param e MouseEvent - * @return true if the listener was able to process the event. - */ + * Invoked when a mouse button has been pressed on a component. + * @param e MouseEvent + * @return true if the listener was able to process the event. + */ public boolean mousePressed(MouseEvent e) { return false; } /** - * Invoked when a mouse button has been released on a component. - * @param e MouseEvent - * @return true if the listener was able to process the event. - */ + * Invoked when a mouse button has been released on a component. + * @param e MouseEvent + * @return true if the listener was able to process the event. + */ public boolean mouseReleased(MouseEvent e) { return false; } /** - * Invoked when the mouse has been clicked on a component. - * The listener will receive this event if it successfully - * processed <code>mousePressed()</code>, or if no other listener - * processes the event. If the listener successfully processes - * mouseClicked(), then it will receive the next mouseClicked() - * notifications that have a click count greater than one. - * @param e MouseListener MouseEvent to handle. - * @return true if the listener was able to process the event. - */ + * Invoked when the mouse has been clicked on a component. + * The listener will receive this event if it successfully + * processed <code>mousePressed()</code>, or if no other listener + * processes the event. If the listener successfully processes + * mouseClicked(), then it will receive the next mouseClicked() + * notifications that have a click count greater than one. + * @param e MouseListener MouseEvent to handle. + * @return true if the listener was able to process the event. + */ public boolean mouseClicked(MouseEvent e) { // si on est dans le mode NO_SELECTION, on fait rien!; - if (getSelectionMode() == NO_SELECTION) + if (getSelectionMode() == NO_SELECTION) { return false; + } // on recherche le carre clique - OMGraphic select = findXY(getProjection().inverse(e.getX(),e.getY())); + OMGraphic select = findXY(getProjection().inverse(e.getX(), e.getY())); // si on le trouve pas,on renvoie false - if (select == null) + if (select == null) { return false; + } // si le carre n est pas selectionne, on le selectionne - if (select.getFillPaint() == null || OMGraphic.isClear(select.getFillPaint())){ + if (select.getFillPaint() == null + || OMGraphic.isClear(select.getFillPaint())) { // si on est en mode SINGLE_SELECTION, on deselectionne tous avant. - if (getSelectionMode() == SINGLE_SELECTION) + if (getSelectionMode() == SINGLE_SELECTION) { unSelectAll(); + } // on selectionne le carre select.setFillPaint(Color.green); } // si le carre est deja selectionne - else{ + else { // si on est en mode MULT_SELECTION, on le deselectionne - if (getSelectionMode() == MULT_SELECTION) + if (getSelectionMode() == MULT_SELECTION) { select.setFillPaint(null); + } } // Raffraichit le layer repaint(); @@ -271,49 +306,49 @@ } /** - * Invoked when the mouse enters a component. - * @param e MouseListener MouseEvent to handle. - */ + * Invoked when the mouse enters a component. + * @param e MouseListener MouseEvent to handle. + */ public void mouseEntered(MouseEvent e) { } /** - * Invoked when the mouse exits a component. - * @param e MouseListener MouseEvent to handle. - */ + * Invoked when the mouse exits a component. + * @param e MouseListener MouseEvent to handle. + */ public void mouseExited(MouseEvent e) { } /** - * Invoked when a mouse button is pressed on a component and then - * dragged. The listener will receive these events if it - * successfully processes mousePressed(), or if no other listener - * processes the event. - * @param e MouseMotionListener MouseEvent to handle. - * @return true if the listener was able to process the event. - */ + * Invoked when a mouse button is pressed on a component and then + * dragged. The listener will receive these events if it + * successfully processes mousePressed(), or if no other listener + * processes the event. + * @param e MouseMotionListener MouseEvent to handle. + * @return true if the listener was able to process the event. + */ public boolean mouseDragged(MouseEvent e) { return false; } /** - * Invoked when the mouse tton has been moved on a component - * (with no buttons no down). - * @param e MouseListener MouseEvent to handle. - * @return true if the listener was able to process the event. - */ + * Invoked when the mouse tton has been moved on a component + * (with no buttons no down). + * @param e MouseListener MouseEvent to handle. + * @return true if the listener was able to process the event. + */ public boolean mouseMoved(MouseEvent e) { return false; } /** - * Handle a mouse cursor moving without the button being pressed. - * This event is intended to tell the listener that there was a - * mouse movement, but that the event was consumed by another - * layer. This will allow a mouse listener to clean up actions - * that might have happened because of another motion event - * response. - */ + * Handle a mouse cursor moving without the button being pressed. + * This event is intended to tell the listener that there was a + * mouse movement, but that the event was consumed by another + * layer. This will allow a mouse listener to clean up actions + * that might have happened because of another motion event + * response. + */ public void mouseMoved() { } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Coordinate.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Coordinate.java 2009-08-25 07:35:18 UTC (rev 2520) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Coordinate.java 2009-08-25 08:13:15 UTC (rev 2521) @@ -1,3 +1,21 @@ +/* *##% + * Copyright (C) 2002, 2009 Code Lutin + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + package fr.ifremer.isisfish.map; /** Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMap.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMap.java 2009-08-25 07:35:18 UTC (rev 2520) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMap.java 2009-08-25 08:13:15 UTC (rev 2521) @@ -1,3 +1,21 @@ +/* *##% + * Copyright (C) 2002, 2009 Code Lutin + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + package fr.ifremer.isisfish.map; import java.io.Serializable; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMapInfo.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMapInfo.java 2009-08-25 07:35:18 UTC (rev 2520) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMapInfo.java 2009-08-25 08:13:15 UTC (rev 2521) @@ -1,3 +1,20 @@ +/* *##% + * Copyright (C) 2002, 2009 Code Lutin + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ package fr.ifremer.isisfish.map; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMapList.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMapList.java 2009-08-25 07:35:18 UTC (rev 2520) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMapList.java 2009-08-25 08:13:15 UTC (rev 2521) @@ -1,3 +1,20 @@ +/* *##% + * Copyright (C) 2002, 2009 Code Lutin + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ package fr.ifremer.isisfish.map; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DefaultDataMap.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DefaultDataMap.java 2009-08-25 07:35:18 UTC (rev 2520) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DefaultDataMap.java 2009-08-25 08:13:15 UTC (rev 2521) @@ -1,3 +1,20 @@ +/* *##% + * Copyright (C) 2002, 2009 Code Lutin + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ package fr.ifremer.isisfish.map; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java 2009-08-25 07:35:18 UTC (rev 2520) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java 2009-08-25 08:13:15 UTC (rev 2521) @@ -1,3 +1,20 @@ +/* *##% + * Copyright (C) 2002, 2009 Code Lutin + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ package fr.ifremer.isisfish.map; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2009-08-25 07:35:18 UTC (rev 2520) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2009-08-25 08:13:15 UTC (rev 2521) @@ -2,7 +2,6 @@ * Copyright (C) 2002, 2003, 2004, 2005 Code Lutin, * Cédric Pineau, Benjamin Poussin * - * * 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 2 @@ -18,18 +17,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -/* * - * IsisMapBean.java - * - * Created: 16 mai 2005 - * - * @author Benjamin Poussin <poussin at codelutin.com> - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - */ - package fr.ifremer.isisfish.map; import static org.codelutin.i18n.I18n._; @@ -64,13 +51,24 @@ import fr.ifremer.isisfish.entities.CellDAO; import fr.ifremer.isisfish.entities.FisheryRegion; +/** + * IsisMapBean.java + * + * Created: 16 mai 2005 + * + * @author Benjamin Poussin <poussin at codelutin.com> + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ public class IsisMapBean extends BufferedMapBean { - /** */ + /** serialVersionUID. */ private static final long serialVersionUID = -4162103384132928473L; /** to use log facility, just put in your code: log.info("..."); */ - static private Log log = LogFactory.getLog(IsisMapBean.class); + private static Log log = LogFactory.getLog(IsisMapBean.class); protected FisheryRegion fisheryRegion = null; protected float pasMailleLatitude; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Motif.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Motif.java 2009-08-25 07:35:18 UTC (rev 2520) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Motif.java 2009-08-25 08:13:15 UTC (rev 2521) @@ -1,3 +1,20 @@ +/* *##% + * Copyright (C) 2002, 2009 Code Lutin + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ package fr.ifremer.isisfish.map; @@ -19,7 +36,6 @@ * @author <a href="mailto:seb.regnier at free.fr"></a> * @version $Revision$ */ - public class Motif implements Serializable { /** serialVersionUID */ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java 2009-08-25 07:35:18 UTC (rev 2520) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java 2009-08-25 08:13:15 UTC (rev 2521) @@ -1,3 +1,20 @@ +/* *##% + * Copyright (C) 2002, 2009 Code Lutin + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ package fr.ifremer.isisfish.map; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Scale.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Scale.java 2009-08-25 07:35:18 UTC (rev 2520) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Scale.java 2009-08-25 08:13:15 UTC (rev 2521) @@ -1,3 +1,21 @@ +/* *##% + * Copyright (C) 2002, 2009 Code Lutin + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + package fr.ifremer.isisfish.map; import java.io.Serializable; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java 2009-08-25 07:35:18 UTC (rev 2520) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java 2009-08-25 08:13:15 UTC (rev 2521) @@ -1,3 +1,21 @@ +/* *##% + * Copyright (C) 2002, 2009 Code Lutin + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + package fr.ifremer.isisfish.map; import java.awt.Color; @@ -30,13 +48,14 @@ * @author <a href="mailto:seb.regnier at free.fr"></a> * @version $Revision$ */ -public class ZoneDelimiterLayer extends Layer implements TopiaTransactionListener { //ZoneDelimiterLayer +public class ZoneDelimiterLayer extends Layer implements + TopiaTransactionListener { //ZoneDelimiterLayer /** serialVersionUID */ private static final long serialVersionUID = 1127201121371123690L; /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(ZoneDelimiterLayer.class); + private static Log log = LogFactory.getLog(ZoneDelimiterLayer.class); protected Projection proj = null; @@ -50,7 +69,8 @@ protected FisheryRegion fisheryRegion; protected Collection<Cell> cells; - public ZoneDelimiterLayer (FisheryRegion fisheryRegion) throws TopiaException { + public ZoneDelimiterLayer(FisheryRegion fisheryRegion) + throws TopiaException { this.fisheryRegion = fisheryRegion; this.pasMailleLatitude = fisheryRegion.getCellLengthLatitude(); @@ -66,26 +86,26 @@ } /** - * Set the projection. - * @param proj Projection - */ - public void setProjection (Projection proj) { + * Set the projection. + * @param proj Projection + */ + public void setProjection(Projection proj) { this.proj = proj; } /** - * Get the projection. - * @return Projection proj - */ - public Projection getProjection () { + * Get the projection. + * @return Projection proj + */ + public Projection getProjection() { return proj; } /** - * Implementing the ProjectionPainter interface. - */ - public void renderDataForProjection(Projection proj, java.awt.Graphics g){ - if (proj == null){ + * Implementing the ProjectionPainter interface. + */ + public void renderDataForProjection(Projection proj, java.awt.Graphics g) { + if (proj == null) { return; } else { // generateGraphics(); @@ -95,33 +115,33 @@ } /** - * Invoked when the projection has changed or this Layer has been - * added to the MapBean. - * @param e ProjectionEvent - */ - public void projectionChanged (ProjectionEvent e) { + * Invoked when the projection has changed or this Layer has been + * added to the MapBean. + * @param e ProjectionEvent + */ + public void projectionChanged(ProjectionEvent e) { setProjection(e.getProjection()); repaint(); } /** - * Create and project the graphics.Creer l ensemble des carres possible et affiche le - * cadrillage. - */ - protected void generateGraphics () throws TopiaException { + * Create and project the graphics.Creer l ensemble des carres possible et affiche le + * cadrillage. + */ + protected void generateGraphics() throws TopiaException { graphics.clear(); OMRect omrect; - for(Cell cell:cells){ - omrect = new OMRect((float)(cell.getLatitude() + pasMailleLatitude), - (float)cell.getLongitude(), - (float)cell.getLatitude(), - (float)(cell.getLongitude() + pasMailleLongitude), + for (Cell cell : cells) { + omrect = new OMRect( + (float) (cell.getLatitude() + pasMailleLatitude), + (float) cell.getLongitude(), (float) cell.getLatitude(), + (float) (cell.getLongitude() + pasMailleLongitude), OMGraphic.LINETYPE_STRAIGHT); - if (cell.getLand()){ - omrect.setLinePaint(new Color(Color.red.getRed(), Color.red.getGreen(), Color.red.getBlue(), 0));//completement transparent - } - else{ + if (cell.getLand()) { + omrect.setLinePaint(new Color(Color.red.getRed(), Color.red + .getGreen(), Color.red.getBlue(), 0));//completement transparent + } else { omrect.setLinePaint(Color.red); } omrect.setVisible(true); @@ -130,37 +150,39 @@ graphics.generate(getProjection()); } -// /** -// * Appelé lorsqu'une ou plusieurs entités ont été créées -// */ -// public void entityCreated(TopiaEntityEvent event){ -// refresh(); -// } -// /** -// * Appelé lorsqu'une ou plusieurs entités ont été chargées -// */ -// public void entityLoaded(TopiaEntityEvent event){ -// } -// /** -// * Appelé lorsqu'une ou plusieurs entités ont été modifiées -// */ -// public void entityUpdated(TopiaEntityEvent event){ -// refresh(); -// } -// /** -// * Appelé lorsqu'une ou plusieurs entités ont été supprimées -// */ -// public void entityDeleted(TopiaEntityEvent event){ -// refresh(); -// } + // /** + // * Appelé lorsqu'une ou plusieurs entités ont été créées + // */ + // public void entityCreated(TopiaEntityEvent event){ + // refresh(); + // } + // /** + // * Appelé lorsqu'une ou plusieurs entités ont été chargées + // */ + // public void entityLoaded(TopiaEntityEvent event){ + // } + // /** + // * Appelé lorsqu'une ou plusieurs entités ont été modifiées + // */ + // public void entityUpdated(TopiaEntityEvent event){ + // refresh(); + // } + // /** + // * Appelé lorsqu'une ou plusieurs entités ont été supprimées + // */ + // public void entityDeleted(TopiaEntityEvent event){ + // refresh(); + // } - protected void refresh(){ - try{ + protected void refresh() { + try { cells = fisheryRegion.getCell(); generateGraphics(); repaint(); - }catch(TopiaException eee){ - log.warn("Can't refresh view", eee); + } catch (TopiaException eee) { + if (log.isWarnEnabled()) { + log.warn("Can't refresh view", eee); + } } } @@ -168,18 +190,20 @@ * Paints the layer. * @param g the Graphics context for painting */ - public void paint (Graphics g) { + public void paint(Graphics g) { //generateGraphics(); graphics.generate(getProjection()); graphics.render(g); } - /* (non-Javadoc) + /* * @see org.codelutin.topia.event.TopiaTransactionListener#commit(org.codelutin.topia.event.TopiaTransactionEvent) */ + @Override public void commit(TopiaTransactionEvent event) { for (TopiaEntity e : event.getEntities()) { - if (event.isModification(e) && Cell.class.isAssignableFrom(e.getClass())) { + if (event.isModification(e) + && Cell.class.isAssignableFrom(e.getClass())) { // on rafraichi que si on commit au moins un Cell refresh(); break; @@ -187,10 +211,11 @@ } } - /* (non-Javadoc) + /* * @see org.codelutin.topia.event.TopiaTransactionListener#rollback(org.codelutin.topia.event.TopiaTransactionEvent) */ + @Override public void rollback(TopiaTransactionEvent event) { // nothing to do } -}// ZoneDelimiterLayer +} // ZoneDelimiterLayer

1 0

r2520 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org Aug. 25, 2009

Aug. 25, 2009

Author: chatellier Date: 2009-08-25 07:35:18 +0000 (Tue, 25 Aug 2009) New Revision: 2520 Modified: isis-fish/trunk/changelog.txt Log: Update changelog (javadoc) Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-08-24 14:37:53 UTC (rev 2519) +++ isis-fish/trunk/changelog.txt 2009-08-25 07:35:18 UTC (rev 2520) @@ -1,5 +1,6 @@ isis-fish (3.2.0.5) stable; urgency=low + * Add user script javadoc generation * Move script import/export to Jaxx * Fix nano time problem (not related to real date) * @Doc annotation is now only field target

1 0

r2519 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui/script java/fr/ifremer/isisfish/util resources/i18n
by chatellier＠users.labs.libre-entreprise.org Aug. 24, 2009

Aug. 24, 2009

Author: chatellier Date: 2009-08-24 14:37:53 +0000 (Mon, 24 Aug 2009) New Revision: 2519 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Add option to generate javadoc in UI. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2009-08-24 14:35:54 UTC (rev 2518) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2009-08-24 14:37:53 UTC (rev 2519) @@ -21,6 +21,7 @@ import static org.codelutin.i18n.I18n._; +import java.awt.Desktop; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileFilter; @@ -30,6 +31,7 @@ import java.io.StringWriter; import java.io.Writer; import java.lang.reflect.Method; +import java.net.URI; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -63,6 +65,7 @@ import fr.ifremer.isisfish.ui.widget.editor.GenericCell; import fr.ifremer.isisfish.util.ClasspathTemplateLoader; import fr.ifremer.isisfish.util.CompilationResult; +import fr.ifremer.isisfish.util.JavadocHelper; import fr.ifremer.isisfish.vcs.VCSException; import freemarker.cache.TemplateLoader; import freemarker.template.Configuration; @@ -884,4 +887,48 @@ return templatePath; } } + + /** + * Generate javadoc for all database script. + * + * @return javadoc status and output + */ + public CompilationResult generateScriptJavadoc() { + + CompilationResult result = new CompilationResult(); + + File rootDatabase = IsisFish.config.getDatabaseDirectory(); + File javadocDirectory = IsisFish.config.getJavadocDirectory(); + + StringWriter output = new StringWriter(); + PrintWriter out = new PrintWriter(output); + int ok = JavadocHelper.generateJavadoc(rootDatabase, javadocDirectory, out); + + if (ok == 0) { + result.setCompilationResult(CompilationResult.COMPILATION_OK); + } + else { + result.setCompilationResult(CompilationResult.COMPILATION_FAILED); + } + result.setCompilationOutput(output.toString()); + return result; + } + + /** + * Open a browser displaying javadoc. + */ + public void showScriptJavadoc() { + try { + // in faut ouvrir l'index, sinon, ca ouvre + // un explorateur de fichier + File indexFile = new File(IsisFish.config.getJavadocDirectory(), "index.html"); + + URI uri = indexFile.toURI(); + Desktop.getDesktop().browse(uri); + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Can't show script javadocs", e); + } + } + } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2009-08-24 14:35:54 UTC (rev 2518) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2009-08-24 14:37:53 UTC (rev 2519) @@ -267,6 +267,42 @@ String diffMessage = getContextValue(ScriptAction.class).diffScript(editor.getText()); setInfoText(diffMessage); } + + /** + * Generate javadoc and disply output in UI. + */ + protected void generateScriptJavadoc() { + setInfoText(_("isisfish.script.menu.javadocgenerating", fr.ifremer.isisfish.IsisFish.config.getJavadocDirectory())); + + SwingUtilities.invokeLater(new Runnable() { + public void run() { + ScriptAction action = getContextValue(ScriptAction.class); + CompilationResult compilationResult = action.generateScriptJavadoc(); + + // TODO display an ok status ? + if (compilationResult.getCompilationResult() == CompilationResult.COMPILATION_OK) { + actionLogArea.setText(_("isisfish.script.compilation.ok", compilationResult.getCompilationOutput())); + // vert leger + actionLogArea.setBackground(new Color(210, 255, 210)); + } + else { + actionLogArea.setText(_("isisfish.script.compilation.failed", compilationResult.getCompilationOutput())); + // rouge leger + actionLogArea.setBackground(new Color(255, 210, 210)); + } + setInfoText(_("isisfish.script.menu.javadocgenerated", fr.ifremer.isisfish.IsisFish.config.getJavadocDirectory())); + } + }); + } + + /** + * Show generated javadoc. + */ + protected void showScriptJavadoc() { + ScriptAction action = getContextValue(ScriptAction.class); + action.showScriptJavadoc(); + } + ]]> </script> @@ -307,6 +343,9 @@ <JMenu id="scriptTxtCode" text="isisfish.script.menu.code"> <JMenuItem id="miCheckSyntax" text="isisfish.script.menu.checkSyntax" accelerator="accCheckSyntax" onActionPerformed="checkScript()"/> <JMenuItem id="miEvaluate" text="isisfish.script.menu.evaluate" accelerator="accEvaluate" onActionPerformed="evaluateScript()"/> + <JSeparator/> + <JMenuItem id="miGenerateJavadoc" text="isisfish.script.menu.javadocgenerate" onActionPerformed="generateScriptJavadoc()"/> + <JMenuItem id="miShowJavadoc" text="isisfish.script.menu.javadocshow" onActionPerformed="showScriptJavadoc()"/> </JMenu> </JMenuBar> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java 2009-08-24 14:35:54 UTC (rev 2518) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java 2009-08-24 14:37:53 UTC (rev 2519) @@ -29,6 +29,7 @@ import org.apache.commons.logging.LogFactory; import org.codelutin.util.FileUtil; +import com.sun.tools.doclets.standard.Standard; import com.sun.tools.javadoc.Main; import fr.ifremer.isisfish.IsisFish; @@ -166,7 +167,9 @@ for (File srcFile : filesSrc) { args.add(srcFile.getAbsolutePath()); } - result = Main.execute(JAVADOC_TOOL_NAME, args.toArray(new String[0])); + //result = Main.execute(JAVADOC_TOOL_NAME, args.toArray(new String[0])); + result = Main.execute(JAVADOC_TOOL_NAME, out, out, out, + Standard.class.getName(), args.toArray(new String[0])); } catch (Exception eee) { if (log.isWarnEnabled()) { Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-08-24 14:35:54 UTC (rev 2518) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-08-24 14:37:53 UTC (rev 2519) @@ -877,6 +877,10 @@ isisfish.script.menu.edit=Edit isisfish.script.menu.evaluate=Evaluate isisfish.script.menu.file=File +isisfish.script.menu.javadocgenerate=Generate script javadoc +isisfish.script.menu.javadocgenerated=Javadoc generated in %s +isisfish.script.menu.javadocgenerating=Generating javadoc in %s... +isisfish.script.menu.javadocshow=Show script javadoc isisfish.script.menu.new=New isisfish.script.menu.paste=Paste isisfish.script.menu.save=Save Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-08-24 14:35:54 UTC (rev 2518) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-08-24 14:37:53 UTC (rev 2519) @@ -877,6 +877,11 @@ isisfish.script.menu.edit=\u00C9dition isisfish.script.menu.evaluate=Evaluer isisfish.script.menu.file=Fichier +isisfish.script.menu.generatejavadoc=G\u00E9n\u00E9rer la javadoc +isisfish.script.menu.javadocgenerate=G\u00E9n\u00E9rer la javadoc +isisfish.script.menu.javadocgenerated=Javadoc g\u00E9n\u00E9r\u00E9e dans %s +isisfish.script.menu.javadocgenerating=Javadoc en cours de g\u00E9n\u00E9ration dans %s... +isisfish.script.menu.javadocshow=Afficher la javadoc isisfish.script.menu.new=Nouveau isisfish.script.menu.paste=Coller isisfish.script.menu.save=Sauver

1 0

r2518 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: . ui
by chatellier＠users.labs.libre-entreprise.org Aug. 24, 2009

Aug. 24, 2009

Author: chatellier Date: 2009-08-24 14:35:54 +0000 (Mon, 24 Aug 2009) New Revision: 2518 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Help.java Log: Fix option key used. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-08-24 13:12:58 UTC (rev 2517) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-08-24 14:35:54 UTC (rev 2518) @@ -253,7 +253,7 @@ * @return javadoc directory */ public File getJavadocDirectory() { - File result = getOptionAsFile(Option.COMPILATION_DIRECTORY.key); + File result = getOptionAsFile(Option.JAVADOC_DIRECTORY.key); if (!result.exists()) { result.mkdirs(); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Help.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Help.java 2009-08-24 13:12:58 UTC (rev 2517) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Help.java 2009-08-24 14:35:54 UTC (rev 2518) @@ -45,7 +45,7 @@ // URL alias public static Map<String, String> URLSALIAS = new HashMap<String, String>(); - + static { URLSALIAS.put("ISISFISH", "http://isis-fish.labs.libre-entreprise.org/"); URLSALIAS.put("JAVA_API", "http://java.sun.com/javase/6/docs/api/index.html"); @@ -53,7 +53,7 @@ URLSALIAS.put("MATRIX_API", "http://lutinmatrix.labs.libre-entreprise.org/lutinmatrix/apidocs/index.html"); URLSALIAS.put("TOPIA_API", "http://topia.labs.libre-entreprise.org/topia/topia-persistence/apidocs/inde…"); } - + /** * Open url using default system browser. * @@ -62,18 +62,16 @@ public static void showURL(String urlOrAlias) { try { String url = URLSALIAS.get(urlOrAlias); - + if (url == null) { url = urlOrAlias; } Desktop.getDesktop().browse(new URL(url).toURI()); - } catch(Exception e){ + } catch (Exception e) { if (log.isErrorEnabled()) { log.error("Can't show help", e); } - } + } } } - -

1 0

r2517 - in isis-fish/trunk/src: main/java/fr/ifremer/isisfish/util test/java/fr/ifremer/isisfish/util
by chatellier＠users.labs.libre-entreprise.org Aug. 24, 2009

Aug. 24, 2009

Author: chatellier Date: 2009-08-24 13:12:58 +0000 (Mon, 24 Aug 2009) New Revision: 2517 Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/JavadocHelperTest.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java Log: Add user javadoc generation. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java 2009-08-24 08:24:04 UTC (rev 2516) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java 2009-08-24 13:12:58 UTC (rev 2517) @@ -18,29 +18,19 @@ package fr.ifremer.isisfish.util; -import static org.codelutin.i18n.I18n._; - import java.io.File; -import java.io.IOException; import java.io.PrintWriter; -import java.lang.reflect.Method; -import java.net.URL; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.Enumeration; import java.util.List; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.StandardJavaFileManager; -import javax.tools.ToolProvider; - -import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.util.FileUtil; +import com.sun.tools.javadoc.Main; + import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.datastore.JavaSourceStorage; @@ -63,21 +53,47 @@ /** Logger for this class. */ private static final Log log = LogFactory.getLog(JavadocHelper.class); - /** Java home. */ - private static final String JAVA_HOME = System.getProperty("java.home"); + /** Nom du programme dans les outils JDK. */ + protected static final String JAVADOC_TOOL_NAME = "javadoc"; - + /** + * Generate javadoc of current. + * + * @param source source storage + * @param destDir javadoc destination directory + * @param force force (if html file is newer than java file) + * @param out out writer (javadoc output, can be {@code null}) + * @return javadoc tool result + */ public static int generateJavadoc(JavaSourceStorage source, File destDir, boolean force, PrintWriter out) { File src = source.getFile(); File dst = new File(destDir, source.getFQN().replace('.', File.separatorChar) + ".html"); + + int result = 0; if (force || FileUtil.isNewer(src, dst)) { - return generateJavadoc(source.getRoot(), src, destDir, out); + result = generateJavadoc(source.getRoot(), src, destDir, out); } - return 0; + return result; } /** + * Generate javadoc on all java file in a directory. + * + * @param rootSrc le repertoire de toutes les sources + * @param dest le répertoire de destination de la javadoc + * @param out le flux de sortie (peut etre null) + * @return le resulat de sortie de l'executable javadoc (0 si ok) + */ + public static int generateJavadoc(File rootSrc, File dest, PrintWriter out) { + + List<File> javaFiles = FileUtil.find(rootSrc, ".*\\.java", true); + + int result = generateJavadoc(rootSrc, javaFiles, dest, out); + return result; + } + + /** * Generate single file javadoc. * * @param rootSrc le repertoire de toutes les sources @@ -136,10 +152,25 @@ // Options de compilations String classpathAsString = CompileHelper.getClassPathAsString(classpath); + List<String> args = new ArrayList<String>(); + args.add("-classpath"); + args.add(classpathAsString); + args.add("-d"); + args.add(dest.getAbsolutePath()); + args.add("-link"); + args.add("http://java.sun.com/javase/6/docs/api/"); + args.add("-link"); + args.add(IsisFish.config.getJavadocURL()); + + for (File srcFile : filesSrc) { + args.add(srcFile.getAbsolutePath()); + } + result = Main.execute(JAVADOC_TOOL_NAME, args.toArray(new String[0])); + } catch (Exception eee) { if (log.isWarnEnabled()) { - log.warn("Can't get compiler", eee); + log.warn("Can't generate javadoc", eee); } } return result; Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2009-08-24 08:24:04 UTC (rev 2516) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2009-08-24 13:12:58 UTC (rev 2517) @@ -26,15 +26,12 @@ import java.util.List; import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.util.FileUtil; import org.junit.Assert; import org.junit.Test; -import com.sun.source.tree.AssertTree; - import fr.ifremer.isisfish.AbstractIsisFishTest; /** Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/JavadocHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/JavadocHelperTest.java (rev 0) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/JavadocHelperTest.java 2009-08-24 13:12:58 UTC (rev 2517) @@ -0,0 +1,90 @@ +/* *##% + * Copyright (C) 2009 CodeLutin + * + * 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>. ##%*/ + +package fr.ifremer.isisfish.util; + +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.ArrayList; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Test; + +import fr.ifremer.isisfish.AbstractIsisFishTest; + +/** + * CompileHelperTest. + * + * Created: 12 janv. 2006 16:20:33 + * + * @author poussin + * + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author: chatellier $ + */ +public class JavadocHelperTest extends AbstractIsisFishTest { + + /** Class logger */ + private static Log log = LogFactory.getLog(JavadocHelperTest.class); + + /** + * Try to generate javadoc on current isis-fish-data directory. + * (single java file case) + * + * @throws IOException + * @throws ClassNotFoundException + */ + @Test + public void testIsisFishDataJavadoc() throws IOException, ClassNotFoundException { + + File currentDirectory = getCurrentDatabaseDirectory(); + File destinationDirectory = new File(getTestDirectory(), "isis-docs"); + File testJavaFile = new File(currentDirectory, "analyseplans" + File.separatorChar + "Calibration.java"); + + PrintWriter out = new PrintWriter(System.out); + int result = JavadocHelper.generateJavadoc(currentDirectory, testJavaFile, + destinationDirectory, out); + + // 0 = pas d'erreur + Assert.assertEquals(0, result); + } + + /** + * Try to generate javadoc on current isis-fish-data directory. + * (all directory java files) + * + * @throws IOException + * @throws ClassNotFoundException + */ + @Test + public void testIsisFishDataJavadocAll() throws IOException, ClassNotFoundException { + + File currentDirectory = getCurrentDatabaseDirectory(); + File destinationDirectory = new File(getTestDirectory(), "isis-docs-all"); + + PrintWriter out = new PrintWriter(System.out); + int result = JavadocHelper.generateJavadoc(currentDirectory, destinationDirectory, out); + + // 0 = pas d'erreur + Assert.assertEquals(0, result); + } +} Property changes on: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/JavadocHelperTest.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL"

1 0

r2516 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/ui/script src/main/java/fr/ifremer/isisfish/ui/script/action src/main/java/fr/ifremer/isisfish/ui/util src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org Aug. 24, 2009

Aug. 24, 2009

Author: chatellier Date: 2009-08-24 08:24:04 +0000 (Mon, 24 Aug 2009) New Revision: 2516 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/FileSelectionTableModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/CancelAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/ChooseFileAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/ImportAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/IsisActionWithBackup.java isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Debut de refactoring des interfaces import/export de script (pas fini). Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-08-20 17:03:54 UTC (rev 2515) +++ isis-fish/trunk/changelog.txt 2009-08-24 08:24:04 UTC (rev 2516) @@ -1,5 +1,7 @@ isis-fish (3.2.0.5) stable; urgency=low + * Move script import/export to Jaxx + * Fix nano time problem (not related to real date) * @Doc annotation is now only field target * Fix creation group assistant's labels * Improve simulation summary Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx 2009-08-20 17:03:54 UTC (rev 2515) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx 2009-08-24 08:24:04 UTC (rev 2516) @@ -1,6 +1,25 @@ + <JDialog modal="true" resizable='false' title='isisfish.script.export'> <script> - // FIXME a refaire // public org.codelutin.vcs.ui.FieldModelUtil.ModuleFile model; public Object model = null; @@ -20,7 +39,7 @@ fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"items.enabled", "checkAll.enabled","ok.enabled","chooseDir.enabled", "archivePath.enabled"); - } + } </script> <Table anchor='center'> @@ -53,9 +72,9 @@ toolTipText='isisfish.script.export.tooltip.checkAll' enabled='{!isEmpty()}' onActionPerformed="doCheckAll()" /> - <JButton id='ok' text='isisfish.script.export.ok' + <JButton id='okButton' enabled='{isOkEnabled()}'/> - <JButton id='cancel' text='isisfish.script.export.cancel'/> + <JButton id='cancelButton' /> </JPanel> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/FileSelectionTableModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/FileSelectionTableModel.java 2009-08-20 17:03:54 UTC (rev 2515) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/FileSelectionTableModel.java 2009-08-24 08:24:04 UTC (rev 2516) @@ -26,7 +26,8 @@ import javax.swing.table.AbstractTableModel; /** - * File selection table model. + * File selection table model displayed in import/export script + * for files selection (first column is checkbox). * * @author chatellier * @version $Revision: 1.0 $ @@ -43,7 +44,10 @@ public final static String[] COLUMN_NAMES = { _("isisfish.common.ellipsis"), _("isisfish.common.module"), _("isisfish.common.file") }; + /** All files displayed in table. */ protected List<String> availableFiles; + + /** Only selected files. */ protected List<String> selectedFiles; /** @@ -164,12 +168,24 @@ /** * Set all files selected. + * + * @param selection {@code true} to select all files, {@code false} to unselect all files */ - public void checkAll() { - selectedFiles.addAll(availableFiles); + public void setAllChecked(boolean selection) { + if (selection) { + selectedFiles.addAll(availableFiles); + } + else { + selectedFiles.clear(); + } fireTableDataChanged(); } + /** + * Get current files selection. + * + * @return list of selected file path + */ public List<String> getSelectedFiles() { return selectedFiles; } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx 2009-08-20 17:03:54 UTC (rev 2515) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx 2009-08-24 08:24:04 UTC (rev 2516) @@ -35,9 +35,6 @@ (!isNewItemEmpty() && !newFilesTableModel.getSelectedFiles().isEmpty()); }*/ - newFilesTable.getColumnModel().getColumn(0).setWidth(30); - conflictFilesTable.getColumnModel().getColumn(0).setWidth(30); - public void refresh() { setConflictItemEmpty(conflictFilesTableModel.getRowCount() == 0); setNewItemEmpty(newFilesTableModel.getRowCount() == 0); @@ -48,10 +45,19 @@ } public void doCheckAll() { - newFilesTableModel.checkAll(); - conflictFilesTableModel.checkAll(); - //refresh(); + boolean selection = checkAllCheckbox.isSelected(); + newFilesTableModel.setAllChecked(selection); + conflictFilesTableModel.setAllChecked(selection); } + + protected void performImport() { + File archiveFile = new File(archivePath.getText()); + getContextValue(ScriptAction.class).performImportScript(archiveFile, newFilesTableModel, conflictFilesTableModel); + } + + protected void cancel() { + hide(); + } ]]></script> <Table> <row weighty="1" fill='both'> @@ -96,13 +102,15 @@ <row fill='horizontal'> <cell fill='both'> <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> - <JCheckBox id='checkAll' text='isisfish.script.import.checkAll' - toolTipText='isisfish.script.import.tooltip.checkAll' - enabled='{!isBothEmpty()}' - onActionPerformed="doCheckAll()" /> + <JCheckBox id='checkAllCheckbox' text='isisfish.script.import.checkAll' + toolTipText='isisfish.script.import.tooltip.checkAll' + enabled='{!isBothEmpty()}' + onActionPerformed='doCheckAll()' + selected='true' /> <JButton id='okButton' text='isisfish.script.import.import' - enabled='{isOkEnabled()}'/> - <JButton id='cancelButton' text='isisfish.common.cancel'/> + enabled='{isOkEnabled()}'/> + <JButton id='cancelButton' text='isisfish.script.import.cancel' + onActionPerformed="cancel()" /> </JPanel> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2009-08-20 17:03:54 UTC (rev 2515) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2009-08-24 08:24:04 UTC (rev 2516) @@ -46,6 +46,7 @@ import org.apache.commons.logging.LogFactory; import org.codelutin.util.FileUtil; import org.codelutin.util.ZipUtil; +import org.codelutin.widget.SwingUtil; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishRuntimeException; @@ -59,8 +60,6 @@ import fr.ifremer.isisfish.datastore.SensitivityStorage; import fr.ifremer.isisfish.datastore.SimulatorStorage; import fr.ifremer.isisfish.equation.Language; -import fr.ifremer.isisfish.ui.script.action.CancelAction; -import fr.ifremer.isisfish.ui.script.action.ImportAction; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; import fr.ifremer.isisfish.util.ClasspathTemplateLoader; import fr.ifremer.isisfish.util.CompilationResult; @@ -447,12 +446,12 @@ /** * Exporte le(s) script(s) sélectionnés dans l'arbre. - * <br>L'arbre doit avoir au moins un script de selectionne + * <br>L'arbre doit avoir au moins un script de selectionnés * * @param selectedPaths selected path * @return <code>null</code> if everything is ok. */ - public static String exportScript(TreePath[] selectedPaths) { + public String showExportScriptDialog(TreePath[] selectedPaths) { String message = null; // first step : acquire list of files required int prefixLength = IsisFish.config.getDatabaseDirectory() @@ -627,11 +626,11 @@ } /** - * Import zipped archive containing scripts. + * Show a improved script dialog with multiple selection support. * * @return status message */ - public String importScript() { + public String showImportScriptDialog() { String msg = null; if (log.isDebugEnabled()) { log.debug("importScript "); @@ -672,11 +671,13 @@ dialog.setConflictFilesTableModel(modelItems); dialog.getConflictFilesTable().setModel(modelItems); dialog.getNewFilesTable().setModel(modelNewItems); + // can't be in ui :( + dialog.getNewFilesTable().getColumnModel().getColumn(0).setWidth(30); + dialog.getConflictFilesTable().getColumnModel().getColumn(0).setWidth(30); dialog.getArchivePath().setText(file.getAbsolutePath()); dialog.refresh(); - dialog.getOkButton().setAction(new ImportAction(dialog, file, root, modelNewItems, modelItems)); - dialog.getCancelButton().setAction(new CancelAction(dialog)); dialog.pack(); + SwingUtil.center(dialog); dialog.setVisible(true); msg = _("isisfish.message.import.scripts.file.done", file); } @@ -691,6 +692,108 @@ } /** + * Perform import script action called by {@link ImportDialogUI}. + * + * @param sourceScriptArchive source archive file + * @param selectedFiles selected non conflict files model + * @param selectedConflictFiles selected conflict files model + */ + public void performImportScript(File sourceScriptArchive, FileSelectionTableModel selectedFiles, FileSelectionTableModel selectedConflictFiles) { + + File sourceDirectory = IsisFish.config.getDatabaseDirectory(); + + List<String> filesToImports = new ArrayList<String>(); + if (selectedFiles != null) { + filesToImports.addAll(selectedFiles.getSelectedFiles()); + } + + if (selectedConflictFiles != null) { + // do backup stuff (only backup conflict files) + backupScripts(selectedConflictFiles.getSelectedFiles(), sourceDirectory); + + filesToImports.addAll(selectedConflictFiles.getSelectedFiles()); + } + + // unflate files to destination (root) + try { + if (log.isInfoEnabled()) { + for (String newFile : filesToImports) { + log.info("unzip " + newFile); + } + } + ZipUtil.uncompress(sourceScriptArchive, sourceDirectory, filesToImports, null, null); + + } catch (IOException e1) { + throw new RuntimeException(e1); + } + if (log.isInfoEnabled()) { + log.info("Unzip " + filesToImports.size() + " entry(ies) from '" + sourceScriptArchive + "'"); + } + } + + /** + * Make a backup a given files to current isis backup directory. + * + * @param paths + */ + protected void backupScripts(List<String> paths, File destination) { + + File backupDirectory = IsisFish.config.getBackupSessionDirectory(); + + if (log.isDebugEnabled()) { + log.debug("Backup directory is : " + backupDirectory); + } + String suffix = "_" + IsisFish.config.getBackupSessionDirectory().getName(); + try { + for (String path : paths) { + + //backup(new File(src, path), path, suffix); + + File sourceFile = new File(destination, path); + + if (!sourceFile.exists()) { + return; + } + if (sourceFile.isDirectory()) { + File dst = new File(backupDirectory, path); + dst.mkdirs(); + } else { + int extension = path.lastIndexOf("."); + if (extension != -1) { + path = path.substring(0, extension) + suffix + "." + + path.substring(extension + 1); + } else { + path += suffix; + } + File dst = new File(destination, path); + if (!dst.getParentFile().exists()) { + dst.getParentFile().mkdirs(); + } + if (log.isInfoEnabled()) { + log.info("Copying " + sourceFile.getName() + " to " + dst); + } + FileUtil.copy(sourceFile, dst); + } + } + } catch (Exception ee) { + throw new IsisFishRuntimeException(ee); + } + } + + /** + * Copy a single file to destination directory. + * + * @param src file to copy + * @param path path of file to copy + * @param suffix file suffix + * @throws IOException if copy fail + */ + protected void backup(File src, String path, String suffix) + throws IOException { + + } + + /** * Scan archive for script, and return an array of new files and conflict files. * * @param source archive file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2009-08-20 17:03:54 UTC (rev 2515) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2009-08-24 08:24:04 UTC (rev 2516) @@ -21,13 +21,13 @@ <JPanel layout='{new BorderLayout()}'> <script><![CDATA[ import javax.swing.event.TreeSelectionListener; - import javax.swing.tree.TreePath; - import fr.ifremer.isisfish.ui.widget.editor.GenericCell; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreeNode; + import javax.swing.tree.TreePath; + import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.ui.WelcomePanelUI; - import fr.ifremer.isisfish.IsisFishRuntimeException; + import fr.ifremer.isisfish.ui.widget.editor.GenericCell; import fr.ifremer.isisfish.util.CompilationResult; setContextValue(new ScriptAction()); @@ -130,10 +130,11 @@ return result; } - protected void setButton(){ + protected void setButton() { boolean fileLoaded = getContextValue(ScriptAction.class).fileLoaded(); boolean isJavaScript = getContextValue(ScriptAction.class).isJavaScript(); buttonScriptExport.setEnabled(tree.getSelectionValue() != null); + // TODO refactoring en cours, mais pas fini miExport.setEnabled(tree.getSelectionValue() != null); buttonScriptCommit.setEnabled(fileLoaded); miCommitVCS.setEnabled(fileLoaded); @@ -152,7 +153,7 @@ buttonScriptEval.setEnabled(isJavaScript); miEvaluate.setEnabled(isJavaScript); } - protected void setInfoText(String msg){ + protected void setInfoText(String msg) { WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); root.setInfoText(msg); } @@ -204,12 +205,12 @@ setInfoText(_("isisfish.message.save.finished")); } protected void importScript() { - String importMessage = getContextValue(ScriptAction.class).importScript(); + String importMessage = getContextValue(ScriptAction.class).showImportScriptDialog(); setInfoText(importMessage); } - protected void exportScript(){ - new IsisFishRuntimeException("Not yet implemented"); - getContextValue(ScriptAction.class).exportScript(tree.getSelectionPaths()); + protected void exportScript() { + TreePath[] selectedFilesPath = tree.getSelectionPaths(); + getContextValue(ScriptAction.class).showExportScriptDialog(selectedFilesPath); } protected void commitScript(){ new IsisFishRuntimeException("Not yet implemented"); @@ -286,8 +287,8 @@ </JMenu> <JMenuItem id="miSave" text="isisfish.script.menu.save" onActionPerformed="saveScript()" accelerator="accSave"/> <JSeparator/> - <JMenuItem id="miImport" text="isisfish.script.menu.txtImport" onActionPerformed="importScript()" accelerator="accImport"/> - <JMenuItem id="miExport" text="isisfish.script.menu.txtExport" onActionPerformed="exportScript()" accelerator="accExport"/> + <JMenuItem id="miImport" text="isisfish.script.menu.txtImport" enabled="false" onActionPerformed="importScript()" accelerator="accImport"/> + <JMenuItem id="miExport" text="isisfish.script.menu.txtExport" enabled="false" onActionPerformed="exportScript()" accelerator="accExport"/> <JSeparator/> <JMenuItem id="miDelete" text="isisfish.script.menu.deleteLocaly" onActionPerformed='deleteScript(false)' accelerator="accDelete"/> </JMenu> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java 2009-08-20 17:03:54 UTC (rev 2515) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java 2009-08-24 08:24:04 UTC (rev 2516) @@ -33,27 +33,40 @@ import fr.ifremer.isisfish.ui.util.IsisAction; /** - * BackupAction. + * Make a backup directory containing a set a specific files. * * @author bpoussin * @version $Revision$ * * Last update : $Date$ * By : $Author$ + * + * @deprecated C'est pas evident de faire des Actions swing avec jaxx */ public class BackupAction extends IsisAction { + /** serialVersionUID. */ + private static final long serialVersionUID = -7574218899996427656L; + + /** log. */ private static Log log = LogFactory.getLog(BackupAction.class); - /** source root directory */ + /** Source root directory. */ protected File src; - /** backup root directory */ + + /** Backup root directory. */ protected File dst; - /** list of relative path of files to backup */ + + /** List of relative path of files to backup. */ protected List<String> paths; - private static final long serialVersionUID = -7574218899996427656L; - + /** + * Constructor. + * + * @param src source root directory + * @param dst backup root directory + * @param paths list of relative path of files to backup + */ public BackupAction(File src, File dst, List<String> paths) { super(); this.src = src; @@ -61,14 +74,19 @@ this.paths = paths; } + @Override protected boolean prepare() { - return src != null && dst != null && paths != null && - src.exists() && !paths.isEmpty(); + return src != null && dst != null && paths != null && src.exists() + && !paths.isEmpty(); } + @Override protected void perform(ActionEvent e) { - log.info("directory for backup [" + dst+']'); - String suffix = "_" + IsisFish.config.getBackupSessionDirectory().getName(); + if (log.isDebugEnabled()) { + log.debug("Backup directory is : " + dst); + } + String suffix = "_" + + IsisFish.config.getBackupSessionDirectory().getName(); try { for (String path : paths) { backup(new File(src, path), path, suffix); @@ -78,7 +96,16 @@ } } - protected void backup(File src, String path, String suffix) throws IOException { + /** + * Copy a single file to destination directory. + * + * @param src file to copy + * @param path path of file to copy + * @param suffix file suffix + * @throws IOException if copy fail + */ + protected void backup(File src, String path, String suffix) + throws IOException { if (!src.exists()) { return; } @@ -87,16 +114,19 @@ dst.mkdirs(); } else { int extension = path.lastIndexOf("."); - if (extension!=-1) { - path = path.substring(0,extension)+suffix+"."+path.substring(extension+1); + if (extension != -1) { + path = path.substring(0, extension) + suffix + "." + + path.substring(extension + 1); } else { - path +=suffix; + path += suffix; } File dst = new File(this.dst, path); if (!dst.getParentFile().exists()) { dst.getParentFile().mkdirs(); } - log.info("[" + src.getName()+ "] to ["+dst+"]"); + if (log.isInfoEnabled()) { + log.info("Copying " + src.getName() + " to " + dst); + } FileUtil.copy(src, dst); } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/CancelAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/CancelAction.java 2009-08-20 17:03:54 UTC (rev 2515) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/CancelAction.java 2009-08-24 08:24:04 UTC (rev 2516) @@ -24,20 +24,38 @@ import javax.swing.JDialog; import java.awt.event.ActionEvent; +/** + * Cancel action. Do nothing, just close current dialog. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + * + * @deprecated C'est pas evident de faire des Actions swing avec jaxx + */ public class CancelAction extends IsisAction { + /** serialVersionUID. */ private static final long serialVersionUID = 2536223593370089763L; + /** + * Constructor. + * + * @param dialog dialog to close on action performed + */ public CancelAction(JDialog dialog) { super(dialog); } + @Override protected boolean prepare() { return true; } + @Override protected void perform(ActionEvent e) { //nothing special to do } - } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/ChooseFileAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/ChooseFileAction.java 2009-08-20 17:03:54 UTC (rev 2515) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/ChooseFileAction.java 2009-08-24 08:24:04 UTC (rev 2516) @@ -28,10 +28,21 @@ import java.awt.event.ActionEvent; import java.io.File; +/** + * Choose file action. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + * + * @deprecated as of 20090819 unused + */ public class ChooseFileAction extends AbstractAction { private static final long serialVersionUID = -5004217809548352109L; - + protected JTextField file; protected JDialog dialog; @@ -56,16 +67,18 @@ } JFileChooser chooser = new JFileChooser(dir); chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); - int ret = chooser.showDialog(dialog, _("isisfish.message.choose.archive")); + int ret = chooser.showDialog(dialog, + _("isisfish.message.choose.archive")); if (ret == JFileChooser.APPROVE_OPTION) { File newFile = chooser.getSelectedFile(); String path; if (newFile.isFile()) { path = newFile.getAbsolutePath(); - } - else { + } else { path = newFile.getAbsolutePath(); - if (!"".equals(name)) path += File.separator + name; + if (!"".equals(name)) { + path += File.separator + name; + } } file.setText(path); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java 2009-08-20 17:03:54 UTC (rev 2515) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java 2009-08-24 08:24:04 UTC (rev 2516) @@ -1,9 +1,23 @@ +/* *##% + * Copyright (C) 2006 - 2009 Ifremer, Code Lutin + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + package fr.ifremer.isisfish.ui.script.action; -import static javax.swing.JOptionPane.CANCEL_OPTION; -import static javax.swing.JOptionPane.YES_OPTION; -import static javax.swing.JOptionPane.showConfirmDialog; -import static org.apache.commons.logging.LogFactory.getLog; import static org.codelutin.i18n.I18n._; import java.awt.event.ActionEvent; @@ -13,27 +27,54 @@ import java.util.List; import javax.swing.JDialog; +import javax.swing.JOptionPane; import javax.swing.JTextField; import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.codelutin.util.ZipUtil; import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.ui.script.FileSelectionTableModel; import fr.ifremer.isisfish.ui.util.IsisAction; +/** + * Action to export a set of selected file to a zip archive. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + * + * @deprecated C'est pas evident de faire des Actions swing avec jaxx + */ public class ExportAction extends IsisAction { - static private Log log = getLog(ExportAction.class); + /** serialVersionUID. */ + private static final long serialVersionUID = 3373564473968724365L; + /** log. */ + private static Log log = LogFactory.getLog(ExportAction.class); + protected FileSelectionTableModel model; + protected JTextField file; + protected File root; private List<String> selected; + private File dst; - private static final long serialVersionUID = 3373564473968724365L; + /** + * Export action constructor. + * + * @param dialog dialog ??? + * @param file textfield containing dest archive path + * @param root root for all file in includes that is in this directory + * @param model selected file model + */ public ExportAction(JDialog dialog, JTextField file, File root, FileSelectionTableModel model) { super(dialog); @@ -42,32 +83,39 @@ this.model = model; } + @Override protected boolean prepare() { dst = new File(file.getText()); - if ("".equals(dst.getAbsolutePath())) return false; + if ("".equals(dst.getAbsolutePath())) { + return false; + } if (dst.exists()) { - int resp = showConfirmDialog(dialog, + int resp = JOptionPane.showConfirmDialog(dialog, _("isisfish.message.file.already.exists" + dst)); - if (resp == CANCEL_OPTION) { + if (resp == JOptionPane.CANCEL_OPTION) { dialog.dispose(); return false; } - if (resp == YES_OPTION) + if (resp == JOptionPane.YES_OPTION) { dst.getParentFile().mkdirs(); - else return false; + } else { + return false; + } } else if (!dst.getParentFile().exists()) { - int resp = showConfirmDialog(dialog, + int resp = JOptionPane.showConfirmDialog(dialog, _("isisfish.message.directory.not.exists" + dst)); - if (resp == CANCEL_OPTION) { + if (resp == JOptionPane.CANCEL_OPTION) { dialog.dispose(); return false; } - if (resp == YES_OPTION) + if (resp == JOptionPane.YES_OPTION) { dst.getParentFile().mkdirs(); - else return false; + } else { + return false; + } } selected = model.getSelectedFiles(); @@ -75,21 +123,28 @@ return !(selected == null || selected.isEmpty()); } + @Override protected void perform(ActionEvent e) { try { List<File> toZip = new ArrayList<File>(); - for (String path : selected) toZip.add(new File(root, path)); + for (String path : selected) { + toZip.add(new File(root, path)); + } - if (dst.exists()) dst.delete(); + if (dst.exists()) { + dst.delete(); + } dst.createNewFile(); ZipUtil.compressFiles(dst, root, toZip); - log.info("Zip DataStorage in " + dst + "[" + toZip.size() - + " files] (size " + dst.length() + ")"); + if (log.isInfoEnabled()) { + log.info("Zip DataStorage in " + dst + "[" + toZip.size() + + " files] (size " + dst.length() + ")"); + } } catch (IOException e1) { throw new IsisFishRuntimeException(e1); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/ImportAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/ImportAction.java 2009-08-20 17:03:54 UTC (rev 2515) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/action/ImportAction.java 2009-08-24 08:24:04 UTC (rev 2516) @@ -1,7 +1,23 @@ +/* *##% + * Copyright (C) 2006 - 2009 Ifremer, Code Lutin + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + package fr.ifremer.isisfish.ui.script.action; -import static org.apache.commons.logging.LogFactory.getLog; - import java.awt.event.ActionEvent; import java.io.File; import java.io.IOException; @@ -11,69 +27,68 @@ import javax.swing.JDialog; import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.codelutin.util.ZipUtil; import fr.ifremer.isisfish.ui.script.FileSelectionTableModel; import fr.ifremer.isisfish.ui.util.IsisActionWithBackup; +/** + * Action for import zip content into isis script directory. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + * + * @deprecated C'est pas evident de faire des Actions swing avec jaxx + */ public class ImportAction extends IsisActionWithBackup { + /** serialVersionUID. */ private static final long serialVersionUID = 2459027106690418279L; - - private static Log log = getLog(ImportAction.class); - - /** - * model to contains new files to add from import - */ + + /** log. */ + private static Log log = LogFactory.getLog(ImportAction.class); + + /** Model to contains new files to add from import. */ protected FileSelectionTableModel model; - - /** - * model to contains files conflicted from import - */ + + /** Model to contains files conflicted from import. */ protected FileSelectionTableModel modelWithBackup; - - /** - * location of archive to import - */ + + /** Location of archive to import. */ protected File source; - + + /** List of relative path to import (is init in {@link #prepare()} method). */ + private List<String> toImport; + /** - * List of relative path to import (is init in {@link #prepare()} method) + * Import action constructor. + * + * @param dialog dialog ??? + * @param source zip file + * @param root destination directory + * @param modelNewItems added files model (for selection) + * @param modelItems conflict files model (for selection) */ - private List<String> toImport; - public ImportAction(JDialog dialog, File source, File root, - FileSelectionTableModel modelNewItems, - FileSelectionTableModel modelItems) { + FileSelectionTableModel modelNewItems, + FileSelectionTableModel modelItems) { super(dialog, root); this.source = source; this.model = modelNewItems; this.modelWithBackup = modelItems; } - protected void perform(ActionEvent e) { - - // do backup stuff - super.perform(e); - - // unflate files to destination (root) - try { - for (String newFile : toImport) { - log.info("unzip " + newFile); - } - ZipUtil.uncompress(source, root, toImport,null,null); - - } catch (IOException e1) { - throw new RuntimeException(e1); + @Override + protected boolean prepare() { + if (source == null || (model == null && modelWithBackup == null) + || "".equals(source.getAbsolutePath())) { + return false; } - log.info("unzip " + toImport.size() + " entry(ies) from '" + source + "'"); - toImport.clear(); - } - protected boolean prepare() { - if (source == null || (model == null && modelWithBackup == null) || - "".equals(source.getAbsolutePath())) return false; - toImport = new ArrayList<String>(); if (model != null) { // add new files @@ -88,6 +103,32 @@ return !toImport.isEmpty(); } + @Override + protected void perform(ActionEvent e) { + + // do backup stuff + super.perform(e); + + // unflate files to destination (root) + try { + if (log.isInfoEnabled()) { + for (String newFile : toImport) { + log.info("unzip " + newFile); + } + } + ZipUtil.uncompress(source, root, toImport, null, null); + + } catch (IOException e1) { + throw new RuntimeException(e1); + } + if (log.isInfoEnabled()) { + log.info("unzip " + toImport.size() + " entry(ies) from '" + source + + "'"); + } + toImport.clear(); + } + + @Override protected List<String> getFilesToBackup() { List<String> toBackup = new ArrayList<String>(); if (modelWithBackup != null) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/IsisActionWithBackup.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/IsisActionWithBackup.java 2009-08-20 17:03:54 UTC (rev 2515) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/IsisActionWithBackup.java 2009-08-24 08:24:04 UTC (rev 2516) @@ -1,22 +1,61 @@ +/* *##% + * Copyright (C) 2006 - 2009 + * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + package fr.ifremer.isisfish.ui.util; -import fr.ifremer.isisfish.IsisFish; -import fr.ifremer.isisfish.ui.script.action.BackupAction; - -import javax.swing.JDialog; import java.awt.event.ActionEvent; import java.io.File; import java.util.List; +import javax.swing.JDialog; + +import fr.ifremer.isisfish.IsisFish; +import fr.ifremer.isisfish.ui.script.action.BackupAction; + +/** + * This abstract action perform a backup action. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + * + * @deprecated C'est pas evident de faire des Actions swing avec jaxx + */ public abstract class IsisActionWithBackup extends IsisAction { - protected File backupRoot; - protected File root; + + /** serialVersionUID. */ private static final long serialVersionUID = -5498329861390316586L; + /** Root directory of files to be backupped. */ + protected File root; + + /** + * Constructor. + * + * @param dialog dialog ??? + * @param root root directory of files to be backupped + */ protected IsisActionWithBackup(JDialog dialog, File root) { super(dialog); this.root = root; - this.backupRoot = IsisFish.config.getBackupSessionDirectory(); } /** @@ -27,10 +66,16 @@ */ protected abstract List<String> getFilesToBackup(); + /** + * Just perform a {@link BackupAction}. + * + * Need to be overridden and called by {@code super.perform(e)} + */ + @Override protected void perform(ActionEvent e) { - // do backup stuff here - new BackupAction(root, backupRoot, getFilesToBackup()).actionPerformed(e); - + BackupAction backupAction = new BackupAction(root, IsisFish.config + .getBackupSessionDirectory(), getFilesToBackup()); + backupAction.actionPerformed(e); } } Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-08-20 17:03:54 UTC (rev 2515) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-08-24 08:24:04 UTC (rev 2516) @@ -495,19 +495,19 @@ isisfish.input.continuePopulations=Continue to populations isisfish.input.continuePorts=Continue to ports isisfish.input.continueSetOfVessels=Continue to set of vessels -isisfish.input.continueSpecies= +isisfish.input.continueSpecies=Continue to species isisfish.input.continueStrategies=Continue to strategies -isisfish.input.continueTripTypes=Continue to trip type +isisfish.input.continueTripTypes=Continue to trip types isisfish.input.continueVesselTypes=Continue to vessel types isisfish.input.continueZones=Continue to zones isisfish.input.menu.addRegion=Add region isisfish.input.menu.commit=Commit change -isisfish.input.menu.copyRegion=Copy Region -isisfish.input.menu.exportRegion=Export Region -isisfish.input.menu.importRegion=Import Region -isisfish.input.menu.importRegionSimulation=Import Region from simulation -isisfish.input.menu.importRegionV2=Import Region from v2 -isisfish.input.menu.importRenameRegion=Import Region and rename +isisfish.input.menu.copyRegion=Copy region +isisfish.input.menu.exportRegion=Export region +isisfish.input.menu.importRegion=Import region +isisfish.input.menu.importRegionSimulation=Import region from simulation +isisfish.input.menu.importRegionV2=Import region from v2 +isisfish.input.menu.importRenameRegion=Import region and rename isisfish.input.menu.removeLocaly=Remove localy isisfish.input.menu.removeLocalyRemotely=Remove localy and remotely isisfish.input.menu.server=Server Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-08-20 17:03:54 UTC (rev 2515) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-08-24 08:24:04 UTC (rev 2516) @@ -860,9 +860,9 @@ isisfish.script.export.tooltip.checkAll=(D\u00E9-)S\u00E9lectionner tous les scripts \u00E0 exporter isisfish.script.export.tooltip.chooseDir=Choisir le r\u00E9pertoire o\u00F9 exporter les scripts isisfish.script.import=Importer des scripts depuis une archive zip +isisfish.script.import.cancel=Annuler isisfish.script.import.checkAll=Tout (d\u00E9-)s\u00E9lectionner isisfish.script.import.import=Importer -isisfish.script.import.cancel=Annuler isisfish.script.import.labelAdd=Le(s) fichier(s) suivant(s) sera(ont) ajout\u00E9(s), Confirmer l'ajout isisfish.script.import.labelOverwrite=Le(s) fichier(s) suivant(s) existe(nt) d\u00E9j\u00E0, Confirmer pour l'\u00E9crasement isisfish.script.import.tooltip.checkAll=(D\u00E9-)S\u00E9lectionner tous les scripts \u00E0 importer

1 0

r2515 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org Aug. 20, 2009

Aug. 20, 2009

Author: chatellier Date: 2009-08-20 17:03:54 +0000 (Thu, 20 Aug 2009) New Revision: 2515 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Mise ?\195?\160 jour de la localisation des scripts Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-08-19 14:53:56 UTC (rev 2514) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-08-20 17:03:54 UTC (rev 2515) @@ -852,20 +852,21 @@ isisfish.script.copy=Copy isisfish.script.cut=Cut isisfish.script.evaluate=Evaluate -isisfish.script.export=export -isisfish.script.export.cancel=cancel -isisfish.script.export.checkAll=checkAll -isisfish.script.export.chooseDir=chooseDir -isisfish.script.export.ok=ok -isisfish.script.export.tooltip.checkAll= -isisfish.script.export.tooltip.chooseDir= -isisfish.script.import=import -isisfish.script.import.checkAll=(Un)Check all -isisfish.script.import.import=importer -isisfish.script.import.labelAdd=labelAdd -isisfish.script.import.labelOverwrite=labelOverwrite -isisfish.script.import.tooltip.checkAll= -isisfish.script.menu.checkSyntax=CheckSyntax +isisfish.script.export=Export script to archive +isisfish.script.export.cancel=Cancel +isisfish.script.export.checkAll=(Un)Check all scripts +isisfish.script.export.chooseDir=... +isisfish.script.export.export=Export +isisfish.script.export.tooltip.checkAll=(Un)Check all scripts to export +isisfish.script.export.tooltip.chooseDir=Choose directory to export script to +isisfish.script.import=Import scripts from archive +isisfish.script.import.cancel=Cancel +isisfish.script.import.checkAll=(Un)Check all script to import +isisfish.script.import.import=Import +isisfish.script.import.labelAdd=Following files will be added. Confirm adding. +isisfish.script.import.labelOverwrite=Following files already exists. Confirm overridding. +isisfish.script.import.tooltip.checkAll=(Un)Check all scripts +isisfish.script.menu.checkSyntax=Check syntax isisfish.script.menu.code=Code isisfish.script.menu.commit=Commit script to server isisfish.script.menu.copy=Copy Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-08-19 14:53:56 UTC (rev 2514) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-08-20 17:03:54 UTC (rev 2515) @@ -853,15 +853,16 @@ isisfish.script.cut=Couper isisfish.script.evaluate=\u00C9valuer isisfish.script.export=Exporter des scripts dans une archive zip -isisfish.script.export.cancel=annuler +isisfish.script.export.cancel=Annuler isisfish.script.export.checkAll=Tout (d\u00E9-)s\u00E9lectionner isisfish.script.export.chooseDir=... -isisfish.script.export.ok=exporter +isisfish.script.export.export=Exporter isisfish.script.export.tooltip.checkAll=(D\u00E9-)S\u00E9lectionner tous les scripts \u00E0 exporter isisfish.script.export.tooltip.chooseDir=Choisir le r\u00E9pertoire o\u00F9 exporter les scripts isisfish.script.import=Importer des scripts depuis une archive zip isisfish.script.import.checkAll=Tout (d\u00E9-)s\u00E9lectionner -isisfish.script.import.import=importer +isisfish.script.import.import=Importer +isisfish.script.import.cancel=Annuler isisfish.script.import.labelAdd=Le(s) fichier(s) suivant(s) sera(ont) ajout\u00E9(s), Confirmer l'ajout isisfish.script.import.labelOverwrite=Le(s) fichier(s) suivant(s) existe(nt) d\u00E9j\u00E0, Confirmer pour l'\u00E9crasement isisfish.script.import.tooltip.checkAll=(D\u00E9-)S\u00E9lectionner tous les scripts \u00E0 importer

1 0

r2514 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org Aug. 19, 2009

Aug. 19, 2009

Author: chatellier Date: 2009-08-19 14:53:56 +0000 (Wed, 19 Aug 2009) New Revision: 2514 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Log: Il y avait un probleme avec System.nanoTime(), ca donne juste un temps en nanoseconde, mais il n'est pas rattach?\195?\169 a une vrai date. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-08-19 09:24:40 UTC (rev 2513) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-08-19 14:53:56 UTC (rev 2514) @@ -163,8 +163,17 @@ static final public String REPORT_EMAIL = "isis-fish-bugreport at lists.labs.libre-entreprise.org"; protected transient File backupSessionDirectory = null; - protected long startingTime = System.nanoTime(); + /** + * Mémorise une unité de temps en millisecondes. + * + * Auparavant, c'etait {@link System#nanoTime()}, mais cette unité de temps + * n'est pas lié a une date. + * Par exemple, ca permet juste de mesuré avec une precision de 10-9 le temps + * ecoulé, par l'heure qu'il est à cette unité de temps. + */ + protected long startingTime = System.currentTimeMillis(); + public IsisConfig() { for (Option o : Option.values()) { @@ -708,20 +717,29 @@ return result; } + /** + * Retourne le temps de départ de l'application en millisecondes. + * + * @return application start millis time + */ public long getStartingTime() { return startingTime; } + /** + * Retourne le temps écoulé depuis de debut de l'application (en secondes). + * + * @return le temps écoulé en seconde sous forme de chaine + */ public String getElapsedTimeAsString() { - long diff = System.nanoTime() - getStartingTime(); - String result = DurationFormatUtils.formatDuration(diff / 1000000, "s'.'S"); + long diff = System.currentTimeMillis() - getStartingTime(); + String result = DurationFormatUtils.formatDuration(diff, "s'.'S"); return result; } public File getBackupSessionDirectory() { if (backupSessionDirectory == null) { - // le timestamp est en nano (on le veut en ms) - long time = getStartingTime() / 1000; + long time = getStartingTime(); // creation de l'unique répertoire de backup pour la session String path = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(new java.util.Date(time)); backupSessionDirectory = new File(getBackupDirectory(), path);

1 0

r2513 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org Aug. 19, 2009

Aug. 19, 2009

Author: chatellier Date: 2009-08-19 09:24:40 +0000 (Wed, 19 Aug 2009) New Revision: 2513 Modified: isis-fish/trunk/pom.xml Log: Update commons-math, jsch, h2 and javadoc plugin Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-07-24 16:24:17 UTC (rev 2512) +++ isis-fish/trunk/pom.xml 2009-08-19 09:24:40 UTC (rev 2513) @@ -109,9 +109,9 @@ </dependency> <dependency> - <groupId>commons-math</groupId> + <groupId>org.apache.commons</groupId> <artifactId>commons-math</artifactId> - <version>1.2</version> + <version>2.0</version> <scope>compile</scope> </dependency> @@ -205,7 +205,7 @@ <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch</artifactId> - <version>0.1.41</version> + <version>0.1.42</version> <scope>compile</scope> </dependency> @@ -221,7 +221,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.1.116</version> + <version>1.1.117</version> <scope>compile</scope> </dependency> @@ -563,7 +563,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.5</version> + <version>2.6</version> <configuration> <links> <link>http://java.sun.com/javase/6/docs/api/</link>

1 0