March 2017 - Isis-fish-commits - mailman.cloud.codelutin.com

r4405 - in trunk/src: main/java/fr/ifremer/isisfish/logging test/java/fr/ifremer/isisfish/logging
by echatellier＠users.forge.codelutin.com March 17, 2017

March 17, 2017

Author: echatellier Date: 2017-03-17 10:15:03 +0100 (Fri, 17 Mar 2017) New Revision: 4405 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4405 Log: refs #8451: Log de toutes les modifications de la base Added: trunk/src/test/java/fr/ifremer/isisfish/logging/RegionChangeLoggerTest.java Modified: trunk/src/main/java/fr/ifremer/isisfish/logging/RegionChangeLogger.java Modified: trunk/src/main/java/fr/ifremer/isisfish/logging/RegionChangeLogger.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/logging/RegionChangeLogger.java 2017-03-16 13:42:46 UTC (rev 4404) +++ trunk/src/main/java/fr/ifremer/isisfish/logging/RegionChangeLogger.java 2017-03-17 09:15:03 UTC (rev 4405) @@ -64,9 +64,13 @@ /** Context. */ protected TopiaContext context; + /** Output log file. */ + protected File logFile; + public RegionChangeLogger(RegionStorage regionStorage, TopiaContext context) { this.regionStorage = regionStorage; this.context = context; + logFile = new File(regionStorage.getDirectory(), CHANGES_FILE_NAME); } @Override @@ -94,7 +98,11 @@ String oldValueString = oldValue != null ? oldValue.toString() : ""; Object newValue = event.getState()[dirtyProperty]; String newValueString = newValue != null ? newValue.toString() : ""; - addLogLine("UPDATE", clazz, event.getEntity(), fieldName, oldValueString, newValueString); + + // on ne log que s'il y a vraiment un changement + if (!StringUtils.equals(oldValueString, newValueString)) { + addLogLine("UPDATE", clazz, event.getEntity(), fieldName, oldValueString, newValueString); + } } } } @@ -110,12 +118,9 @@ protected void addLogLine(String changeType, Class<? extends TopiaEntity> clazz, Object entity, String field, String oldValue, String newValue) { - // on ne log que s'il y a vraiment un changement - if (!StringUtils.equals(oldValue, newValue)) { - String date = DateFormatUtils.format(new Date(), "yyyy/MM/dd HH:mm:ss"); - String entityDisplayInfo = getEntityDisplayInfo(entity); - addLine(date, changeType, clazz.getSimpleName().replace("Impl", ""), entityDisplayInfo, field, oldValue, newValue); - } + String date = DateFormatUtils.format(new Date(), "yyyy/MM/dd HH:mm:ss"); + String entityDisplayInfo = getEntityDisplayInfo(entity); + addLine(date, changeType, clazz.getSimpleName().replace("Impl", ""), entityDisplayInfo, field, oldValue, newValue); } @@ -127,13 +132,12 @@ * @param data data to add */ protected void addLine(String... data) { - File outFile = new File(regionStorage.getDirectory(), CHANGES_FILE_NAME); - boolean fileExists = outFile.length() > 0; + boolean fileExists = logFile.length() > 0; - try (CSVWriter out = new CSVWriter(new BufferedWriter(new FileWriter(outFile, true)), CSV_SEPARATOR)) { + try (CSVWriter out = new CSVWriter(new BufferedWriter(new FileWriter(logFile, true)), CSV_SEPARATOR)) { // add header if necessary if (!fileExists) { - out.writeNext(new String[] {"date","class","entity","field","oldvalue","newvalue"}); + out.writeNext(new String[] {"date","type","entity","name","field","oldvalue","newvalue"}); } out.writeNext(data); Added: trunk/src/test/java/fr/ifremer/isisfish/logging/RegionChangeLoggerTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/logging/RegionChangeLoggerTest.java (rev 0) +++ trunk/src/test/java/fr/ifremer/isisfish/logging/RegionChangeLoggerTest.java 2017-03-17 09:15:03 UTC (rev 4405) @@ -0,0 +1,88 @@ +package fr.ifremer.isisfish.logging; + +import fr.ifremer.isisfish.AbstractIsisFishTest; +import fr.ifremer.isisfish.IsisFishDAOHelper; +import fr.ifremer.isisfish.datastore.RegionStorage; +import fr.ifremer.isisfish.datastore.StorageException; +import fr.ifremer.isisfish.entities.Cell; +import fr.ifremer.isisfish.entities.CellDAO; +import fr.ifremer.isisfish.entities.CellImpl; +import fr.ifremer.isisfish.entities.FisheryRegion; +import fr.ifremer.isisfish.entities.FisheryRegionDAO; +import org.apache.commons.io.FileUtils; +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.topia.TopiaContext; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.List; + +public class RegionChangeLoggerTest extends AbstractIsisFishTest { + + /** + * Test que les evenements sur les entités existantes sont bien logués. + * + * @throws IOException si le fichier ne peux pas être lu + * @throws StorageException + */ + @Test + public void testLoggingOnExistingEntities() throws IOException, StorageException { + RegionStorage regionStorage = RegionStorage.getRegion("BaseMotosICA"); + TopiaContext storage = regionStorage.getStorage(); + TopiaContext topiaContext = storage.beginTransaction(); + RegionChangeLogger regionChangeLogger = new RegionChangeLogger(regionStorage, topiaContext); + topiaContext.addTopiaEntityListener(regionChangeLogger); + + FisheryRegionDAO fisheryRegionDAO = IsisFishDAOHelper.getFisheryRegionDAO(topiaContext); + FisheryRegion baseMotosICA = fisheryRegionDAO.findByName("BaseMotosICA"); + baseMotosICA.setCellLengthLongitude(0.25f); + baseMotosICA.setCellLengthLatitude(0.25f); + baseMotosICA.update(); + topiaContext.commitTransaction(); + regionStorage.closeStorage(); + + List<String> lines = FileUtils.readLines(regionChangeLogger.logFile, StandardCharsets.UTF_8); + Assert.assertEquals(3, lines.size()); + Assert.assertTrue(lines.get(0).contains("\"date\";\"type\";\"entity\";\"name\";\"field\";\"oldvalue\";\"newvalue\"")); + Assert.assertTrue(lines.get(1).contains("\"cellLengthLongitude\";\"0.5\";\"0.25\"")); + Assert.assertTrue(lines.get(2).contains("\"cellLengthLatitude\";\"0.5\";\"0.25\"")); + } + + /** + * Test que les evenements sur les nouvelles entités sont bien logués (ca ne fonctionnait pas à la première + * implémentation pour les nouvelles entités). + * + * @throws IOException si le fichier ne peux pas être lu + * @throws StorageException + */ + @Test + public void testLoggingOnNewEntities() throws IOException, StorageException { + RegionStorage regionStorage = RegionStorage.getRegion("BaseMotosICA"); + TopiaContext storage = regionStorage.getStorage(); + TopiaContext topiaContext = storage.beginTransaction(); + RegionChangeLogger regionChangeLogger = new RegionChangeLogger(regionStorage, topiaContext); + topiaContext.addTopiaEntityListener(regionChangeLogger); + CellDAO cellDAO = IsisFishDAOHelper.getCellDAO(topiaContext); + + Cell cell = new CellImpl(); + cell.setName("test"); + cellDAO.create(cell); + + Cell cell2 = cellDAO.create("name", "test 2"); + cell2.setName("test 2 (bis)"); + cellDAO.update(cell2); + topiaContext.commitTransaction(); + + cellDAO.delete(cell); + cellDAO.delete(cell2); + topiaContext.commitTransaction(); + regionStorage.closeStorage(); + + List<String> lines = FileUtils.readLines(regionChangeLogger.logFile, StandardCharsets.UTF_8); + Assert.assertEquals(6, lines.size()); + Assert.assertTrue(lines.get(0).contains("\"date\";\"type\";\"entity\";\"name\";\"field\";\"oldvalue\";\"newvalue\"")); + Assert.assertTrue(lines.get(1).contains("\"CREATE\";\"Cell\";\"test\"")); + Assert.assertTrue(lines.get(5).contains("\"DELETE\";\"Cell\";\"test 2 (bis)\"")); + } +} Property changes on: trunk/src/test/java/fr/ifremer/isisfish/logging/RegionChangeLoggerTest.java ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Author Date Id Revision HeadURL \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property

1 0

r4404 - trunk/src/main/java/fr/ifremer/isisfish/map
by echatellier＠users.forge.codelutin.com March 16, 2017

March 16, 2017

Author: echatellier Date: 2017-03-16 14:42:46 +0100 (Thu, 16 Mar 2017) New Revision: 4404 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4404 Log: fixes #8734: Correction d'une erreur de compilation jaxx (ne comprend pas Java) Added: trunk/src/main/java/fr/ifremer/isisfish/map/MapDataListener.java Modified: trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java Modified: trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java 2017-03-16 12:08:04 UTC (rev 4403) +++ trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java 2017-03-16 13:42:46 UTC (rev 4404) @@ -111,8 +111,8 @@ } private void fireEvent() { - List<ProviderChangeListener> listeners = new ArrayList<>(providerChangeListeners); - for (ProviderChangeListener listener : listeners) { + List<MapDataListener> listeners = new ArrayList<>(mapDataListeners); + for (MapDataListener listener : listeners) { listener.regionChanged(); } } Modified: trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2017-03-16 12:08:04 UTC (rev 4403) +++ trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2017-03-16 13:42:46 UTC (rev 4404) @@ -31,7 +31,6 @@ import java.io.File; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.List; import java.util.Properties; @@ -68,7 +67,7 @@ /** * IsisMapBean. */ -public class IsisMapBean extends OverlayMapPanel implements MapDataProvider.ProviderChangeListener { +public class IsisMapBean extends OverlayMapPanel implements MapDataListener { /** serialVersionUID. */ private static final long serialVersionUID = -4162103384132928473L; Added: trunk/src/main/java/fr/ifremer/isisfish/map/MapDataListener.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/map/MapDataListener.java (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/map/MapDataListener.java 2017-03-16 13:42:46 UTC (rev 4404) @@ -0,0 +1,33 @@ +/* + * #%L + * ISIS-Fish + * %% + * Copyright (C) 2017 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received createNewCells copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ifremer.isisfish.map; + +/** + * Listener to listen for change in data related to map. + */ +public interface MapDataListener { + + /** + * Region or cell changed. + */ + void regionChanged(); +} Property changes on: trunk/src/main/java/fr/ifremer/isisfish/map/MapDataListener.java ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Author Date Id Revision HeadURL \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Modified: trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java 2017-03-16 12:08:04 UTC (rev 4403) +++ trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java 2017-03-16 13:42:46 UTC (rev 4404) @@ -24,7 +24,6 @@ import fr.ifremer.isisfish.entities.Cell; -import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -31,7 +30,7 @@ public abstract class MapDataProvider { - protected Set<ProviderChangeListener> providerChangeListeners = new HashSet<>(); + protected Set<MapDataListener> mapDataListeners = new HashSet<>(); public abstract float getMinLongitude(); @@ -51,15 +50,11 @@ public abstract List<Cell> getCell(); - void addProviderChangeListener(ProviderChangeListener listener) { - providerChangeListeners.add(listener); + void addProviderChangeListener(MapDataListener listener) { + mapDataListeners.add(listener); } - void removeProviderChangeListener(ProviderChangeListener listener) { - providerChangeListeners.remove(listener); + void removeProviderChangeListener(MapDataListener listener) { + mapDataListeners.remove(listener); } - - interface ProviderChangeListener { - void regionChanged(); - } } Modified: trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java 2017-03-16 12:08:04 UTC (rev 4403) +++ trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java 2017-03-16 13:42:46 UTC (rev 4404) @@ -48,7 +48,7 @@ * @author <a href="mailto:seb.regnier@free.fr"></a> * @version $Revision$ */ -public class ZoneDelimiterLayer extends Layer implements MapDataProvider.ProviderChangeListener { //ZoneDelimiterLayer +public class ZoneDelimiterLayer extends Layer implements MapDataListener { //ZoneDelimiterLayer /** serialVersionUID. */ private static final long serialVersionUID = 1127201121371123690L;

1 0

r4403 - in trunk/src/main/java/fr/ifremer/isisfish: map simulator/sensitivity ui/input ui/input/port ui/input/spatial util
by echatellier＠users.forge.codelutin.com March 16, 2017

March 16, 2017

Author: echatellier Date: 2017-03-16 13:08:04 +0100 (Thu, 16 Mar 2017) New Revision: 4403 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4403 Log: fixes #9085: Les shapes charg?\195?\169s dans l'onglet de d?\195?\169finition de la p?\195?\170cherie, n'apparaissents pas dans l'onglet zones Modified: trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewHandler.java trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java Modified: trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java 2017-03-16 10:47:47 UTC (rev 4402) +++ trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java 2017-03-16 12:08:04 UTC (rev 4403) @@ -57,8 +57,7 @@ * Last update : $Date$ * By : $Author$ */ -public class CellSelectionLayer extends ZoneDelimiterLayer implements - MapMouseListener { +public class CellSelectionLayer extends ZoneDelimiterLayer implements MapMouseListener { /** serialVersionUID */ private static final long serialVersionUID = 6952137313443302883L; Modified: trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java 2017-03-16 10:47:47 UTC (rev 4402) +++ trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java 2017-03-16 12:08:04 UTC (rev 4403) @@ -7,15 +7,23 @@ import fr.ifremer.isisfish.entities.FisheryRegion; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.event.TopiaTransactionEvent; +import org.nuiton.topia.event.TopiaTransactionListener; +import org.nuiton.topia.persistence.TopiaEntity; +import java.util.ArrayList; import java.util.List; +import java.util.Objects; -public class DatabaseDataProvider extends MapDataProvider { +public class DatabaseDataProvider extends MapDataProvider implements TopiaTransactionListener { + protected IsisMapBean isisMapBean; protected FisheryRegion fisheryRegion; - public DatabaseDataProvider(FisheryRegion fisheryRegion) { + public DatabaseDataProvider(IsisMapBean isisMapBean, FisheryRegion fisheryRegion) { + this.isisMapBean = isisMapBean; this.fisheryRegion = fisheryRegion; + fisheryRegion.getTopiaContext().addTopiaTransactionListener(this); } @Override @@ -76,4 +84,42 @@ protected CellDAO getCellDAO() throws TopiaException { return IsisFishDAOHelper.getCellDAO(getTopiaContext()); } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + DatabaseDataProvider that = (DatabaseDataProvider) o; + return Objects.equals(isisMapBean, that.isisMapBean) && + Objects.equals(fisheryRegion, that.fisheryRegion); + } + + @Override + public int hashCode() { + return Objects.hash(isisMapBean, fisheryRegion); + } + + public void commit(TopiaTransactionEvent event) { + for (TopiaEntity e : event.getEntities()) { + if (event.isModification(e) && Cell.class.isAssignableFrom(e.getClass()) + || FisheryRegion.class.isAssignableFrom(e.getClass())) { + // on rafraichi que si on commit au moins un Cell + fireEvent(); + break; + } + } + } + + private void fireEvent() { + List<ProviderChangeListener> listeners = new ArrayList<>(providerChangeListeners); + for (ProviderChangeListener listener : listeners) { + listener.regionChanged(); + } + } + + + @Override + public void rollback(TopiaTransactionEvent event) { + // nothing to do + } } Modified: trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2017-03-16 10:47:47 UTC (rev 4402) +++ trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2017-03-16 12:08:04 UTC (rev 4403) @@ -31,6 +31,7 @@ import java.io.File; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.List; import java.util.Properties; @@ -67,7 +68,7 @@ /** * IsisMapBean. */ -public class IsisMapBean extends OverlayMapPanel { +public class IsisMapBean extends OverlayMapPanel implements MapDataProvider.ProviderChangeListener { /** serialVersionUID. */ private static final long serialVersionUID = -4162103384132928473L; @@ -155,7 +156,7 @@ */ @Deprecated public void setFisheryRegion(FisheryRegion fisheryRegion) { - setMapDataProvider(new DatabaseDataProvider(fisheryRegion)); + setMapDataProvider(fisheryRegion != null ? new DatabaseDataProvider(this, fisheryRegion) : null); } public void setMapDataProvider(MapDataProvider mapDataProvider) { @@ -168,15 +169,13 @@ this.mapDataProvider = mapDataProvider; if (mapDataProvider == null) { layerHandler.removeAll(); + if (oldDataProvider != null) { + oldDataProvider.removeProviderChangeListener(this); + } } else { if (!mapDataProvider.equals(oldDataProvider)) { - pasMailleLatitude = mapDataProvider.getCellLengthLatitude(); - pasMailleLongitude = mapDataProvider.getCellLengthLongitude(); - minLatitude = mapDataProvider.getMinLatitude(); - minLongitude = mapDataProvider.getMinLongitude(); - maxLatitude = mapDataProvider.getMaxLatitude(); - maxLongitude = mapDataProvider.getMaxLongitude(); - initMap(); + mapDataProvider.addProviderChangeListener(this); + refreshMap(); } } } catch (Exception eee) { @@ -186,6 +185,21 @@ } } + @Override + public void regionChanged() { + refreshMap(); + } + + protected void refreshMap() { + pasMailleLatitude = mapDataProvider.getCellLengthLatitude(); + pasMailleLongitude = mapDataProvider.getCellLengthLongitude(); + minLatitude = mapDataProvider.getMinLatitude(); + minLongitude = mapDataProvider.getMinLongitude(); + maxLatitude = mapDataProvider.getMaxLatitude(); + maxLongitude = mapDataProvider.getMaxLongitude(); + initMap(); + } + /** * Retourne la liste des mailles selectionnées. * Modified: trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java 2017-03-16 10:47:47 UTC (rev 4402) +++ trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java 2017-03-16 12:08:04 UTC (rev 4403) @@ -60,6 +60,6 @@ } interface ProviderChangeListener { - void cellsChanged(Collection<Cell> cells); + void regionChanged(); } } Modified: trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java 2017-03-16 10:47:47 UTC (rev 4402) +++ trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java 2017-03-16 12:08:04 UTC (rev 4403) @@ -81,6 +81,11 @@ generateGraphics(); } + @Override + protected void finalize() { + mapDataProvider.removeProviderChangeListener(this); + } + /** * Set the projection. * @param proj Projection @@ -168,26 +173,9 @@ } @Override - public void cellsChanged(Collection<Cell> cells) { + public void regionChanged() { // on rafraichi que si on commit au moins un Cell refresh(); } - /*public void commit(TopiaTransactionEvent event) { - for (TopiaEntity e : event.getEntities()) { - if (event.isModification(e) && Cell.class.isAssignableFrom(e.getClass())) { - // on rafraichi que si on commit au moins un Cell - refresh(); - break; - } - } - }*/ - - - - /*@Override - public void rollback(TopiaTransactionEvent event) { - // nothing to do - }*/ - } // ZoneDelimiterLayer Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java 2017-03-16 10:47:47 UTC (rev 4402) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java 2017-03-16 12:08:04 UTC (rev 4403) @@ -372,7 +372,6 @@ File importFile = new File(directoryPath, name + extension); - System.out.println("result=" + importFile); String simulResult = ""; try { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2017-03-16 10:47:47 UTC (rev 4402) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2017-03-16 12:08:04 UTC (rev 4403) @@ -99,6 +99,10 @@ public InputSaveVerifier getSaveVerifier() { return getContextValue(InputSaveVerifier.class); } +/** + * @deprecated since 4.4.1. Pas pratique, on ne peux pas ecouter les changements de region ou de proprietes. + */ +@Deprecated public FisheryRegion getFisheryRegion() { return getContextValue(FisheryRegion.class); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortHandler.java 2017-03-16 10:47:47 UTC (rev 4402) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortHandler.java 2017-03-16 12:08:04 UTC (rev 4403) @@ -73,7 +73,7 @@ inputContentUI.setButtonTitle(t("isisfish.input.continueSpecies")); inputContentUI.setNextPath(n("isisfish.input.tree.species")); - + inputContentUI.addPropertyChangeListener(PortUI.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewHandler.java 2017-03-16 10:47:47 UTC (rev 4402) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewHandler.java 2017-03-16 12:08:04 UTC (rev 4403) @@ -133,9 +133,9 @@ List<Zone> zones = oldFisheryRegion.getZone(); List<Port> ports = oldFisheryRegion.getPort(); inputUI.currentZones.setModel(new GenericComboModel<>(zones)); - inputUI.currentZoneMap.setMapDataProvider(new DatabaseDataProvider(oldFisheryRegion)); + inputUI.currentZoneMap.setMapDataProvider(new DatabaseDataProvider(inputUI.currentZoneMap, oldFisheryRegion)); inputUI.currentPorts.setModel(new GenericComboModel<>(ports)); - inputUI.currentPortMap.setMapDataProvider(new DatabaseDataProvider(oldFisheryRegion)); + inputUI.currentPortMap.setMapDataProvider(new DatabaseDataProvider(inputUI.currentPortMap, oldFisheryRegion)); SpatialChangeDataProvider spatialChangeDataProvider = new SpatialChangeDataProvider(newFisheryRegion, cells); inputUI.newZoneMap.setMapDataProvider(spatialChangeDataProvider); Modified: trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2017-03-16 10:47:47 UTC (rev 4402) +++ trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2017-03-16 12:08:04 UTC (rev 4403) @@ -349,7 +349,6 @@ } else { stringTypes = new String[names.length]; Class<?>[] types = interfaceMethod.getParameterTypes(); - System.out.println(Arrays.toString(types)); for (int i = 0; i < types.length; i++) { stringTypes[i] = types[i].getName(); }

1 0

r4402 - in trunk/src/main: java/fr/ifremer/isisfish/map java/fr/ifremer/isisfish/ui/input java/fr/ifremer/isisfish/ui/input/cell java/fr/ifremer/isisfish/ui/input/fisheryregion java/fr/ifremer/isisfish/ui/input/port java/fr/ifremer/isisfish/ui/input/spatial java/fr/ifremer/isisfish/ui/input/zone resources/i18n
by echatellier＠users.forge.codelutin.com March 16, 2017

March 16, 2017

Author: echatellier Date: 2017-03-16 11:47:47 +0100 (Thu, 16 Mar 2017) New Revision: 4402 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4402 Log: fixes #8734: Modification de la finesse de la r?\195?\169solution spatiale Added: trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/AskNewSpatialHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/AskNewSpatialUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/SpatialChangeDataProvider.java Modified: trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneBasicsHandler.java trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java 2017-03-16 10:47:09 UTC (rev 4401) +++ trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java 2017-03-16 10:47:47 UTC (rev 4402) @@ -73,9 +73,9 @@ /** Multi selection enabled. */ public static final int MULT_SELECTION = 2; - public CellSelectionLayer(FisheryRegion fisheryRegion, int selectionMode) + public CellSelectionLayer(MapDataProvider mapDataProvider, int selectionMode) throws TopiaException { - super(fisheryRegion); + super(mapDataProvider); this.selectionMode = selectionMode; } @@ -132,10 +132,8 @@ for (OMGraphic rectg : allRect) { OMRect rect = (OMRect)rectg; // Si le carre est selectionne, on rajoute ses coordonnees au vector results - if (rect.getFillPaint() != null - && !rect.isClear(rect.getFillPaint())) { - result.add(new LatLonPoint.Double(rect.getSouthLat(), rect - .getWestLon())); + if (rect.getFillPaint() != null && !rect.isClear(rect.getFillPaint())) { + result.add(new LatLonPoint.Double(rect.getSouthLat(), rect.getWestLon())); } } return result; @@ -174,8 +172,9 @@ if (select.getFillPaint() == null || select.isClear(select.getFillPaint())) { // Si on est en mode SINGLE_SELECTION, on deselectionne tous les carres avant. - if (getSelectionMode() == SINGLE_SELECTION) + if (getSelectionMode() == SINGLE_SELECTION) { unSelectAll(); + } // on selectionne le carre en lui mettant une couleur de fond select.setFillPaint(Color.green); } @@ -340,7 +339,7 @@ } /** - * Invoked when the mouse tton has been moved on a component + * Invoked when the mouse button 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. Added: trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java 2017-03-16 10:47:47 UTC (rev 4402) @@ -0,0 +1,79 @@ +package fr.ifremer.isisfish.map; + +import fr.ifremer.isisfish.IsisFishDAOHelper; +import fr.ifremer.isisfish.IsisFishRuntimeException; +import fr.ifremer.isisfish.entities.Cell; +import fr.ifremer.isisfish.entities.CellDAO; +import fr.ifremer.isisfish.entities.FisheryRegion; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; + +import java.util.List; + +public class DatabaseDataProvider extends MapDataProvider { + + protected FisheryRegion fisheryRegion; + + public DatabaseDataProvider(FisheryRegion fisheryRegion) { + this.fisheryRegion = fisheryRegion; + } + + @Override + public float getMinLongitude() { + return fisheryRegion.getMinLongitude(); + } + + @Override + public float getMaxLongitude() { + return fisheryRegion.getMaxLongitude(); + } + + @Override + public float getMinLatitude() { + return fisheryRegion.getMinLatitude(); + } + + @Override + public float getMaxLatitude() { + return fisheryRegion.getMaxLatitude(); + } + + @Override + public float getCellLengthLongitude() { + return fisheryRegion.getCellLengthLongitude(); + } + + @Override + public float getCellLengthLatitude() { + return fisheryRegion.getCellLengthLatitude(); + } + + @Override + public List<Cell> getCell() { + return fisheryRegion.getCell(); + } + + @Override + public List<String> getMapFilePath() { + return fisheryRegion.getMapFilePath(); + } + + @Override + public List<Cell> findAllByCoordinates(float latitude, float longitude) { + return getCellDAO().findAllByProperties("latitude", + latitude, "longitude", longitude); + } + + protected TopiaContext getTopiaContext() { + TopiaContext result = fisheryRegion.getTopiaContext(); + if (result == null) { + throw new IsisFishRuntimeException( + "Can't get topiaContext from FisheryRegion"); + } + return result; + } + + protected CellDAO getCellDAO() throws TopiaException { + return IsisFishDAOHelper.getCellDAO(getTopiaContext()); + } +} Property changes on: trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Author Date Id Revision HeadURL \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Modified: trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2017-03-16 10:47:09 UTC (rev 4401) +++ trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2017-03-16 10:47:47 UTC (rev 4402) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2014 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2002 - 2017 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 @@ -38,7 +38,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import com.bbn.openmap.Layer; @@ -62,22 +61,11 @@ import com.bbn.openmap.proj.coords.LatLonPoint; import fr.ifremer.isisfish.IsisFish; -import fr.ifremer.isisfish.IsisFishDAOHelper; -import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.entities.Cell; -import fr.ifremer.isisfish.entities.CellDAO; import fr.ifremer.isisfish.entities.FisheryRegion; /** - * IsisMapBean.java - * - * Created: 16 mai 2005 - * - * @author Benjamin Poussin <poussin(a)codelutin.com> - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * IsisMapBean. */ public class IsisMapBean extends OverlayMapPanel { @@ -87,7 +75,7 @@ /** to use log facility, just put in your code: log.info("..."); */ private static Log log = LogFactory.getLog(IsisMapBean.class); - protected FisheryRegion fisheryRegion = null; + protected MapDataProvider mapDataProvider; protected float pasMailleLatitude; protected float pasMailleLongitude; protected float minLatitude; @@ -163,32 +151,31 @@ } /** - * Get the value of region. - * @return value of region. + * @deprecated since 4.4.1 use now {@link MapDataProvider} */ - public FisheryRegion getFisheryRegion() { - return fisheryRegion; + @Deprecated + public void setFisheryRegion(FisheryRegion fisheryRegion) { + setMapDataProvider(new DatabaseDataProvider(fisheryRegion)); } - public void setFisheryRegion(FisheryRegion fisheryRegion) { + public void setMapDataProvider(MapDataProvider mapDataProvider) { if (log.isDebugEnabled()) { - log.debug("current fishery is now: " + fisheryRegion + " old was: " - + this.fisheryRegion); + log.debug("Current provider is now: " + mapDataProvider + " old was: " + this.mapDataProvider); } try { - FisheryRegion oldFisheryRegion = this.fisheryRegion; - this.fisheryRegion = fisheryRegion; - if (fisheryRegion == null) { + MapDataProvider oldDataProvider = this.mapDataProvider; + this.mapDataProvider = mapDataProvider; + if (mapDataProvider == null) { layerHandler.removeAll(); } else { - if (!fisheryRegion.equals(oldFisheryRegion)) { - pasMailleLatitude = fisheryRegion.getCellLengthLatitude(); - pasMailleLongitude = fisheryRegion.getCellLengthLongitude(); - minLatitude = fisheryRegion.getMinLatitude(); - minLongitude = fisheryRegion.getMinLongitude(); - maxLatitude = fisheryRegion.getMaxLatitude(); - maxLongitude = fisheryRegion.getMaxLongitude(); + if (!mapDataProvider.equals(oldDataProvider)) { + pasMailleLatitude = mapDataProvider.getCellLengthLatitude(); + pasMailleLongitude = mapDataProvider.getCellLengthLongitude(); + minLatitude = mapDataProvider.getMinLatitude(); + minLongitude = mapDataProvider.getMinLongitude(); + maxLatitude = mapDataProvider.getMaxLatitude(); + maxLongitude = mapDataProvider.getMaxLongitude(); initMap(); } } @@ -199,19 +186,6 @@ } } - protected TopiaContext getTopiaContext() { - TopiaContext result = getFisheryRegion().getTopiaContext(); - if (result == null) { - throw new IsisFishRuntimeException( - "Can't get topiaContext from FisheryRegion"); - } - return result; - } - - protected CellDAO getCellDAO() throws TopiaException { - return IsisFishDAOHelper.getCellDAO(getTopiaContext()); - } - /** * Retourne la liste des mailles selectionnées. * @@ -224,8 +198,7 @@ for (LatLonPoint llp : pts) { List<Cell> cells = null; try { - cells = getCellDAO().findAllByProperties("latitude", - llp.getLatitude(), "longitude", llp.getLongitude()); + cells = mapDataProvider.findAllByCoordinates(llp.getLatitude(), llp.getLongitude()); } catch (TopiaException eee) { log.warn("Can't find cell for this point: " + llp, eee); } @@ -587,7 +560,7 @@ } protected void addZoneDelimiterLayer() throws TopiaException { - ZoneDelimiterLayer layer = new ZoneDelimiterLayer(fisheryRegion); + ZoneDelimiterLayer layer = new ZoneDelimiterLayer(mapDataProvider); addMapComponent(layer); } @@ -626,7 +599,7 @@ // ajout des shapes boolean shapeLoaded = false; - for (String filename : getFisheryRegion().getMapFilePath()) { + for (String filename : mapDataProvider.getMapFilePath()) { if (!StringUtils.isEmpty(filename)) { if (log.isDebugEnabled()) { log.debug(t("isisfish.message.load.map", filename)); @@ -640,7 +613,7 @@ if (log.isDebugEnabled()) { log.debug("Can't load custom map, load default one"); } - // a pas reussi a charger les fichiers demandés, on charge la + // createNewCells pas reussi createNewCells charger les fichiers demandés, on charge la // carte du monde String filename = IsisFish.config.getDefaultMapFilename(); addLayer(filename, filename, lineColor, fillColor); @@ -677,7 +650,7 @@ public void addSelectionLayer() { try { - activeSelectionLayer = new CellSelectionLayer(fisheryRegion, getSelectionMode()); + activeSelectionLayer = new CellSelectionLayer(mapDataProvider, getSelectionMode()); addMapMouseListener(activeSelectionLayer); addMapComponent(activeSelectionLayer); } catch (TopiaException eee) { Added: trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java 2017-03-16 10:47:47 UTC (rev 4402) @@ -0,0 +1,65 @@ +package fr.ifremer.isisfish.map; + +/* + * #%L + * ISIS-Fish + * %% + * Copyright (C) 2017 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received createNewCells copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ifremer.isisfish.entities.Cell; + +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +public abstract class MapDataProvider { + + protected Set<ProviderChangeListener> providerChangeListeners = new HashSet<>(); + + public abstract float getMinLongitude(); + + public abstract float getMaxLongitude(); + + public abstract float getMinLatitude(); + + public abstract float getMaxLatitude(); + + public abstract float getCellLengthLongitude(); + + public abstract float getCellLengthLatitude(); + + public abstract List<String> getMapFilePath(); + + public abstract List<Cell> findAllByCoordinates(float latitude, float longitude); + + public abstract List<Cell> getCell(); + + void addProviderChangeListener(ProviderChangeListener listener) { + providerChangeListeners.add(listener); + } + + void removeProviderChangeListener(ProviderChangeListener listener) { + providerChangeListeners.remove(listener); + } + + interface ProviderChangeListener { + void cellsChanged(Collection<Cell> cells); + } +} Property changes on: trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Author Date Id Revision HeadURL \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Modified: trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java 2017-03-16 10:47:09 UTC (rev 4401) +++ trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java 2017-03-16 10:47:47 UTC (rev 4402) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, CodeLutin + * Copyright (C) 2002 - 2017 Ifremer, CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -25,18 +25,6 @@ package fr.ifremer.isisfish.map; -import java.awt.Color; -import java.awt.Graphics; -import java.util.Collection; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.event.TopiaTransactionEvent; -import org.nuiton.topia.event.TopiaTransactionListener; -import org.nuiton.topia.persistence.TopiaEntity; - import com.bbn.openmap.Layer; import com.bbn.openmap.event.ProjectionEvent; import com.bbn.openmap.omGraphics.OMGraphic; @@ -43,10 +31,15 @@ import com.bbn.openmap.omGraphics.OMGraphicList; import com.bbn.openmap.omGraphics.OMRect; import com.bbn.openmap.proj.Projection; - import fr.ifremer.isisfish.entities.Cell; -import fr.ifremer.isisfish.entities.FisheryRegion; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.TopiaException; +import java.awt.Color; +import java.awt.Graphics; +import java.util.Collection; + /** * ZoneDelimiterLayer. * @@ -55,8 +48,7 @@ * @author <a href="mailto:seb.regnier@free.fr"></a> * @version $Revision$ */ -public class ZoneDelimiterLayer extends Layer implements - TopiaTransactionListener { //ZoneDelimiterLayer +public class ZoneDelimiterLayer extends Layer implements MapDataProvider.ProviderChangeListener { //ZoneDelimiterLayer /** serialVersionUID. */ private static final long serialVersionUID = 1127201121371123690L; @@ -73,20 +65,17 @@ protected float pasMailleLatitude; protected float pasMailleLongitude; - protected FisheryRegion fisheryRegion; + protected MapDataProvider mapDataProvider; protected Collection<Cell> cells; - public ZoneDelimiterLayer(FisheryRegion fisheryRegion) - throws TopiaException { - this.fisheryRegion = fisheryRegion; + public ZoneDelimiterLayer(MapDataProvider mapDataProvider) throws TopiaException { + this.mapDataProvider = mapDataProvider; - this.pasMailleLatitude = fisheryRegion.getCellLengthLatitude(); - this.pasMailleLongitude = fisheryRegion.getCellLengthLongitude(); + this.pasMailleLatitude = mapDataProvider.getCellLengthLatitude(); + this.pasMailleLongitude = mapDataProvider.getCellLengthLongitude(); - cells = fisheryRegion.getCell(); - TopiaContext topiaContext = fisheryRegion.getTopiaContext(); - topiaContext.addTopiaTransactionListener(this); - //TopiaEntityListener(Cell.class, this); + cells = mapDataProvider.getCell(); + mapDataProvider.addProviderChangeListener(this); this.setVisible(true); generateGraphics(); @@ -146,10 +135,9 @@ (float) (cell.getLongitude() + pasMailleLongitude), OMGraphic.LINETYPE_STRAIGHT); if (cell.isLand()) { - omrect.setLinePaint(new Color(Color.red.getRed(), Color.red - .getGreen(), Color.red.getBlue(), 0));//completement transparent + omrect.setLinePaint(new Color(Color.RED.getRed(), Color.RED.getGreen(), Color.RED.getBlue(), 0)); //completement transparent } else { - omrect.setLinePaint(Color.red); + omrect.setLinePaint(Color.RED); } omrect.setVisible(true); graphics.add(omrect); @@ -159,7 +147,7 @@ protected void refresh() { try { - cells = fisheryRegion.getCell(); + cells = mapDataProvider.getCell(); generateGraphics(); repaint(); } catch (TopiaException eee) { @@ -180,19 +168,26 @@ } @Override - public void commit(TopiaTransactionEvent event) { + public void cellsChanged(Collection<Cell> cells) { + // on rafraichi que si on commit au moins un Cell + refresh(); + } + + /*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; } } - } + }*/ - @Override + + + /*@Override public void rollback(TopiaTransactionEvent event) { // nothing to do - } + }*/ + } // ZoneDelimiterLayer Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2017-03-16 10:47:09 UTC (rev 4401) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2017-03-16 10:47:47 UTC (rev 4402) @@ -120,11 +120,11 @@ } } -/** +/* * Mettre a jour la region dans une map si necessaire. * * @param map la map a mettre a jour si necessaire - */ + * protected void refreshRegionInMap(fr.ifremer.isisfish.map.IsisMapBean map) { FisheryRegion fisheryRegion = map.getFisheryRegion(); FisheryRegion regionFromContext = getFisheryRegion(); @@ -134,7 +134,7 @@ } map.setFisheryRegion(regionFromContext); } -} +}*/ /** * Method appelée par l'arbre de navigation et le gestionnaire Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2017-03-16 10:47:09 UTC (rev 4401) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2017-03-16 10:47:47 UTC (rev 4402) @@ -44,7 +44,9 @@ import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; +import fr.ifremer.isisfish.entities.FisheryRegionImpl; import fr.ifremer.isisfish.logging.RegionChangeLogger; +import fr.ifremer.isisfish.ui.input.spatial.AskNewSpatialUI; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -115,6 +117,7 @@ public InputHandler(InputUI inputUI) { this.inputUI = inputUI; + //inputUI.setContextValue(this); } /** @@ -131,7 +134,7 @@ * * @param name region name to load */ - protected void loadRegion(String name) { + public void loadRegion(String name) { if (log.isDebugEnabled()) { log.debug("Load region " + name); } @@ -657,8 +660,7 @@ FisheryTreeNode newNode = null; if (newNode != null) { newNode = (FisheryTreeNode)typeNodeLoador.createNode(topiaEntity, null); - } - else { + } else { // FIXME echatellier 20110418 cas non résolu du node "population" // pour lequel on n'a pas le loador newNode = new FisheryTreeNode(nodeClass, topiaEntity.getTopiaId(), null, null); @@ -708,12 +710,10 @@ if (parentNode.getInternalClass().equals(Species.class)) { // cas selection du noeud type "Population" speciesId = parentNode.getId(); - } - else if (parentNode.getParent().getInternalClass().equals(Species.class)) { + } else if (parentNode.getParent().getInternalClass().equals(Species.class)) { // cas où on est deja sur une population speciesId = parentNode.getParent().getId(); - } - else { + } else { throw new IsisFishRuntimeException("Not selected tree node"); } @@ -729,4 +729,30 @@ return result; } + + /** + * Changement de la resolution spatiale. + */ + public void changeSpatialResolution() { + InputSaveVerifier inputSaveVerifier = inputUI.getContextValue(InputSaveVerifier.class); + if (inputSaveVerifier.checkEdit() != JOptionPane.CANCEL_OPTION) { + AskNewSpatialUI askNewSpatialUI = new AskNewSpatialUI(inputUI); + + FisheryRegion fisheryRegion = inputUI.getContextValue(FisheryRegion.class); + FisheryRegion newFisheryRegion = new FisheryRegionImpl(); + newFisheryRegion.setName(fisheryRegion.getName()); + newFisheryRegion.setCellLengthLatitude(fisheryRegion.getCellLengthLatitude()); + newFisheryRegion.setCellLengthLongitude(fisheryRegion.getCellLengthLongitude()); + newFisheryRegion.setMaxLatitude(fisheryRegion.getMaxLatitude()); + newFisheryRegion.setMaxLongitude(fisheryRegion.getMaxLongitude()); + newFisheryRegion.setMinLatitude(fisheryRegion.getMinLatitude()); + newFisheryRegion.setMinLongitude(fisheryRegion.getMinLongitude()); + askNewSpatialUI.setContextValue(newFisheryRegion, "newFisheryRegion"); + askNewSpatialUI.setBean(newFisheryRegion); + + askNewSpatialUI.pack(); + askNewSpatialUI.setLocationRelativeTo(inputUI); + askNewSpatialUI.setVisible(true); + } + } } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2017-03-16 10:47:09 UTC (rev 4401) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2017-03-16 10:47:47 UTC (rev 4402) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2015 Ifremer, Code Lutin + Copyright (C) 2009 - 2017 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 @@ -38,10 +38,11 @@ <JMenu text="isisfish.common.region" id="menuRegion"> <JMenuItem id="menuRegionImport" text="isisfish.input.menu.importRegion" onActionPerformed="handler.importRegion()" /> <JMenuItem id="menuRegionImportRename" text="isisfish.input.menu.importRenameRegion" onActionPerformed="handler.importRegionAndRename()" /> - <JMenuItem text="isisfish.input.menu.importRegionSimulation" onActionPerformed="handler.importRegionFromSimulation()" enabled="false"/> + <JMenuItem id="menuRegionImportSimulation" text="isisfish.input.menu.importRegionSimulation" onActionPerformed="handler.importRegionFromSimulation()" enabled="false"/> <JMenuItem id="menuRegionExport" text="isisfish.input.menu.exportRegion" enabled='{isRegionLoaded()}' onActionPerformed="handler.exportRegion()" /> <JMenuItem id="menuExportJson" text="isisfish.input.menu.exportJson" enabled='{isRegionLoaded()}' onActionPerformed="handler.exportEntityJson()" /> <JMenuItem id="menuImportJson" text="isisfish.input.menu.importJson" enabled='{isRegionLoaded()}' onActionPerformed="handler.importEntityJson()" /> + <JMenuItem id="menuChangeResolution" text="isisfish.input.menu.changeResolution" enabled='{isRegionLoaded()}' onActionPerformed="handler.changeSpatialResolution()" /> <JMenuItem id="menuRegionCopy" text="isisfish.input.menu.copyRegion" enabled='{isRegionLoaded()}' onActionPerformed="handler.copyRegion()" /> <JSeparator/> <JMenuItem text="isisfish.input.menu.removeLocaly" enabled='{isRegionLoaded()}' onActionPerformed="handler.removeRegion(false)" /> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellHandler.java 2017-03-16 10:47:09 UTC (rev 4401) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellHandler.java 2017-03-16 10:47:47 UTC (rev 4402) @@ -34,6 +34,7 @@ import com.bbn.openmap.event.SelectMouseMode; import fr.ifremer.isisfish.entities.Cell; +import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.map.CellSelectionLayer; import fr.ifremer.isisfish.map.OpenMapEvents; import fr.ifremer.isisfish.ui.input.InputContentHandler; @@ -96,6 +97,8 @@ } inputContentUI.fieldCell.setModel(cellModel); init = false; + // hack because fishery region is not binded + inputContentUI.getCellMap().setFisheryRegion(inputContentUI.getContextValue(FisheryRegion.class)); } }); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionHandler.java 2017-03-16 10:47:09 UTC (rev 4401) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionHandler.java 2017-03-16 10:47:47 UTC (rev 4402) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2015 Ifremer, Codelutin + * Copyright (C) 2015 - 2017 Ifremer, Codelutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -67,8 +67,6 @@ } protected void afterInit() { - //cellMap.init(cellMapInfo); - inputContentUI.setButtonTitle(t("isisfish.input.continueCells")); inputContentUI.setNextPath(n("isisfish.input.tree.cells")); @@ -79,13 +77,6 @@ } if (evt.getNewValue() != null) { setFieldMapfilesModel(inputContentUI.getBean()); - /* numberEditor is not working - fieldLatMin.init(); - fieldLatMax.init(); - fieldLongMin.init(); - fieldLongMax.init(); - fieldCellLengthLatitude.init(); - fieldCellLengthLongitude.init();*/ } } }); @@ -233,10 +224,6 @@ } } - /*protected void cellFile() { - getInputAction().loadCellFile(fieldCellFile.getText()); - }*/ - protected void check() { checkFisheryRegion(inputContentUI.getBean()); inputContentUI.setInfoText(t("isisfish.message.check.finished")); @@ -285,20 +272,6 @@ try { TopiaContext isisContext = fisheryRegion.getTopiaContext(); - // frame.setInfoText(t("isisfish.message.checking.cell")); - int latNumber = Math - .round((fisheryRegion.getMaxLatitude() - fisheryRegion - .getMinLatitude()) - / fisheryRegion.getCellLengthLatitude()); - int lonNumber = Math - .round((fisheryRegion.getMaxLongitude() - fisheryRegion - .getMinLongitude()) - / fisheryRegion.getCellLengthLongitude()); - - // frame.setProgressMin(0); - // frame.setProgressMax(latNumber * lonNumber); - int progresscpt = 0; - // il faut peut-etre creer ou supprimer des mailles CellPointcomparator cellPointcomparator = new CellPointcomparator(); CellDAO cellPS = IsisFishDAOHelper.getCellDAO(isisContext); @@ -306,18 +279,15 @@ Collections.sort(cells, cellPointcomparator); Point2D.Float point = new Point2D.Float(); - for (float lati = fisheryRegion.getMinLatitude(); lati < fisheryRegion - .getMaxLatitude(); lati += fisheryRegion - .getCellLengthLatitude()) { + for (float lati = fisheryRegion.getMinLatitude(); lati < fisheryRegion.getMaxLatitude(); + lati += fisheryRegion.getCellLengthLatitude()) { lati = Math.round(lati * 1000f); lati = lati / 1000.0f; - for (float longi = fisheryRegion.getMinLongitude(); longi < fisheryRegion - .getMaxLongitude(); longi += fisheryRegion - .getCellLengthLongitude()) { + for (float longi = fisheryRegion.getMinLongitude(); longi < fisheryRegion.getMaxLongitude(); + longi += fisheryRegion.getCellLengthLongitude()) { longi = Math.round(longi * 1000f) / 1000.0f; point.setLocation(lati, longi); - int position = Collections.binarySearch(cells, point, - cellPointcomparator); + int position = Collections.binarySearch(cells, point, cellPointcomparator); if (position >= 0) { // deja existant on l'enleve de la liste, et on ne cree rien cells.remove(position); @@ -330,7 +300,6 @@ cell.setLand(false); cell.update(); } - // frame.setProgressValue(++progresscpt); } } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortHandler.java 2017-03-16 10:47:09 UTC (rev 4401) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortHandler.java 2017-03-16 10:47:47 UTC (rev 4402) @@ -33,6 +33,7 @@ import com.bbn.openmap.event.SelectMouseMode; import fr.ifremer.isisfish.entities.Cell; +import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.map.CellSelectionLayer; import fr.ifremer.isisfish.map.OpenMapEvents; import fr.ifremer.isisfish.ui.input.InputContentHandler; @@ -83,6 +84,8 @@ } fillCellList(); + // hack because fishery region is not binded + inputContentUI.getPortMap().setFisheryRegion(inputContentUI.getContextValue(FisheryRegion.class)); } }); } Added: trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/AskNewSpatialHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/AskNewSpatialHandler.java (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/AskNewSpatialHandler.java 2017-03-16 10:47:47 UTC (rev 4402) @@ -0,0 +1,217 @@ +/* + * #%L + * ISIS-Fish + * %% + * Copyright (C) 2017 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ifremer.isisfish.ui.input.spatial; + +import fr.ifremer.isisfish.entities.Cell; +import fr.ifremer.isisfish.entities.CellImpl; +import fr.ifremer.isisfish.entities.FisheryRegion; +import fr.ifremer.isisfish.entities.Port; +import fr.ifremer.isisfish.entities.Zone; +import fr.ifremer.isisfish.util.CellPointcomparator; + +import java.awt.geom.Rectangle2D; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Handler for new fishery region resolution dialog. + */ +public class AskNewSpatialHandler { + + protected AskNewSpatialUI ui; + + public AskNewSpatialHandler(AskNewSpatialUI ui) { + this.ui = ui; + } + + public void performSpatialChange() { + FisheryRegion currentFisheryRegion = ui.getContextValue(FisheryRegion.class); + + // compute new cells + FisheryRegion newFisheryRegion = this.ui.getBean(); + List<Cell> newCells = createNewCells(newFisheryRegion, currentFisheryRegion); + + // compute new zones + Map<Zone, List<Cell>> zoneMap = createNewZones(newCells, newFisheryRegion, currentFisheryRegion); + Map<Port, Cell> portMap = createNewPorts(newCells, newFisheryRegion, currentFisheryRegion); + + // display next view + ChangeSpatialPreviewUI changeSpatialPreviewUI = new ChangeSpatialPreviewUI(this.ui); + changeSpatialPreviewUI.getHandler().setOldFisheryRegion(currentFisheryRegion); + changeSpatialPreviewUI.getHandler().setNewFisheryRegion(newFisheryRegion); + changeSpatialPreviewUI.getHandler().setCells(newCells); + changeSpatialPreviewUI.getHandler().setZoneMap(zoneMap); + changeSpatialPreviewUI.getHandler().setPortMap(portMap); + changeSpatialPreviewUI.getHandler().completeSetup(); + changeSpatialPreviewUI.pack(); + changeSpatialPreviewUI.setLocationRelativeTo(this.ui); + changeSpatialPreviewUI.setVisible(true); + + this.ui.dispose(); + } + + /** + * Create new cells for new resolution and use old region {@code isLand()} info. + * + * @param newFisheryRegion new fichery region + * @param currentFisheryRegion old fishery region (for matching) + * @return new cells + */ + protected List<Cell> createNewCells(FisheryRegion newFisheryRegion, FisheryRegion currentFisheryRegion) { + List<Cell> currentCells = currentFisheryRegion.getCell(); + + CellPointcomparator cellPointcomparator = new CellPointcomparator(); + Collections.sort(currentCells, cellPointcomparator); + List<Cell> cells = new ArrayList<>(); + + Rectangle2D.Float intersect = new Rectangle2D.Float(); + + for (float lati = newFisheryRegion.getMinLatitude(); lati < newFisheryRegion.getMaxLatitude(); + lati += newFisheryRegion.getCellLengthLatitude()) { + lati = Math.round(lati * 1000f); + lati = lati / 1000.0f; + for (float longi = newFisheryRegion.getMinLongitude(); longi < newFisheryRegion.getMaxLongitude(); + longi += newFisheryRegion.getCellLengthLongitude()) { + longi = Math.round(longi * 1000f) / 1000.0f; + + // n'existe pas on la cree + Cell cell = new CellImpl(); + cell.setName("La" + lati + "Lo" + longi); + cell.setLatitude(lati); + cell.setLongitude(longi); + cell.setLand(false); + cells.add(cell); + + Rectangle2D.Float cellRect = new Rectangle2D.Float(cell.getLatitude(), cell.getLongitude(), + newFisheryRegion.getCellLengthLatitude(), newFisheryRegion.getCellLengthLongitude()); + for (Cell currentCell : currentCells) { + Rectangle2D.Float curCellRect = new Rectangle2D.Float(currentCell.getLatitude(), + currentCell.getLongitude(), currentFisheryRegion.getCellLengthLatitude(), + currentFisheryRegion.getCellLengthLongitude()); + double overlap = intersectPercentage(cellRect, curCellRect, intersect); + + if (overlap >= 0.5) { + cell.setLand(currentCell.isLand()); + } + } + } + } + return cells; + } + + /** + * Create new zones filled with cells from new region. + * + * @param newCells new cells + * @param newFisheryRegion new region + * @param currentFisheryRegion old region + * @return map between current zone and new cell for this zone + */ + protected Map<Zone, List<Cell>> createNewZones(List<Cell> newCells, FisheryRegion newFisheryRegion, FisheryRegion currentFisheryRegion) { + Map<Zone, List<Cell>> zonesAndNewCells = new HashMap<>(); + List<Zone> zones = currentFisheryRegion.getZone(); + Rectangle2D.Float intersect = new Rectangle2D.Float(); + + for (Zone zone : zones) { + List<Cell> zoneNewCells = new ArrayList<>(); + for (Cell newCell : newCells) { + Rectangle2D.Float newCellRect = new Rectangle2D.Float(newCell.getLatitude(), newCell.getLongitude(), + newFisheryRegion.getCellLengthLatitude(), newFisheryRegion.getCellLengthLongitude()); + for (Cell currentCell : zone.getCell()) { + Rectangle2D.Float currentCellRect = new Rectangle2D.Float(currentCell.getLatitude(), currentCell.getLongitude(), + currentFisheryRegion.getCellLengthLatitude(), currentFisheryRegion.getCellLengthLongitude()); + double overlap = intersectPercentage(newCellRect, currentCellRect, intersect); + if (overlap >= 0.5) { + zoneNewCells.add(newCell); + } + } + } + zonesAndNewCells.put(zone, zoneNewCells); + } + + return zonesAndNewCells; + } + + /** + * Create new port filled with cell from new region. + * + * @param newCells new cells + * @param newFisheryRegion new region + * @param currentFisheryRegion old region + * @return map between current ports and new cell for this zone + */ + protected Map<Port, Cell> createNewPorts(List<Cell> newCells, FisheryRegion newFisheryRegion, FisheryRegion currentFisheryRegion) { + Map<Port, Cell> portsAndNewCells = new HashMap<>(); + List<Port> ports = currentFisheryRegion.getPort(); + Rectangle2D.Float intersect = new Rectangle2D.Float(); + + for (Port port : ports) { + + Cell currentCell = port.getCell(); + if (currentCell != null) { + Cell portNewCell = null; + double bestMatch = Double.MIN_VALUE; + + Rectangle2D.Float currentCellRect = new Rectangle2D.Float(currentCell.getLatitude(), currentCell.getLongitude(), + currentFisheryRegion.getCellLengthLatitude(), currentFisheryRegion.getCellLengthLongitude()); + for (Cell newCell : newCells) { + Rectangle2D.Float newCellRect = new Rectangle2D.Float(newCell.getLatitude(), newCell.getLongitude(), + newFisheryRegion.getCellLengthLatitude(), newFisheryRegion.getCellLengthLongitude()); + double overlap = intersectPercentage(newCellRect, currentCellRect, intersect); + if (overlap >= bestMatch) { + portNewCell = newCell; + bestMatch = overlap; + } + } + + portsAndNewCells.put(port, portNewCell); + } + + } + + return portsAndNewCells; + } + + /** + * Intersection percentage between two rectangle (comparative to the min area of the two rectangle). + * + * @param r1 first rect + * @param r2 second rect + * @param intersect computed intersection + * @return intersection percentage + */ + protected double intersectPercentage(Rectangle2D.Float r1, Rectangle2D.Float r2, Rectangle2D.Float intersect) { + Rectangle2D.intersect(r1, r2, intersect); + double result = 0; + double fr1 = r1.getWidth() * r1.getHeight(); // area of "r1" + double fr2 = r2.getWidth() * r2.getHeight(); // area of "r2" + double fr = Math.min(fr1, fr2); + if (fr > 0 && intersect.getWidth() > 0 && intersect.getHeight() > 0) { + double f = intersect.getWidth() * intersect.getHeight(); // area of "r" - overlap + result = f / fr; // overlap percentage + } + return result; + } +} Property changes on: trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/AskNewSpatialHandler.java ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Author Date Id Revision HeadURL \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Copied: trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/AskNewSpatialUI.jaxx (from rev 4395, trunk/src/main/java/fr/ifremer/isisfish/ui/input/species/SpeciesUI.jaxx) =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/AskNewSpatialUI.jaxx (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/AskNewSpatialUI.jaxx 2017-03-16 10:47:47 UTC (rev 4402) @@ -0,0 +1,103 @@ + +<JFrame layout='{new BorderLayout()}' title="isisfish.input.menu.changeResolution"> + +  + <fr.ifremer.isisfish.entities.FisheryRegion id='bean' javaBean='null' /> + + <AskNewSpatialHandler id="handler" constructorParams="this" /> + + <Table constraints='BorderLayout.CENTER'> + <row> + <cell columns='3'> + <JLabel text="isisfish.fisheryRegion.area"/> + </cell> + </row> + <row> + <cell> + <JLabel text="isisfish.fisheryRegion.latitude.min"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldLatMin" text='{String.valueOf(getBean().getMinLatitude())}' decorator='boxed' + onKeyReleased='getBean().setMinLatitude(Float.parseFloat(fieldLatMin.getText()))'/> + </cell> + </row> + <row> + <cell> + <JLabel text="isisfish.fisheryRegion.latitude.max"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldLatMax" text='{String.valueOf(getBean().getMaxLatitude())}' decorator='boxed' + onKeyReleased='getBean().setMaxLatitude(Float.parseFloat(fieldLatMax.getText()))'/> + </cell> + </row> + <row> + <cell> + <JLabel text="isisfish.fisheryRegion.longitude.min"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldLongMin" text='{String.valueOf(getBean().getMinLongitude())}' decorator='boxed' + onKeyReleased='getBean().setMinLongitude(Float.parseFloat(fieldLongMin.getText()))'/> + </cell> + </row> + <row> + <cell> + <JLabel text="isisfish.fisheryRegion.longitude.max"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldLongMax" text='{String.valueOf(getBean().getMaxLongitude())}' decorator='boxed' + onKeyReleased='getBean().setMaxLongitude(Float.parseFloat(fieldLongMax.getText()))'/> + </cell> + </row> + <row> + <cell columns='3'> + <JLabel text="isisfish.fisheryRegion.spatial"/> + </cell> + </row> + <row> + <cell> + <JLabel text="isisfish.fisheryRegion.latitude"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldCellLengthLatitude" text='{String.valueOf(getBean().getCellLengthLatitude())}' decorator='boxed' + onKeyReleased='getBean().setCellLengthLatitude(Float.parseFloat(fieldCellLengthLatitude.getText()))'/> + </cell> + </row> + <row> + <cell> + <JLabel text="isisfish.fisheryRegion.longitude"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldCellLengthLongitude" text='{String.valueOf(getBean().getCellLengthLongitude())}' decorator='boxed' + onKeyReleased='getBean().setCellLengthLongitude(Float.parseFloat(fieldCellLengthLongitude.getText()))'/> + </cell> + </row> + <row> + <cell anchor='east' columns="2"> + <JButton text="isisfish.changeSpatial.changeSpatial" onActionPerformed="handler.performSpatialChange()"/> + </cell> + </row> + </Table> +</JFrame> Added: trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewHandler.java (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewHandler.java 2017-03-16 10:47:47 UTC (rev 4402) @@ -0,0 +1,234 @@ +/* + * #%L + * ISIS-Fish + * %% + * Copyright (C) 2017 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ifremer.isisfish.ui.input.spatial; + +import static org.nuiton.i18n.I18n.t; + +import com.bbn.openmap.event.SelectMouseMode; +import fr.ifremer.isisfish.IsisFishDAOHelper; +import fr.ifremer.isisfish.entities.Cell; +import fr.ifremer.isisfish.entities.CellDAO; +import fr.ifremer.isisfish.entities.FisheryRegion; +import fr.ifremer.isisfish.entities.Port; +import fr.ifremer.isisfish.entities.Zone; +import fr.ifremer.isisfish.map.CellSelectionLayer; +import fr.ifremer.isisfish.map.DatabaseDataProvider; +import fr.ifremer.isisfish.map.OpenMapEvents; +import fr.ifremer.isisfish.ui.input.InputSaveVerifier; +import fr.ifremer.isisfish.ui.input.InputUI; +import fr.ifremer.isisfish.ui.models.common.GenericComboModel; +import jaxx.runtime.JAXXUtil; + +import javax.swing.JOptionPane; +import java.awt.event.MouseEvent; +import java.util.List; +import java.util.Map; + +/** + * Handler fro preview spatial change UI. + */ +public class ChangeSpatialPreviewHandler { + + protected ChangeSpatialPreviewUI inputUI; + + protected Map<Zone, List<Cell>> zoneMap; + + protected Map<Port, Cell> portMap; + + protected List<Cell> cells; + + protected FisheryRegion oldFisheryRegion; + + protected FisheryRegion newFisheryRegion; + + public ChangeSpatialPreviewHandler(ChangeSpatialPreviewUI inputUI) { + this.inputUI = inputUI; + } + + public void setCells(List<Cell> cells) { + this.cells = cells; + } + + public void setZoneMap(Map<Zone, List<Cell>> zoneMap) { + this.zoneMap = zoneMap; + } + + public void setPortMap(Map<Port, Cell> portMap) { + this.portMap = portMap; + } + + public void setNewFisheryRegion(FisheryRegion newFisheryRegion) { + this.newFisheryRegion = newFisheryRegion; + } + + public void setOldFisheryRegion(FisheryRegion oldFisheryRegion) { + this.oldFisheryRegion = oldFisheryRegion; + } + + public void completeSetup() { + initMapClick(); + initMapProviders(); + } + + /** + * Configure click behaviour on maps. + */ + protected void initMapClick() { + new OpenMapEvents(inputUI.currentZoneMap, new SelectMouseMode(true), CellSelectionLayer.NO_SELECTION) { + @Override + public boolean mouseClicked(MouseEvent e) { + return false; + } + }; + new OpenMapEvents(inputUI.currentPortMap, new SelectMouseMode(true), CellSelectionLayer.NO_SELECTION) { + @Override + public boolean mouseClicked(MouseEvent e) { + return false; + } + }; + new OpenMapEvents(inputUI.newZoneMap, new SelectMouseMode(false), CellSelectionLayer.MULT_SELECTION) { + @Override + public boolean mouseClicked(MouseEvent e) { + Zone selectedValue = (Zone)inputUI.currentZones.getSelectedItem(); + zoneMap.put(selectedValue, inputUI.newZoneMap.getSelectedCells()); + return false; + } + }; + new OpenMapEvents(inputUI.newPortMap, new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) { + @Override + public boolean mouseClicked(MouseEvent e) { + Port selectedValue = (Port)inputUI.currentPorts.getSelectedItem(); + List<Cell> selectedCells = inputUI.newPortMap.getSelectedCells(); + if (!selectedCells.isEmpty()) { + portMap.put(selectedValue, selectedCells.get(0)); + } + return false; + } + }; + } + + /** + * Configure data provider for maps. + */ + protected void initMapProviders() { + List<Zone> zones = oldFisheryRegion.getZone(); + List<Port> ports = oldFisheryRegion.getPort(); + inputUI.currentZones.setModel(new GenericComboModel<>(zones)); + inputUI.currentZoneMap.setMapDataProvider(new DatabaseDataProvider(oldFisheryRegion)); + inputUI.currentPorts.setModel(new GenericComboModel<>(ports)); + inputUI.currentPortMap.setMapDataProvider(new DatabaseDataProvider(oldFisheryRegion)); + + SpatialChangeDataProvider spatialChangeDataProvider = new SpatialChangeDataProvider(newFisheryRegion, cells); + inputUI.newZoneMap.setMapDataProvider(spatialChangeDataProvider); + inputUI.newPortMap.setMapDataProvider(spatialChangeDataProvider); + } + + /** + * Action when a zone is selected in combo. + */ + public void currentZoneChanged() { + Zone selectedValue = (Zone) inputUI.currentZones.getSelectedItem(); + inputUI.currentZoneMap.setSelectedCells(selectedValue.getCell()); + + List<Cell> newCells = zoneMap.get(selectedValue); + inputUI.newZoneMap.setSelectedCells(newCells); + } + + /** + * Action when a port is selected in combo. + */ + public void currentPortChanged() { + Port selectedValue = (Port)inputUI.currentPorts.getSelectedItem(); + inputUI.currentPortMap.setSelectedCells(selectedValue.getCell()); + + Cell newPort = portMap.get(selectedValue); + inputUI.newPortMap.setSelectedCells(newPort); + } + + /** + * Ask fro user to perform database change and commit. + */ + public void valid() { + int response = JOptionPane.showConfirmDialog(inputUI, t("isisfish.changeSpatial.confirmvalidmessage"), + t("isisfish.changeSpatial.confirmvalidtitle"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); + if (response == JOptionPane.YES_OPTION) { + swapPortAndZoneCells(); + oldFisheryRegion.getTopiaContext().commitTransaction(); + + InputSaveVerifier inputSaveVerifier = inputUI.getContextValue(InputSaveVerifier.class); + inputSaveVerifier.cancel(); + + InputUI parentInputUI = inputUI.getContextValue(InputUI.class, JAXXUtil.PARENT); + + parentInputUI.getHandler().loadRegion(oldFisheryRegion.getName()); + close(); + } + } + + /** + * Cancel and close UI. + */ + public void close() { + inputUI.dispose(); + } + + /** + * Perform swap in database between current cell and new cell for zone and region. + */ + protected void swapPortAndZoneCells() { + CellDAO cellDAO = IsisFishDAOHelper.getCellDAO(oldFisheryRegion.getTopiaContext()); + + // update region spatial + oldFisheryRegion.setCellLengthLatitude(newFisheryRegion.getCellLengthLatitude()); + oldFisheryRegion.setCellLengthLongitude(newFisheryRegion.getCellLengthLongitude()); + oldFisheryRegion.setMaxLatitude(newFisheryRegion.getMaxLatitude()); + oldFisheryRegion.setMaxLongitude(newFisheryRegion.getMaxLongitude()); + oldFisheryRegion.setMinLatitude(newFisheryRegion.getMinLatitude()); + oldFisheryRegion.setMinLongitude(newFisheryRegion.getMinLongitude()); + oldFisheryRegion.update(); + + // delete old cells + List<Cell> currentCells = oldFisheryRegion.getCell(); + cellDAO.deleteAll(currentCells); + + // create new cells + for (Cell cell : cells) { + cellDAO.create(cell); + } + + // update current zones + for (Map.Entry<Zone, List<Cell>> zoneListEntry : zoneMap.entrySet()) { + Zone zone = zoneListEntry.getKey(); + List<Cell> newCell = zoneListEntry.getValue(); + + zone.clearCell(); + zone.addAllCell(newCell); + } + + // update current ports + for (Map.Entry<Port, Cell> portCellEntry : portMap.entrySet()) { + Port port = portCellEntry.getKey(); + Cell newCell = portCellEntry.getValue(); + port.setCell(newCell); + } + } +} Property changes on: trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewHandler.java ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Author Date Id Revision HeadURL \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewUI.jaxx (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewUI.jaxx 2017-03-16 10:47:47 UTC (rev 4402) @@ -0,0 +1,89 @@ + +<JFrame layout='{new BorderLayout()}' title="isisfish.changeSpatial.preview"> + + <ChangeSpatialPreviewHandler id="handler" constructorParams="this" /> + + <JLabel constraints='BorderLayout.NORTH' text="isisfish.changeSpatial.description" /> + + <JTabbedPane constraints='BorderLayout.CENTER'> + <tab title='isisfish.common.zones'> + <JPanel layout="{new BorderLayout()}"> + <JPanel constraints='BorderLayout.NORTH' layout="{new BorderLayout()}"> + <JLabel constraints='BorderLayout.WEST' text="isisfish.common.zone" /> + <JComboBox id="currentZones" genericType="fr.ifremer.isisfish.entities.Zone" + onItemStateChanged="handler.currentZoneChanged()" constraints='BorderLayout.CENTER' /> + </JPanel> + <JSplitPane constraints='BorderLayout.CENTER'> + <JPanel layout='{new BorderLayout()}'> + <fr.ifremer.isisfish.map.IsisMapBean id='currentZoneMap' + javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' + selectionMode="{fr.ifremer.isisfish.map.CellSelectionLayer.MULT_SELECTION}" + decorator='boxed' constraints='BorderLayout.CENTER'/> + <JLabel id="currentZoneCells" constraints='BorderLayout.SOUTH' text="" /> + </JPanel> + <JPanel layout='{new BorderLayout()}'> + <fr.ifremer.isisfish.map.IsisMapBean id='newZoneMap' + javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' + selectionMode="{fr.ifremer.isisfish.map.CellSelectionLayer.MULT_SELECTION}" + decorator='boxed' constraints='BorderLayout.CENTER'/> + <JLabel id="newZoneCells" constraints='BorderLayout.SOUTH' text="" /> + </JPanel> + </JSplitPane> + </JPanel> + </tab> + <tab title='isisfish.common.ports'> + <JPanel layout="{new BorderLayout()}"> + <JPanel constraints='BorderLayout.NORTH' layout="{new BorderLayout()}"> + <JLabel constraints='BorderLayout.WEST' text="isisfish.common.port" /> + <JComboBox id="currentPorts" genericType="fr.ifremer.isisfish.entities.Port" + onItemStateChanged="handler.currentPortChanged()" constraints='BorderLayout.CENTER' /> + </JPanel> + <JSplitPane constraints='BorderLayout.CENTER'> + <JPanel layout='{new BorderLayout()}'> + <fr.ifremer.isisfish.map.IsisMapBean id='currentPortMap' + javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' + selectionMode="{fr.ifremer.isisfish.map.CellSelectionLayer.MULT_SELECTION}" + decorator='boxed' constraints='BorderLayout.CENTER'/> + <JLabel id="currentPortCell" constraints='BorderLayout.SOUTH' text="" /> + </JPanel> + <JPanel layout='{new BorderLayout()}'> + <fr.ifremer.isisfish.map.IsisMapBean id='newPortMap' + javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' + selectionMode="{fr.ifremer.isisfish.map.CellSelectionLayer.MULT_SELECTION}" + decorator='boxed' constraints='BorderLayout.CENTER'/> + <JLabel id="newPortCell" constraints='BorderLayout.SOUTH' text="" /> + </JPanel> + </JSplitPane> + </JPanel> + </tab> + </JTabbedPane> + + <JPanel layout='{new java.awt.FlowLayout(java.awt.FlowLayout.TRAILING)}' constraints='BorderLayout.SOUTH'> + <JButton text="isisfish.changeSpatial.valid" onActionPerformed="handler.valid()" /> + <JButton text="isisfish.changeSpatial.cancel" onActionPerformed="handler.close()" /> + </JPanel> + +</JFrame> Added: trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/SpatialChangeDataProvider.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/SpatialChangeDataProvider.java (rev 0) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/SpatialChangeDataProvider.java 2017-03-16 10:47:47 UTC (rev 4402) @@ -0,0 +1,95 @@ +/* + * #%L + * ISIS-Fish + * %% + * Copyright (C) 2017 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ifremer.isisfish.ui.input.spatial; + +import fr.ifremer.isisfish.entities.Cell; +import fr.ifremer.isisfish.entities.FisheryRegion; +import fr.ifremer.isisfish.map.MapDataProvider; + +import java.util.ArrayList; +import java.util.List; + +/** + * Provider used to provide static data from {@code List} of {@code Cell} instead of database. + */ +public class SpatialChangeDataProvider extends MapDataProvider { + + protected FisheryRegion fisheryRegion; + + protected List<Cell> cells; + + public SpatialChangeDataProvider(FisheryRegion fisheryRegion, List<Cell> cells) { + this.fisheryRegion = fisheryRegion; + this.cells = cells; + } + + @Override + public float getMinLongitude() { + return fisheryRegion.getMinLongitude(); + } + + @Override + public float getMaxLongitude() { + return fisheryRegion.getMaxLongitude(); + } + + @Override + public float getMinLatitude() { + return fisheryRegion.getMinLatitude(); + } + + @Override + public float getMaxLatitude() { + return fisheryRegion.getMaxLatitude(); + } + + @Override + public float getCellLengthLongitude() { + return fisheryRegion.getCellLengthLongitude(); + } + + @Override + public float getCellLengthLatitude() { + return fisheryRegion.getCellLengthLatitude(); + } + + @Override + public List<Cell> getCell() { + return cells; + } + + @Override + public List<String> getMapFilePath() { + return fisheryRegion.getMapFilePath(); + } + + @Override + public List<Cell> findAllByCoordinates(float latitude, float longitude) { + List<Cell> filteredCells = new ArrayList<>(); + for (Cell cell : cells) { + if (cell.getLatitude() == latitude && cell.getLongitude() == longitude) { + filteredCells.add(cell); + } + } + return filteredCells; + } +} Property changes on: trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/SpatialChangeDataProvider.java ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Author Date Id Revision HeadURL \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneBasicsHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneBasicsHandler.java 2017-03-16 10:47:09 UTC (rev 4401) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/zone/ZoneBasicsHandler.java 2017-03-16 10:47:47 UTC (rev 4402) @@ -31,6 +31,7 @@ import javax.swing.event.ListSelectionEvent; +import fr.ifremer.isisfish.entities.FisheryRegion; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -58,12 +59,11 @@ new OpenMapEvents(inputContentUI.zoneMap, new SelectMouseMode(false), CellSelectionLayer.MULT_SELECTION) { @Override public boolean mouseClicked(MouseEvent e) { - boolean result = false; if (inputContentUI.getBean() != null) { // impossible de desactiver la carte :( inputContentUI.getBean().setCell(inputContentUI.zoneMap.getSelectedCells()); setZoneCells(); } - return result; + return false; } }; @@ -78,6 +78,8 @@ } setZoneCells(); + // hack because fishery region is not binded + inputContentUI.getZoneMap().setFisheryRegion(inputContentUI.getContextValue(FisheryRegion.class)); } }); } @@ -104,7 +106,7 @@ } } - // sroll to visible + // scroll to visible if (firstIndex != -1) { inputContentUI.zoneCells.ensureIndexIsVisible(firstIndex); } @@ -116,7 +118,7 @@ public void zoneCellsChange(ListSelectionEvent event) { // sans ca, ca boucle (modification depuis la carte) if (event.getValueIsAdjusting()) { - // pas a faie dans le cas d'une AS + // pas a faire dans le cas d'une AS if (inputContentUI.isActive()) { List<Cell> cells = new ArrayList<>(inputContentUI.zoneCells.getSelectedValuesList()); inputContentUI.getBean().setCell(cells); Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2017-03-16 10:47:09 UTC (rev 4401) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2017-03-16 10:47:47 UTC (rev 4402) @@ -102,6 +102,13 @@ isisfish.cell.longitude=Longitude isisfish.cell.name=Name isisfish.change.equation=Can't change equation +isisfish.changeSpatial.cancel=Cancel +isisfish.changeSpatial.changeSpatial=Change resolution +isisfish.changeSpatial.confirmvalidmessage=You are about to replace all region's cells with new cells.\nDo you confirm this action ? +isisfish.changeSpatial.confirmvalidtitle=Validation +isisfish.changeSpatial.description=You can tune the cell presets made for zones and ports before completing the spatial resolution change. +isisfish.changeSpatial.preview=Change resolution (preview) +isisfish.changeSpatial.valid=Valid isisfish.commit.message=Enter commit message isisfish.common.add=Add isisfish.common.apply=Apply @@ -143,6 +150,7 @@ isisfish.common.populationGroup=Population group isisfish.common.populations=Populations isisfish.common.port=Port +isisfish.common.ports=Ports isisfish.common.prev=Previous isisfish.common.region=Region isisfish.common.remove=Remove @@ -162,6 +170,7 @@ isisfish.common.warn=warn isisfish.common.year=year isisfish.common.zone=Zone +isisfish.common.zones=Zones isisfish.config.cache.backend.factory.class.description=Cache backend class to use for simulation isisfish.config.category.communityvcs=Community VCS isisfish.config.category.communityvcs.description=Community VCS repository @@ -477,6 +486,7 @@ isisfish.input.createNewRegion=Create isisfish.input.map.copytoclicboard=Copy to clipboard isisfish.input.menu.addRegion=Add region +isisfish.input.menu.changeResolution=Changer spatial resolution isisfish.input.menu.commit=Commit change isisfish.input.menu.copyRegion=Copy region isisfish.input.menu.exportJson=Export current object in JSON Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2017-03-16 10:47:09 UTC (rev 4401) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2017-03-16 10:47:47 UTC (rev 4402) @@ -1,4 +1,3 @@ -%s\ has\ a\ discrete\ domain,\ this\ is\ not\ acceptable\ for\ this\ method.= %s\ has\ a\ non\ uniform\ distribution,\ this\ is\ not\ acceptable\ for\ this\ method.= Add\ to\ default\ queue= Analyse\ plan\ error,\ too\ many\ simulation\ for\ %s\ \:\ %s= @@ -102,6 +101,13 @@ isisfish.cell.longitude=Longitude isisfish.cell.name=Nom isisfish.change.equation=Ne peut pas changer l'équation +isisfish.changeSpatial.cancel=Annuler +isisfish.changeSpatial.changeSpatial=Changer la résolution +isisfish.changeSpatial.confirmvalidmessage=Vous êtes sur le point de remplacer toutes les mailles de la région par de nouvelle mailles.\nConfirmer vous cette action ? +isisfish.changeSpatial.confirmvalidtitle=Validation +isisfish.changeSpatial.description=Vous pouvez affiner les présélections de mailles effectuées pour les zones et les ports avant de terminer la modification de résolution spatiale. +isisfish.changeSpatial.preview=Changement de résolution (Aperçu) +isisfish.changeSpatial.valid=Valider isisfish.commit.message=Entrer un message de commit isisfish.common.add=Ajouter isisfish.common.apply=Appliquer @@ -143,6 +149,7 @@ isisfish.common.populationGroup=Groupe de population isisfish.common.populations=Populations isisfish.common.port=Port +isisfish.common.ports=Ports isisfish.common.prev=Précédent isisfish.common.region=Région isisfish.common.remove=Supprimer @@ -162,6 +169,7 @@ isisfish.common.warn=Warning isisfish.common.year=année isisfish.common.zone=Zone +isisfish.common.zones=Zones isisfish.config.cache.backend.factory.class.description=Implantation du cache à utiliser pour les simulations isisfish.config.category.communityvcs=VCS Communauté isisfish.config.category.communityvcs.description=Dépôt contenant les scripts de la communautés @@ -477,6 +485,7 @@ isisfish.input.createNewRegion=Créer isisfish.input.map.copytoclicboard=Copier vers de presse-papiers isisfish.input.menu.addRegion=Ajouter une région +isisfish.input.menu.changeResolution=Changer la résolution spatiale isisfish.input.menu.commit=Sauvegarder les changements isisfish.input.menu.copyRegion=Copier région isisfish.input.menu.exportJson=Exporter l'objet courant en JSON

1 0

r4401 - trunk
by echatellier＠users.forge.codelutin.com March 16, 2017

March 16, 2017

Author: echatellier Date: 2017-03-16 11:47:09 +0100 (Thu, 16 Mar 2017) New Revision: 4401 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4401 Log: fixes #7988: Update h2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2017-03-14 11:10:19 UTC (rev 4400) +++ trunk/pom.xml 2017-03-16 10:47:09 UTC (rev 4401) @@ -312,7 +312,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.4.193</version> + <version>1.4.194</version> <scope>compile</scope> </dependency>

1 0

r4400 - trunk
by echatellier＠users.forge.codelutin.com March 14, 2017

March 14, 2017

Author: echatellier Date: 2017-03-14 12:10:19 +0100 (Tue, 14 Mar 2017) New Revision: 4400 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4400 Log: fixes #7988: Update h2 Update libs. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2017-03-09 15:47:27 UTC (rev 4399) +++ trunk/pom.xml 2017-03-14 11:10:19 UTC (rev 4400) @@ -290,7 +290,7 @@ <dependency> <groupId>com.bbn</groupId> <artifactId>openmap</artifactId> - <version>5.1.13-1</version> + <version>5.1.15</version> <scope>compile</scope> </dependency> @@ -312,7 +312,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.176_autocommitpatch</version> + <version>1.4.193</version> <scope>compile</scope> </dependency> @@ -325,21 +325,17 @@ <dependency> <groupId>net.sourceforge</groupId> <artifactId>jdistlib</artifactId> - <version>0.4.1</version> + <version>0.4.5</version> </dependency>  <dependency> - <groupId>ca.umontreal.iro</groupId> + <groupId>ca.umontreal.iro.simul</groupId> <artifactId>ssj</artifactId> - <version>2.5</version> + <version>3.2.0</version> <scope>runtime</scope> <exclusions> <exclusion> - <groupId>dsol</groupId> - <artifactId>dsol-xml</artifactId> - </exclusion> - <exclusion> <artifactId>jfreechart</artifactId> <groupId>jfree</groupId> </exclusion>

1 0

r4399 - in trunk/src/main: java/fr/ifremer/isisfish/entities java/fr/ifremer/isisfish/ui/input resources/i18n
by echatellier＠users.forge.codelutin.com March 9, 2017

March 9, 2017

Author: echatellier Date: 2017-03-09 16:47:27 +0100 (Thu, 09 Mar 2017) New Revision: 4399 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4399 Log: fixes #429: Pouvoir copier/coller une partie de base dans une autre base fixes #8737: Export / Import des ?\195?\169l?\195?\169ments d'une r?\195?\169gion, soit pour import dans une autre r?\195?\169gion, soit pour fusion de deux r?\195?\169gions. Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java trunk/src/main/java/fr/ifremer/isisfish/entities/RegionImportJson.java trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2017-03-08 14:24:23 UTC (rev 4398) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2017-03-09 15:47:27 UTC (rev 4399) @@ -82,7 +82,6 @@ * la collection, mais vider celle qui existe et y mettre les nouveaux elements * sinon hibernate perd la tete et leve des exceptions (detecter lors de l'implantation * de l'import json) - * @param populationGroup */ @Override public void setPopulationGroup(List<PopulationGroup> populationGroup) { @@ -103,6 +102,18 @@ } /** + * Surcharge car avec une aggregation (lien fort) il ne faut pas remplacer + * la collection, mais vider celle qui existe et y mettre les nouveaux elements + * sinon hibernate perd la tete et leve des exceptions (detecter lors de l'implantation + * de l'import json) + */ + @Override + public void setPopulationZone(List<Zone> populationZone) { + clearPopulationZone(); + addAllPopulationZone(populationZone); + } + + /** * Overwrite delete. * @throws TopiaException */ Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/RegionImportJson.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/RegionImportJson.java 2017-03-08 14:24:23 UTC (rev 4398) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/RegionImportJson.java 2017-03-09 15:47:27 UTC (rev 4399) @@ -48,7 +48,7 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JRadioButton; -import java.awt.GridLayout; +import java.awt.FlowLayout; import java.io.IOException; import java.io.Reader; import java.util.ArrayList; @@ -65,6 +65,8 @@ import java.util.Map.Entry; import java.util.Set; +import static org.nuiton.i18n.I18n.t; + /** * Classe permettant d'importer des données dans une region a partir d'un * export Json. @@ -85,21 +87,21 @@ protected RegionMerge merge; protected JsonNode json; - protected LinkedHashMap<String, TopiaEntity> entities; + protected Map<String, TopiaEntity> entities; protected JsonNode jsonEntities; - protected TopiaEntity currentEntity; /** * * @param r reader contains json * @param merge use to choice entity in Json or entity in current region, - * if no merge object is passed in arguement "import all" object in reader + * if no merge object is passed in argument "import all" object in reader */ public RegionImportJson(Reader r, RegionMerge merge) { try { this.merge = merge != null ? merge : new RegionMergeImportAll(); - + entities = new LinkedHashMap<>(); + this.merge.setEntities(entities); ObjectMapper m = new ObjectMapper(); json = m.readTree(r); @@ -152,13 +154,13 @@ protected TopiaEntity parentEntity; protected String propertyName; protected TopiaEntity currentEntity; - protected LinkedHashMap<String, TopiaEntity> entities; + protected Map<String, TopiaEntity> entities; protected JsonNode jsonEntities; public RegionVisitor(RegionMerge merge, TopiaEntity parentEntity, String propertyName, String idEntity, - LinkedHashMap<String, TopiaEntity> entities, JsonNode jsonEntities) { + Map<String, TopiaEntity> entities, JsonNode jsonEntities) { this.merge = merge; this.parentEntity = parentEntity; this.propertyName = propertyName; @@ -331,6 +333,7 @@ } else { c = new ArrayList(); } + for (JsonNode currentValue : jsonValue) { Object v = readValue(propertyName, type, currentValue); if (v != null) { @@ -358,10 +361,12 @@ * Use during import to merge imported data in existing Region */ static public interface RegionMerge { + void setEntities(Map<String, TopiaEntity> entities); + static public enum AutoAnswerType { - ONCE("Reply only for this awnser"), - TYPE("Reply all time same thing for this type"), - ALL("Reply all time same thing for all type"); + ONCE(t("isisfish.import.json.merge.autoanswer.once")), + TYPE(t("isisfish.import.json.merge.autoanswer.type")), + ALL(t("isisfish.import.json.merge.autoanswer.all")); private final String toString; private AutoAnswerType(String toString) { @@ -376,11 +381,11 @@ } static public enum AnswerType { - NONE("None", "don't import nor reuse an object."), - USE("Use", "use (don't import) object already in current Region (make your choice in next combobox)."), - REPLACE("Replace", "replace object in current Region with imported object from file (make your choice in next combobox"), - CREATE("Create", "create new object from file."), - ABORT("Abort", "cancel this import (import nothing)."); + NONE(t("isisfish.import.json.merge.option.none"), t("isisfish.import.json.merge.option.none.desc")), + USE(t("isisfish.import.json.merge.option.use"), t("isisfish.import.json.merge.option.use.desc")), + REPLACE(t("isisfish.import.json.merge.option.replace"), t("isisfish.import.json.merge.option.replace.desc")), + CREATE(t("isisfish.import.json.merge.option.create"), t("isisfish.import.json.merge.option.create.desc")), + ABORT(t("isisfish.import.json.merge.option.abort"), t("isisfish.import.json.merge.option.abort.desc")); private final String toString; private final String description; @@ -565,6 +570,7 @@ protected TopiaContext tx; protected RegionMergeContext context; protected Answer lastAnswer; + protected Map<String, TopiaEntity> entities; public RegionMergeDatabase(TopiaContext tx) { this.tx = tx; @@ -576,6 +582,11 @@ } @Override + public void setEntities(Map<String, TopiaEntity> entities) { + this.entities = entities; + } + + @Override public Answer choice(String id, String toString, Map<String, Object> details, AnswerType ... disallow) { Class type = TopiaId.getClassName(id); if (context == null) { @@ -585,9 +596,21 @@ if (!isAcceptableAnswer(context.initAnswer(type), disallow)) { TopiaDAO<TopiaEntity> dao = IsisFishDAOHelper.getDAO(tx, type); + // order matters here Set<TopiaEntity> possible = new LinkedHashSet<>(); - possible.add(dao.findByTopiaId(id)); + // from context (most match) + for (TopiaEntity entity : entities.values()) { + if (type.isAssignableFrom(entity.getClass())) { + possible.add(entity); + } + } + + // from db with same id + TopiaEntity byTopiaIdFromDatabase = dao.findByTopiaId(id); + if (byTopiaIdFromDatabase != null) { + possible.add(byTopiaIdFromDatabase); + } if (Equation.class.isAssignableFrom(context.getCurrentType())) { if (details.containsKey("name") && details.containsKey("category")) { possible.addAll(dao.findAllByProperties("name", details.get("name"), "category", details.get("category"))); @@ -618,7 +641,7 @@ Map<String, Object> details, Collection<TopiaEntity> possible, AnswerType ... disallow) { - JPanel radioPanel = new JPanel(new GridLayout(1, 0)); + JPanel radioPanel = new JPanel(new FlowLayout()); ButtonGroup group = new ButtonGroup(); for (AutoAnswerType auto : AutoAnswerType.values()) { JRadioButton radio = new JRadioButton(auto.toString); @@ -628,7 +651,7 @@ radioPanel.add(radio); } - JComboBox select = new JComboBox(possible.toArray()); + JComboBox<TopiaEntity> select = new JComboBox<>(possible.toArray(new TopiaEntity[0])); List<AnswerType> allowedOptions = new ArrayList<>(Arrays.asList(AnswerType.values())); for (AnswerType t : disallow) { @@ -636,10 +659,9 @@ } Object[] options = allowedOptions.toArray(); - List descriptions = new ArrayList(); - descriptions.add(String.format("You try to import '%s' (%s)", toString, - ClassUtils.getShortClassName(context.getCurrentType()))); - descriptions.add("Possible answer are:"); + List<Object> descriptions = new ArrayList<>(); + descriptions.add(t("isisfish.import.json.merge.info", toString, ClassUtils.getShortClassName(context.getCurrentType()))); + descriptions.add(t("isisfish.import.json.merge.possibleanswers")); for (AnswerType t : allowedOptions) { descriptions.add(t.toString() + ": " + t.getDescription()); } @@ -651,7 +673,7 @@ int result = JOptionPane.showOptionDialog(null, descriptions.toArray(), - "Make a choice", + t("isisfish.import.json.merge.title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, @@ -679,6 +701,7 @@ static public class RegionMergeImportAll implements RegionMerge { protected Answer lastAnswer; + protected Map<String, TopiaEntity> entities; @Override public boolean isAbort() { @@ -686,6 +709,11 @@ } @Override + public void setEntities(Map<String, TopiaEntity> entities) { + this.entities = entities; + } + + @Override public Answer choice(String id, String toString, Map<String, Object> details, AnswerType ... disallow) { return lastAnswer = new Answer(AnswerType.CREATE, null); } Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2017-03-08 14:24:23 UTC (rev 4398) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2017-03-09 15:47:27 UTC (rev 4399) @@ -166,13 +166,15 @@ // remplace un simple getMinInactivityDays(), pour pouvoir utiliser une // equation si besoin (tout est pret, il ne manque que l'interface // graphique pour saisir l'equation dans strategie - double inactivity = getStrategy().getInactivityDays(getMonth()); - if (tripType != null && tripType.getTripDuration() != null - && inactivity >= 0) { - int nbDayMonth = getMonth().getNumbersOfDays(); - double result = (nbDayMonth - inactivity) - / tripType.getTripDuration().getDay(); - setNumberOfTrips(result); + if (getStrategy() != null) { // json import error + double inactivity = getStrategy().getInactivityDays(getMonth()); + if (tripType != null && tripType.getTripDuration() != null + && inactivity >= 0) { + int nbDayMonth = getMonth().getNumbersOfDays(); + double result = (nbDayMonth - inactivity) + / tripType.getTripDuration().getDay(); + setNumberOfTrips(result); + } } } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2017-03-08 14:24:23 UTC (rev 4398) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2017-03-09 15:47:27 UTC (rev 4399) @@ -93,16 +93,16 @@ /** * Main handler for fishery edition action. * Next, each ui as his own handler. - * + * * In context : * <ul> * <li>FisheryRegion * <li>RegionStorage * </ul> - * + * * @author chatellier * @version $Revision$ - * + * * Last update : $Date$ * By : $Author$ */ @@ -126,9 +126,9 @@ /** * Load region by region name, set it into jaxx context and refresh ui. - * + * * Before loading region, try to close old one. - * + * * @param name region name to load */ protected void loadRegion(String name) { @@ -187,7 +187,7 @@ inputUI.setContextValue(regionChangeLogger); // just to keep reference (totally useless) inputUI.getCardlayoutPrincipal().show(inputUI.getInputPanePrincipal(),"normale"); - + // autoselect root node (fire some event) fisheryTreeHelper.selectNode((FisheryTreeNode)fisheryTreeModel.getRoot()); } @@ -204,7 +204,7 @@ /** * Main ui fishery region selection changed. - * + * * @param e event */ public void regionChange(ItemEvent e) { @@ -235,7 +235,7 @@ public void createNewRegion() { String name = inputUI.getFieldNewRegion().getText(); setStatusMessage(inputUI, t("isisfish.message.creating.region", name), true); - + if (RegionStorage.getRegionNames().contains(name)) { JOptionPane.showMessageDialog(inputUI, t("isisfish.error.region.already.exists")); } else { @@ -253,7 +253,7 @@ /** * Rafraichit la liste des regions. - * + * * @param selectedItem region to select */ protected void refreshRegionList(String selectedItem) { @@ -279,7 +279,7 @@ t("isisfish.message.import.region.zipped")); if (file != null) { RegionStorage.importZip(file); - + refreshRegionList(null); } @@ -286,7 +286,7 @@ } catch (Exception eee) { throw new IsisFishRuntimeException(t("isisfish.error.region.import"), eee); } - + setStatusMessage(inputUI, t("isisfish.message.import.finished")); } @@ -304,13 +304,13 @@ String newName = JOptionPane .showInputDialog(t("isisfish.message.name.imported.region")); RegionStorage.importAndRenameZip(file, newName); - + refreshRegionList(null); } } catch (Exception eee) { throw new IsisFishRuntimeException(t("isisfish.error.region.import"), eee); } - + setStatusMessage(inputUI, t("isisfish.message.import.finished")); } @@ -363,7 +363,7 @@ try { File file = FileUtil.getFile(".*.zip$", t("isisfish.message.import.region.zipped")); - + if (file != null) { // add .zip extension is not set if (!file.getAbsolutePath().endsWith(".zip")) { @@ -384,14 +384,14 @@ throw new IsisFishRuntimeException("Can't export region", eee); } } - + /** * Exporter une entite json gzip */ protected void exportJson(TopiaEntity e) { try { - File file = FileUtil.getFile(".*" + RegionExportJson.FORMAT_EXTENSION + "$", - t("isisfish.message.import.region.zipped")); + File file = FileUtil.getFile(t("isisfish.input.menu.exportJson"), t("isisfish.common.export"), (Component)null, + ".*" + RegionExportJson.FORMAT_EXTENSION + "$", t("isisfish.message.import.json.zipped")); if (file != null) { if (!file.getAbsolutePath().endsWith(RegionExportJson.FORMAT_EXTENSION)) { @@ -437,8 +437,8 @@ try { InputSaveVerifier inputSaveVerifier = inputUI.getContextValue(InputSaveVerifier.class); if (inputSaveVerifier.checkEdit() != JOptionPane.CANCEL_OPTION) { - File file = FileUtil.getFile(".*" + RegionExportJson.FORMAT_EXTENSION + "$", - t("isisfish.message.import.region.zipped")); + File file = FileUtil.getFile(t("isisfish.input.menu.importJson"), t("isisfish.common.import"), (Component)null, + ".*" + RegionExportJson.FORMAT_EXTENSION + "$", t("isisfish.message.import.json.zipped")); if (file != null) { if (!file.getAbsolutePath().endsWith(RegionExportJson.FORMAT_EXTENSION)) { file = new File(file.getAbsolutePath() + RegionExportJson.FORMAT_EXTENSION); @@ -447,12 +447,11 @@ TopiaContext tx = fisheryRegion.getTopiaContext(); RegionImportJson.RegionMergeDatabase merge = new RegionImportJson.RegionMergeDatabase(tx); - try (InputStream in = new BufferedInputStream( - new GZIPInputStream(new FileInputStream(file)))) { + try (InputStream in = new BufferedInputStream(new GZIPInputStream(new FileInputStream(file)))) { RegionImportJson json = new RegionImportJson(new InputStreamReader(in, "UTF-8"), merge); Collection<TopiaEntity> entities = json.getEntities(); - log.info("Entities to importe: " + entities.size()); + log.info("Entities to import: " + entities.size()); for (TopiaEntity e : entities) { tx.add(e); } @@ -495,7 +494,7 @@ throw new IsisFishRuntimeException("Can't delete region", eee); } } - + /** * Copy la region avec un autre nom. */ @@ -514,7 +513,7 @@ throw new IsisFishRuntimeException("Can't copy region", eee); } } - + /** * Commit region. */ @@ -536,14 +535,12 @@ } else { setStatusMessage(inputUI, t("isisfish.message.commit.region.canceled")); } - } catch (VCSException eee) { + } catch (VCSException | IOException eee) { throw new IsisFishRuntimeException("Can't commit region", eee); - } catch (IOException eee) { - throw new IsisFishRuntimeException("Can't commit region", eee); } setStatusMessage(inputUI, t("isisfish.message.export.done")); } - + /** * Explore region and export any enabled sensitivity factor name with value. */ @@ -576,7 +573,7 @@ /** * Changement de selection dans l'arbre de la pecherie. - * + * * @param event */ public void nodeSelectionChanged(TreeSelectionEvent event) { @@ -626,7 +623,7 @@ /** * Delete tree node referenced by parent, and auto select parent node. - * + * * @param topiaId node id to delete */ public void deleteTreeNode(String topiaId) { @@ -640,7 +637,7 @@ /** * Insert new tree node and select it. - * + * * @param nodeClass node type to create * @param topiaEntity node to insert */ @@ -681,7 +678,7 @@ /** * Update tree node for topiaId. - * + * * @param topiaId node id to update */ public void updateTreeNode(String topiaId) { @@ -694,7 +691,7 @@ /** * Dans le cas d'une creation de population, on doit la creer dans * une espèce. On doit rechercher celle qui est sélectionnée dans l'arbre. - * + * * @return selected species */ public Species findSpecies() { @@ -729,7 +726,7 @@ } catch (TopiaException e) { throw new IsisFishRuntimeException("Can't find "); } - + return result; } } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2017-03-08 14:24:23 UTC (rev 4398) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2017-03-09 15:47:27 UTC (rev 4399) @@ -292,6 +292,12 @@ public void cancel() { TopiaContext topiaContext = inputContentUI.getTopiaContext(); TopiaEntityContextable topiaEntity = inputContentUI.getBean(); + + // cas possible si pas appelé par les boutons d'action, mais par les imports par exemple + if (topiaEntity == null) { + return; + } + try { topiaContext.rollbackTransaction(); noModif(); Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2017-03-08 14:24:23 UTC (rev 4398) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2017-03-09 15:47:27 UTC (rev 4399) @@ -119,11 +119,13 @@ isisfish.common.emigration=Emigration isisfish.common.equation=Equation isisfish.common.error=error +isisfish.common.export=Export isisfish.common.file=File isisfish.common.filter=Filter isisfish.common.finish=Finish isisfish.common.gear=Gear isisfish.common.immigration=Immigration +isisfish.common.import=Import isisfish.common.info=info isisfish.common.ko=KO isisfish.common.loadMatrix=Load file @@ -444,6 +446,22 @@ isisfish.gear.standardisationFactor=Standardisation factor isisfish.gear.technicalParameter=Technical parameter isisfish.gear.title=Gear +isisfish.import.json.merge.autoanswer.all=Reply all time same thing for all type +isisfish.import.json.merge.autoanswer.once=Reply only for this answer +isisfish.import.json.merge.autoanswer.type=Reply all time same thing for this type +isisfish.import.json.merge.info=You try to import '%s' (%s) +isisfish.import.json.merge.option.abort=Abort +isisfish.import.json.merge.option.abort.desc=Cancel this import (import nothing). +isisfish.import.json.merge.option.create=Create +isisfish.import.json.merge.option.create.desc=Create new object from file. +isisfish.import.json.merge.option.none=None +isisfish.import.json.merge.option.none.desc=Don't import nor reuse an object. +isisfish.import.json.merge.option.replace=Replace +isisfish.import.json.merge.option.replace.desc=Replace object in current Region with imported object from file (make your choice in next combobox +isisfish.import.json.merge.option.use=Use +isisfish.import.json.merge.option.use.desc=Use (don't import) object already in current Region (make your choice in next combobox). +isisfish.import.json.merge.possibleanswers=Possible answer are \: +isisfish.import.json.merge.title=Select an option isisfish.input.continueCells=Continue to cells isisfish.input.continueGears=Continue to gears isisfish.input.continueMetiers=Continue to metiers @@ -545,6 +563,7 @@ isisfish.message.file.overwrite=File exists, do you want overwrite it ? isisfish.message.import.equation.convert=Manual equation convertion isisfish.message.import.finished=Import finished +isisfish.message.import.json.zipped=Zipped JSON isisfish.message.import.region.zipped=Zipped Region isisfish.message.import.zip=Import zip file isisfish.message.launchui.notlaunch=User interface not started Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2017-03-08 14:24:23 UTC (rev 4398) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2017-03-09 15:47:27 UTC (rev 4399) @@ -119,11 +119,13 @@ isisfish.common.emigration=émigration isisfish.common.equation=Equation isisfish.common.error=Erreur +isisfish.common.export=Exporter isisfish.common.file=Fichier isisfish.common.filter=Filtrer isisfish.common.finish=Terminer isisfish.common.gear=Engin isisfish.common.immigration=immigration +isisfish.common.import=Importer isisfish.common.info=Info isisfish.common.ko=KO isisfish.common.loadMatrix=Charger un fichier @@ -444,6 +446,22 @@ isisfish.gear.standardisationFactor=Facteur de standardisation isisfish.gear.technicalParameter=Paramètre technique isisfish.gear.title=Engin +isisfish.import.json.merge.autoanswer.all=Faire la même chose pour tous les objets +isisfish.import.json.merge.autoanswer.once=Seulement pour l'objet courant +isisfish.import.json.merge.autoanswer.type=Faire la même chose pour tous les objets de ce type +isisfish.import.json.merge.info=Vous êtes un train d'importer '%s' (%s) +isisfish.import.json.merge.option.abort=Annuler +isisfish.import.json.merge.option.abort.desc=Annuler cet import (n'importe rien) +isisfish.import.json.merge.option.create=Créer +isisfish.import.json.merge.option.create.desc=Créer un nouvel objet depuis le fichier +isisfish.import.json.merge.option.none=Aucun +isisfish.import.json.merge.option.none.desc=Ne pas importer ou réutliser un objet +isisfish.import.json.merge.option.replace=Remplacer +isisfish.import.json.merge.option.replace.desc=Remplacer l'object dans la region courante par celui du fichier d'import (sélectionner l'object dans la liste) +isisfish.import.json.merge.option.use=Utiliser +isisfish.import.json.merge.option.use.desc=Utiliser (ne pas importer) un objet déjà présent dans la région courante (sélectionner l'object dans la liste) +isisfish.import.json.merge.possibleanswers=Les options possibles sont \: +isisfish.import.json.merge.title=Sélectionner une option isisfish.input.continueCells=Continuer vers les mailles isisfish.input.continueGears=Continuer vers les engins isisfish.input.continueMetiers=Continuer vers les metiers @@ -461,7 +479,7 @@ isisfish.input.menu.addRegion=Ajouter une région isisfish.input.menu.commit=Sauvegarder les changements isisfish.input.menu.copyRegion=Copier région -isisfish.input.menu.exportJson=Exporter l'object courant en JSON +isisfish.input.menu.exportJson=Exporter l'objet courant en JSON isisfish.input.menu.exportRegion=Exporter la région isisfish.input.menu.importJson=Importer des objets JSON isisfish.input.menu.importRegion=Importer une région @@ -545,8 +563,9 @@ isisfish.message.file.overwrite=Le fichier existe, voulez-vous l'écraser ? isisfish.message.import.equation.convert=Conversion manuelle de l'équation isisfish.message.import.finished=Import terminé -isisfish.message.import.region.zipped=Zipped Region -isisfish.message.import.zip=Import zip file +isisfish.message.import.json.zipped=JSON Compressé +isisfish.message.import.region.zipped=Region compressée +isisfish.message.import.zip=Import d'un fichier compressé isisfish.message.launchui.notlaunch=Interface utilisateur non lancée isisfish.message.load.finished=Chargement terminé isisfish.message.load.map=Chargement de la carte \: %1$s

1 0

r4398 - trunk
by echatellier＠users.forge.codelutin.com March 8, 2017

March 8, 2017

Author: echatellier Date: 2017-03-08 15:24:23 +0100 (Wed, 08 Mar 2017) New Revision: 4398 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4398 Log: Fix outdated sonar Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2017-03-08 14:17:18 UTC (rev 4397) +++ trunk/pom.xml 2017-03-08 14:24:23 UTC (rev 4398) @@ -586,6 +586,7 @@ <jrstPluginVersion>2.3-SNAPSHOT</jrstPluginVersion> <maven.javadoc.skip>false</maven.javadoc.skip> <animalSnifferPluginVersion>1.15</animalSnifferPluginVersion> + <sonarPluginVersion>3.2</sonarPluginVersion> </properties> <distributionManagement>

1 0

March 8, 2017

Author: echatellier Date: 2017-03-08 15:17:18 +0100 (Wed, 08 Mar 2017) New Revision: 4397 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4397 Log: Code cleanup (java 7) Useless comment removal. Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java trunk/src/main/java/fr/ifremer/isisfish/IsisTray.java trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectJWeavingAdaptor.java trunk/src/main/java/fr/ifremer/isisfish/cron/CronService.java trunk/src/main/java/fr/ifremer/isisfish/cron/RemoveOldFileTask.java trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/ObjectiveStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/OptimizationStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultInfoStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageCSV.java trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV0V32.java trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV32V33.java trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV40V41.java trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV41V421.java trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV421V43.java trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java trunk/src/main/java/fr/ifremer/isisfish/entities/CellImpl.java trunk/src/main/java/fr/ifremer/isisfish/entities/EffortDescriptionImpl.java trunk/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java trunk/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java trunk/src/main/java/fr/ifremer/isisfish/entities/GearImpl.java trunk/src/main/java/fr/ifremer/isisfish/entities/MetierImpl.java trunk/src/main/java/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.java trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java trunk/src/main/java/fr/ifremer/isisfish/entities/PortImpl.java trunk/src/main/java/fr/ifremer/isisfish/entities/RegionImportJson.java trunk/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java trunk/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java trunk/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java trunk/src/main/java/fr/ifremer/isisfish/entities/TargetSpeciesImpl.java trunk/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java trunk/src/main/java/fr/ifremer/isisfish/entities/VariableImpl.java trunk/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java trunk/src/main/java/fr/ifremer/isisfish/entities/ZoneImpl.java trunk/src/main/java/fr/ifremer/isisfish/logging/LogLevelUtil.java trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleModel.java trunk/src/main/java/fr/ifremer/isisfish/logging/io/LineReader.java trunk/src/main/java/fr/ifremer/isisfish/logging/io/LineReaderUtil.java trunk/src/main/java/fr/ifremer/isisfish/logging/io/MemoryOffsetReader.java trunk/src/main/java/fr/ifremer/isisfish/logging/io/OffsetReader.java trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java trunk/src/main/java/fr/ifremer/isisfish/map/DataMapInfo.java trunk/src/main/java/fr/ifremer/isisfish/map/DataMapList.java trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java trunk/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionEntityVisitor.java trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorGroupXMLVisitor.java trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java trunk/src/main/java/fr/ifremer/isisfish/rule/AbstractRule.java trunk/src/main/java/fr/ifremer/isisfish/simulator/Historic.java trunk/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java trunk/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContextInternal.java trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java trunk/src/main/java/fr/ifremer/isisfish/simulator/RuleMonitor.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterPropertiesHelper.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanContextInternal.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScriptListener.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultXML.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationVariable.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationPlanPrepareJob.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationQueue.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorHelper.java trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityScenarios.java trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java trunk/src/main/java/fr/ifremer/isisfish/types/Month.java trunk/src/main/java/fr/ifremer/isisfish/types/RangeOfValues.java trunk/src/main/java/fr/ifremer/isisfish/types/TimeStep.java trunk/src/main/java/fr/ifremer/isisfish/types/TimeUnit.java trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java trunk/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/EquationEditorPaneHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/FormuleComboRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearPopulationSelectivityModel.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/RangeOfValuesHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/SelectivityHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoComboRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesTableModel.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoZoneHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonInfoComboRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionListRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionParametersHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/MetierListRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryDataProvider.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PopulationsNodeLoador.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeListRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/VariableListRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/common/GenericComboModel.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/common/GenericListModel.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableCellEditor.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableCellRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableModel.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/misc/MonthComboModel.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ExportObservationTableModel.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ExportTableCellEditor.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ExportTableCellRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ObjectiveComboRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ObservationComboRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultInfoNameListRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListCellRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellEditor.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisListRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/result/LegendPanel.java trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultMatrixFilter.java trunk/src/main/java/fr/ifremer/isisfish/ui/result/SumByYearMatrixFilter.java trunk/src/main/java/fr/ifremer/isisfish/ui/script/FileSelectionTableModel.java trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java trunk/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTranferable.java trunk/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTransferHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTree.java trunk/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeCellRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeModel.java trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorCardinalityTableModel.java trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListModel.java trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTranferable.java trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTransferHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTree.java trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeModel.java trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousDistributionPanel.java trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/FactorWizardHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/PlanHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulatorContext.java trunk/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java trunk/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalLabel.java trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/StepComponent.java trunk/src/main/java/fr/ifremer/isisfish/ui/widget/text/LogTokenMarker.java trunk/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditorUI.java trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java trunk/src/main/java/fr/ifremer/isisfish/util/DependencyUtil.java trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java trunk/src/main/java/fr/ifremer/isisfish/util/IsisCache.java trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java trunk/src/main/java/fr/ifremer/isisfish/util/MatrixCSVHelper.java trunk/src/main/java/fr/ifremer/isisfish/util/MatrixConverter.java trunk/src/main/java/fr/ifremer/isisfish/util/MonthConverter.java trunk/src/main/java/fr/ifremer/isisfish/util/RangeOfValuesConverter.java trunk/src/main/java/fr/ifremer/isisfish/util/StringConverter.java trunk/src/main/java/fr/ifremer/isisfish/util/TimeStepConverter.java trunk/src/main/java/fr/ifremer/isisfish/util/TimeUnitConverter.java trunk/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java trunk/src/main/java/fr/ifremer/isisfish/vcs/AbstractVCS.java trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSNone.java trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java trunk/src/main/resources/i18n/isis-fish_en_GB.properties trunk/src/main/resources/i18n/isis-fish_fr_FR.properties trunk/src/test/java/fr/ifremer/isisfish/datastore/ExportStepStorageTest.java trunk/src/test/java/fr/ifremer/isisfish/datastore/ExportStorageTest.java trunk/src/test/java/fr/ifremer/isisfish/datastore/migration/AutoDatabaseMigrationClass.java trunk/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java trunk/src/test/java/fr/ifremer/isisfish/logging/LoggerHelper.java trunk/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java trunk/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java trunk/src/test/java/fr/ifremer/isisfish/rule/RuleMock.java trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitorTest.java trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java trunk/src/test/java/fr/ifremer/isisfish/types/MonthTest.java trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java trunk/src/test/java/fr/ifremer/isisfish/util/EvaluatorHelperTest.java trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/pom.xml 2017-03-08 14:17:18 UTC (rev 4397) @@ -797,6 +797,34 @@ </execution> </executions> </plugin> + + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>0.7.9</version> + <executions> + <execution> + <id>default-prepare-agent</id> + <goals> + <goal>prepare-agent</goal> + </goals> + </execution> + <execution> + <id>default-report</id> + <phase>prepare-package</phase> + <goals> + <goal>report</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.19.1</version> + <configuration> + <argLine>${argLine}</argLine> + </configuration> + </plugin> </plugins> </build> Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -803,7 +803,7 @@ List<String> result = null; String exportNamesList = getDefaultExportNames(); if (exportNamesList != null) { - result = new ArrayList<String>(); + result = new ArrayList<>(); String[] exportNames = StringUtil.split(exportNamesList, ","); result.addAll(Arrays.asList(exportNames)); } @@ -843,7 +843,7 @@ List<String> result = null; String resultNamesList = getDefaultResultNames(); if (resultNamesList != null) { - result = new ArrayList<String>(); + result = new ArrayList<>(); String[] resultNames = StringUtil.split(resultNamesList, ","); result.addAll(Arrays.asList(resultNames)); } @@ -874,7 +874,7 @@ * @return */ public Map<String, String> getDefaultSimulationConfig() { - Map<String, String> result = new HashMap<String, String>(); + Map<String, String> result = new HashMap<>(); result.put(Option.SIMULATION_MATRIX_VECTOR_CLASS.key, getOption(Option.SIMULATION_MATRIX_VECTOR_CLASS.key)); @@ -904,7 +904,7 @@ * @see Option#DEFAULT_TAG_VALUE */ public Map<String, String> getDefaultTagValueAsMap() { - Map<String, String> result = new HashMap<String, String>(); + Map<String, String> result = new HashMap<>(); String tagValuesList = getDefaultTagValue(); if (tagValuesList != null) { String[] tagValues = StringUtil.split(tagValuesList, ","); @@ -1231,73 +1231,46 @@ this.defaultValue = defaultValue; } - /* - * @see org.nuiton.util.ApplicationConfig.OptionDef#getDefaultValue() - */ @Override public String getDefaultValue() { return defaultValue; } - /* - * @see org.nuiton.util.ApplicationConfig.OptionDef#getDescription() - */ @Override public String getDescription() { return t(description); } - /* - * @see org.nuiton.util.ApplicationConfig.OptionDef#getKey() - */ @Override public String getKey() { return key; } - /* - * @see org.nuiton.util.ApplicationConfig.OptionDef#getType() - */ @Override public Class<?> getType() { return String.class; } - /* - * @see org.nuiton.util.ApplicationConfig.OptionDef#isFinal() - */ @Override public boolean isFinal() { return false; } - /* - * @see org.nuiton.util.ApplicationConfig.OptionDef#isTransient() - */ @Override public boolean isTransient() { return false; } - /* - * @see org.nuiton.util.ApplicationConfig.OptionDef#setDefaultValue(java.lang.String) - */ @Override public void setDefaultValue(String defaultValue) { this.defaultValue = defaultValue; } - /* - * @see org.nuiton.util.ApplicationConfig.OptionDef#setTransient(boolean) - */ @Override public void setTransient(boolean isTransient) { } - /* - * @see org.nuiton.util.ApplicationConfig.OptionDef#setFinal(boolean) - */ @Override public void setFinal(boolean isFinal) { Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisTray.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisTray.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisTray.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -123,10 +123,6 @@ return instance; } - - /* - * @see fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener#simulationStart(fr.ifremer.isisfish.simulator.launcher.SimulationService, fr.ifremer.isisfish.simulator.launcher.SimulationJob) - */ @Override public void simulationStart(SimulationService simService, SimulationJob job) { SimulationControl control = job.getItem().getControl(); @@ -137,9 +133,6 @@ getInstance().setImage(TRAY_IMAGE_START); } - /* - * @see fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener#simulationStop(fr.ifremer.isisfish.simulator.launcher.SimulationService, fr.ifremer.isisfish.simulator.launcher.SimulationJob) - */ @Override public void simulationStop(SimulationService simService, SimulationJob job) { SimulationControl control = job.getItem().getControl(); @@ -148,17 +141,11 @@ getInstance().setImage(TRAY_IMAGE_STOP); } - /* - * @see fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener#clearJobDone(fr.ifremer.isisfish.simulator.launcher.SimulationService) - */ @Override public void clearJobDone(SimulationService simService) { // nothing to do } - /* - * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent) - */ @Override public void propertyChange(PropertyChangeEvent evt) { SimulationControl control = (SimulationControl) evt.getSource(); @@ -175,16 +162,10 @@ */ static class DummySystemTray extends IsisTray { - /* - * @see fr.ifremer.isisfish.IsisTray#setImage(javax.swing.ImageIcon) - */ @Override public void setImage(ImageIcon image) { } - /* - * @see fr.ifremer.isisfish.IsisTray#setToolTip(java.lang.String) - */ @Override public void setToolTip(String text) { } Modified: trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -144,7 +144,7 @@ @Step(IsisConfig.STEP_AFTER_INIT_VCS) public void listFormula(String filter) throws Exception { - List<String> names = new ArrayList<String>(); + List<String> names = new ArrayList<>(); for (String name : FormuleStorage.getCategories()) { names.addAll(FormuleStorage.getFormuleNames(name)); } Modified: trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -79,11 +79,8 @@ public static void simulateWithRegion(String simulId, File parameterFile, File region) throws Exception { Properties props = new Properties(); - FileInputStream inStream = new FileInputStream(parameterFile); - try { + try (FileInputStream inStream = new FileInputStream(parameterFile)) { props.load(inStream); - } finally { - inStream.close(); } SimulationParameter params = new SimulationParameterImpl(); Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectJWeavingAdaptor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectJWeavingAdaptor.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/AspectJWeavingAdaptor.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -88,7 +88,6 @@ * Initialize the WeavingAdapter * @param loader ClassLoader used by this adapter; which can be null * @param classPath classpath of this adapter - * @param aspectPath list of aspect paths */ private void init(ClassLoader loader, List<String> classPath) { try { @@ -133,7 +132,7 @@ } public byte[] deploy(Class<?> aspectClass) { - byte[] result = null; + byte[] result; InputStream is = null; try { String name = aspectClass.getName(); @@ -177,7 +176,7 @@ private class WeavingClassFileProvider2 implements IClassFileProvider { private final UnwovenClassFile unwovenClass; - private final List<UnwovenClassFile> unwovenClasses = new ArrayList<UnwovenClassFile>(); + private final List<UnwovenClassFile> unwovenClasses = new ArrayList<>(); private IUnwovenClassFile wovenClass; private boolean isApplyAtAspectJMungersOnly = false; Modified: trunk/src/main/java/fr/ifremer/isisfish/cron/CronService.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/cron/CronService.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/cron/CronService.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -53,7 +53,7 @@ * Init cron service with default available services. */ public CronService() { - services = new LinkedList<Runnable>(); + services = new LinkedList<>(); registerDefaultServices(); } Modified: trunk/src/main/java/fr/ifremer/isisfish/cron/RemoveOldFileTask.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/cron/RemoveOldFileTask.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/cron/RemoveOldFileTask.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -52,9 +52,6 @@ /** Class logger. */ private static Log log = LogFactory.getLog(RemoveOldFileTask.class); - /* - * @see java.lang.Runnable#run() - */ @Override public void run() { if (log.isDebugEnabled()) { Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -143,17 +143,11 @@ this.name = name.endsWith(suffix) ? name : name + suffix; } - /* - * @see fr.ifremer.isisfish.datastore.VersionStorage#prepare() - */ @Override protected void prepare() { // Il n'y a rien a faire pour les code sources } - /* - * @see fr.ifremer.isisfish.datastore.VersionStorage#getFiles(boolean) - */ @Override protected List<File> getFiles(boolean withParent) { Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -130,9 +130,6 @@ } } - /* - * @see fr.ifremer.isisfish.datastore.VersionStorage#isVersionnableFile(java.io.File) - */ @Override protected boolean isVersionnableFile(File file) { boolean result = super.isVersionnableFile(file); @@ -231,9 +228,6 @@ } } - /* - * @see fr.ifremer.isisfish.datastore.VersionStorage#delete(boolean) - */ @Override public void delete(boolean cvsDelete) throws StorageException { try { @@ -361,9 +355,6 @@ return file; } - /* - * @see java.lang.Object#finalize() - */ @Override protected void finalize() throws Throwable { try { Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -63,7 +63,7 @@ public static final String EXPORT_TEMPLATE = "templates/script/export.ftl"; /** Instance cache. */ - private static Map<String, ExportStorage> exportCache = new ReferenceMap<String, ExportStorage>(); + private static Map<String, ExportStorage> exportCache = new ReferenceMap<>(); /** * Constructeur. Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -128,7 +128,7 @@ * @return la liste de formule de la category */ static public List<FormuleStorage> getFormules(String category) { - List<FormuleStorage> result = new ArrayList<FormuleStorage>(); + List<FormuleStorage> result = new ArrayList<>(); try { File dir = new File(getFormuleDirectory(), category); dir.mkdirs(); @@ -153,7 +153,7 @@ * @return la liste des noms formules existantes dans une categorie */ static public List<String> getFormuleNames(String category) { - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); try { File dir = new File(getFormuleDirectory(), category); dir.mkdirs(); @@ -179,8 +179,8 @@ * @return la liste des noms des categories existantes */ static public List<String> getCategories(TopiaContext context) { - List<String> result = new ArrayList<String>(); - Set<String> all = new TreeSet<String>(); + List<String> result = new ArrayList<>(); + Set<String> all = new TreeSet<>(); all.addAll(getCategories()); try { @@ -208,7 +208,7 @@ * @return la liste des formules de la categorie */ static public List<Formule> getFormules(TopiaContext context, String category) { - List<Formule> result = new ArrayList<Formule>(); + List<Formule> result = new ArrayList<>(); result.addAll(getFormules(category)); @@ -233,7 +233,7 @@ * @return la liste des categories existant en tant que modele */ static public List<String> getCategories() { - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); File dir = getFormuleDirectory(); if (dir.exists()) { for (File f : dir.listFiles()) { Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -192,12 +192,9 @@ E result; try { result = clazz.newInstance(); - } catch (InstantiationException eee) { + } catch (InstantiationException | IllegalAccessException eee) { throw new IsisFishException("Can't instanciate class: " + clazz.getName(), eee); - } catch (IllegalAccessException eee) { - throw new IsisFishException("Can't instanciate class: " - + clazz.getName(), eee); } return result; } @@ -295,7 +292,7 @@ * @return the list of parameters for a given export */ public static Map<String, Class<?>> getParameterNames(Object instance) { - Map<String, Class<?>> result = new LinkedHashMap<String, Class<?>>(); + Map<String, Class<?>> result = new LinkedHashMap<>(); for (Field field : instance.getClass().getFields()) { if (field.getName().startsWith(PARAM_PREFIX)) { result.put(field.getName().substring(PARAM_PREFIX.length()), @@ -321,10 +318,8 @@ String fieldName = PARAM_PREFIX + name; Field field = instance.getClass().getDeclaredField(fieldName); return field.get(instance); - } catch (IllegalAccessException eee) { + } catch (IllegalAccessException | NoSuchFieldException eee) { throw new IsisFishException("Can't get rule parameter: " + name, eee); - } catch (NoSuchFieldException eee) { - throw new IsisFishException("Can't get rule parameter: " + name, eee); } } @@ -366,18 +361,10 @@ String fieldName = PARAM_PREFIX + name; Field field = instance.getClass().getDeclaredField(fieldName); field.set(instance, value); - } catch (IllegalAccessException eee) { + } catch (IllegalAccessException | NoSuchFieldException | IllegalArgumentException eee) { throw new IsisFishException("Can't modify script parameter: " + name + " with '" + value + "'(" + ObjectUtils.identityToString(value) + ")", eee); - } catch (NoSuchFieldException eee) { - throw new IsisFishException("Can't modify script parameter: " - + name + " with '" + value + "'(" - + ObjectUtils.identityToString(value) + ")", eee); - } catch (IllegalArgumentException eee) { - throw new IsisFishException("Can't modify script parameter: " - + name + " with '" + value + "'(" - + ObjectUtils.identityToString(value) + ")", eee); } } Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ObjectiveStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ObjectiveStorage.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ObjectiveStorage.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -52,7 +52,7 @@ public static final String OBJECTIVE_TEMPLATE = "templates/script/objective.ftl"; /** Instance cache. */ - protected static Map<String, ObjectiveStorage> objectiveCache = new ReferenceMap<String, ObjectiveStorage>(); + protected static Map<String, ObjectiveStorage> objectiveCache = new ReferenceMap<>(); /** * Contruit un nouveau storage Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/OptimizationStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/OptimizationStorage.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/OptimizationStorage.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -52,7 +52,7 @@ public static final String OPTIMIZATION_TEMPLATE = "templates/script/optimization.ftl"; /** Instance cache. */ - protected static Map<String, OptimizationStorage> objectiveCache = new ReferenceMap<String, OptimizationStorage>(); + protected static Map<String, OptimizationStorage> objectiveCache = new ReferenceMap<>(); /** * Contruit un nouveau storage Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -70,7 +70,7 @@ private static Log log = LogFactory.getLog(RegionStorage.class); /** Instance cache. */ - protected static Map<String, RegionStorage> regions = new ReferenceMap<String, RegionStorage>(); + protected static Map<String, RegionStorage> regions = new ReferenceMap<>(); /** File to use to store next commit region comment. */ protected File commentForNextCommitFile = null; @@ -129,9 +129,6 @@ commentForNextCommitFile.renameTo(dest); } - /* - * @see fr.ifremer.isisfish.datastore.DataStorage#isVersionnableAbleFile(java.io.File) - */ @Override protected boolean isVersionnableFile(File file) { boolean result = super.isVersionnableFile(file); @@ -157,9 +154,6 @@ setCommentForNextCommit(comment); } - /* - * @see fr.ifremer.isisfish.datastore.DataStorage#rename(java.lang.String) - */ @Override public void rename(String toName) throws StorageException { try { @@ -223,7 +217,7 @@ RegionStorage result = regions.get(name); if (result == null) { // recherche du repertoire de la region en fonction de la config - File directory = null; + File directory; // in simulation context, region is not located in "regions" directory // FIXME remove this, hack, don't known what to used here :( @@ -296,9 +290,6 @@ return result; } - /* - * @see fr.ifremer.isisfish.datastore.DataStorage#delete(boolean) - */ @Override public void delete(boolean cvsDelete) throws StorageException { super.delete(cvsDelete); @@ -327,7 +318,7 @@ * @return la liste de toutes les régions disponible en local */ static public List<RegionStorage> getRegions() { - List<RegionStorage> result = new ArrayList<RegionStorage>(); + List<RegionStorage> result = new ArrayList<>(); for (String name : getRegionNames()) { RegionStorage region = getRegion(name); result.add(region); Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -177,11 +177,11 @@ protected MatrixND getInCache(String name) { MatrixND result = null; - TopiaContext context = (TopiaContext) cacheContext.get(name); + TopiaContext context = cacheContext.get(name); if (context != null && !context.isClosed()) { // on verifie que le context existe encore car on peut vouloir // naviguer dans les semantics - result = (MatrixND) cache.get(name); + result = cache.get(name); } return result; } @@ -194,7 +194,7 @@ */ protected Set<String> getAvailableResult() { if (availableResult == null) { - availableResult = new HashSet<String>(); + availableResult = new HashSet<>(); try { TopiaContext tx = null; boolean mustClose = false; @@ -253,7 +253,7 @@ public boolean isEnabled(String name) { name = name.trim(); if (enabledResult == null) { - enabledResult = new HashSet<String>(); + enabledResult = new HashSet<>(); Collection<String> resultEnabled = simulation.getParameter() .getResultEnabled(); @@ -330,57 +330,36 @@ return result; } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.datastore.ResultStorage#addResult(fr.ifremer.isisfish.types.TimeStep, org.nuiton.math.matrix.MatrixND) - */ @Override public void addResult(TimeStep step, MatrixND mat) throws IsisFishException { addResult(false, step, mat.getName(), mat); } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.datastore.ResultStorage#addResult(fr.ifremer.isisfish.types.TimeStep, fr.ifremer.isisfish.entities.Population, org.nuiton.math.matrix.MatrixND) - */ @Override public void addResult(TimeStep step, Population pop, MatrixND mat) throws IsisFishException { addResult(false, step, mat.getName(), pop, mat); } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.datastore.ResultStorage#addResult(boolean, fr.ifremer.isisfish.types.TimeStep, org.nuiton.math.matrix.MatrixND) - */ @Override public void addResult(boolean force, TimeStep step, MatrixND mat) throws IsisFishException { addResult(force, step, mat.getName(), mat); } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.datastore.ResultStorage#addResult(boolean, fr.ifremer.isisfish.types.TimeStep, fr.ifremer.isisfish.entities.Population, org.nuiton.math.matrix.MatrixND) - */ @Override public void addResult(boolean force, TimeStep step, Population pop, MatrixND mat) throws IsisFishException { addResult(force, step, mat.getName(), pop, mat); } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.datastore.ResultStorage#addResult(fr.ifremer.isisfish.types.TimeStep, java.lang.String, fr.ifremer.isisfish.entities.Population, org.nuiton.math.matrix.MatrixND) - */ @Override public void addResult(TimeStep step, String name, Population pop, MatrixND mat) throws IsisFishException { addResult(false, step, name, pop, mat); } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.datastore.ResultStorage#addResult(fr.ifremer.isisfish.types.TimeStep, java.lang.String, org.nuiton.math.matrix.MatrixND) - */ @Override public void addResult(TimeStep step, String name, MatrixND mat) throws IsisFishException { addResult(false, step, name, mat); } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.datastore.ResultStorage#addResult(boolean, fr.ifremer.isisfish.types.TimeStep, java.lang.String, fr.ifremer.isisfish.entities.Population, org.nuiton.math.matrix.MatrixND) - */ @Override public void addResult(boolean force, TimeStep step, String name, Population pop, MatrixND mat) throws IsisFishException { if (force || isEnabled(name)) { @@ -388,9 +367,6 @@ } } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.datastore.ResultStorage#addResult(boolean, fr.ifremer.isisfish.types.TimeStep, java.lang.String, org.nuiton.math.matrix.MatrixND) - */ @Override public void addResult(boolean force, TimeStep step, String name, MatrixND mat) throws IsisFishException { if (force || isEnabled(name)) { @@ -467,9 +443,6 @@ } } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.datastore.ResultStorage#addActiveRule(fr.ifremer.isisfish.types.TimeStep, fr.ifremer.isisfish.rule.Rule) - */ @Override public void addActiveRule(TimeStep step, Rule rule) throws IsisFishException { try { @@ -499,9 +472,6 @@ } } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.datastore.ResultStorage#getResultName() - */ @Override public List<String> getResultName() { @@ -531,14 +501,11 @@ } } if (result == null) { - result = new ArrayList<String>(); + result = new ArrayList<>(); } return result; } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.datastore.ResultStorage#getMatrix(fr.ifremer.isisfish.types.TimeStep, fr.ifremer.isisfish.entities.Population, java.lang.String) - */ @Override public MatrixND getMatrix(TimeStep step, Population pop, String name) { String newName = name + " " + pop; @@ -545,9 +512,6 @@ return getMatrix(step, newName); } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.datastore.ResultStorage#getMatrix(fr.ifremer.isisfish.types.TimeStep, java.lang.String) - */ @Override public MatrixND getMatrix(TimeStep step, String name) { MatrixND mat = getInCache(step, name); @@ -588,9 +552,6 @@ return mat; } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.datastore.ResultStorage#getMatrix(fr.ifremer.isisfish.types.TimeStep, java.lang.String, org.nuiton.topia.TopiaContext) - */ @Override public MatrixND getMatrix(TimeStep step, String name, TopiaContext tx) { MatrixND mat = getInCache(step, name); @@ -614,9 +575,6 @@ return mat; } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.datastore.ResultStorage#getMatrix(fr.ifremer.isisfish.entities.Population, java.lang.String) - */ @Override public MatrixND getMatrix(Population pop, String name) { String newName = name + " " + pop; @@ -623,9 +581,6 @@ return getMatrix(newName); } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.datastore.ResultStorage#getMatrix(fr.ifremer.isisfish.entities.Population, java.lang.String, org.nuiton.topia.TopiaContext) - */ @Override public MatrixND getMatrix(Population pop, String name, TopiaContext tx) { String newName = name + " " + pop; @@ -632,9 +587,6 @@ return getMatrix(newName, tx); } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.datastore.ResultStorage#getMatrix(java.lang.String) - */ @Override public MatrixND getMatrix(String name) { MatrixND resultMat = null; @@ -672,9 +624,6 @@ return resultMat; } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.datastore.ResultStorage#getMatrix(java.lang.String, org.nuiton.topia.TopiaContext) - */ @Override public MatrixND getMatrix(String name, TopiaContext tx) { log.debug("Get result: " + name); @@ -704,7 +653,7 @@ // creation de la liste de date TimeStep lastStep = getLastStep(); - List<TimeStep> steps = new ArrayList<TimeStep>(); + List<TimeStep> steps = new ArrayList<>(); TimeStep step = new TimeStep(0); steps.add(step); while (step.before(lastStep)) { @@ -717,7 +666,7 @@ } // recuperation des dimensions des matrices - MatrixND mat = (MatrixND) results.get(0).getMatrix(); + MatrixND mat = results.get(0).getMatrix(); // recuperation des noms des dimensions String[] dimNames = new String[1 + mat.getDimCount()]; @@ -775,9 +724,6 @@ return resultMat; } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.datastore.ResultStorage#getLastStep() - */ @Override public TimeStep getLastStep() { int monthNumber = simulation.getParameter().getNumberOfMonths(); @@ -785,9 +731,6 @@ return result; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationResultListener#addResult(fr.ifremer.isisfish.simulator.SimulationContext, fr.ifremer.isisfish.types.TimeStep, java.lang.String, org.nuiton.math.matrix.MatrixND) - */ @Override public void addResult(SimulationContext context, TimeStep step, String name, MatrixND mat) throws IsisFishException { @@ -798,9 +741,6 @@ } } - /* - * @see fr.ifremer.isisfish.simulator.SimulationResultGetter#getMatrix(fr.ifremer.isisfish.simulator.SimulationContext, fr.ifremer.isisfish.types.TimeStep, java.lang.String) - */ @Override public MatrixND getMatrix(SimulationContext context, TimeStep step, String name) { MatrixND result = null; @@ -814,9 +754,6 @@ return result; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationResultGetter#getMatrix(fr.ifremer.isisfish.simulator.SimulationContext, java.lang.String) - */ @Override public MatrixND getMatrix(SimulationContext context, String name) { MatrixND result = null; @@ -830,16 +767,10 @@ return result; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationListener#afterSimulation(fr.ifremer.isisfish.simulator.SimulationContext) - */ @Override public void afterSimulation(SimulationContext context) { } - /* - * @see fr.ifremer.isisfish.simulator.SimulationListener#beforeSimulation(fr.ifremer.isisfish.simulator.SimulationContext) - */ @Override public void beforeSimulation(SimulationContext context) { } Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultInfoStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultInfoStorage.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultInfoStorage.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -57,7 +57,7 @@ public static final String RESULT_INFO_TEMPLATE = "templates/script/resultinfo.ftl"; /** Instance cache. */ - protected static Map<String, ResultInfoStorage> resultInfosCache = new ReferenceMap<String, ResultInfoStorage>(); + protected static Map<String, ResultInfoStorage> resultInfosCache = new ReferenceMap<>(); /** * Contruit un nouveau resultInfo storage Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -75,12 +75,11 @@ protected MatrixFactory matrixFactory; protected RandomAccessFile raf; + protected long offset; -// protected Map<TimeStep, Map<String, ResultMapped>> stepNameResults = -// new TreeMap<TimeStep, Map<String, ResultMapped>>(); - protected Map<String, Map<TimeStep, ResultMapped>> nameStepResults = - new TreeMap<String, Map<TimeStep, ResultMapped>>(); + protected Map<String, Map<TimeStep, ResultMapped>> nameStepResults = new TreeMap<>(); + /** * Represente un resultat * Lors de la construction, si on ne passe que le RandomAccessFile et l'offset, on relie un resultat @@ -385,7 +384,7 @@ protected Map<TimeStep, ResultMapped> getResult(String name) { Map<TimeStep, ResultMapped> result = nameStepResults.get(name); if (result == null) { - result = new TreeMap<TimeStep, ResultMapped>(); + result = new TreeMap<>(); nameStepResults.put(name, result); } return result; @@ -443,7 +442,7 @@ * ajouté au nom du résultat. */ public List<String> getResultName() { - List<String> result = new ArrayList<String>(nameStepResults.keySet()); + List<String> result = new ArrayList<>(nameStepResults.keySet()); return result; } Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -195,7 +195,7 @@ * @return new list */ protected List<String> undecorate(List l) { - ArrayList<String> result = new ArrayList<String>(l.size()); + List<String> result = new ArrayList<>(l.size()); for (Object o : l) { result.add(undecorate(o)); } @@ -434,10 +434,7 @@ String newName = name + " " + pop; return getMatrix(newName, null); } - - /* (non-Javadoc) - * @see fr.ifremer.isisfish.datastore.ResultStorage#getMatrix(fr.ifremer.isisfish.entities.Population, java.lang.String, org.nuiton.topia.TopiaContext) - */ + @Override public MatrixND getMatrix(Population pop, String name, TopiaContext tx) { String newName = name + " " + pop; @@ -465,7 +462,7 @@ // collect de tous les pas de temps possible TimeStep lastStep = getLastStep(); - List<TimeStep> steps = new ArrayList<TimeStep>(); + List<TimeStep> steps = new ArrayList<>(); TimeStep step = new TimeStep(0); steps.add(step); while (step.before(lastStep)) { @@ -499,7 +496,7 @@ log.debug("Get result: " + name); // collect de toutes les matrices existantes - Map<TimeStep, MatrixND> results = new LinkedHashMap<TimeStep, MatrixND>(); + Map<TimeStep, MatrixND> results = new LinkedHashMap<>(); MatrixND sample = null; for (TimeStep s : steps) { MatrixND m = readResult(s, name); @@ -574,9 +571,6 @@ return result; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationResultListener#addResult(fr.ifremer.isisfish.simulator.SimulationContext, fr.ifremer.isisfish.types.TimeStep, java.lang.String, org.nuiton.math.matrix.MatrixND) - */ @Override public void addResult(SimulationContext context, TimeStep step, String name, MatrixND mat) throws IsisFishException { @@ -583,9 +577,6 @@ doAddResult(step, name, mat); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationResultGetter#getMatrix(fr.ifremer.isisfish.simulator.SimulationContext, fr.ifremer.isisfish.types.TimeStep, java.lang.String) - */ @Override public MatrixND getMatrix(SimulationContext context, TimeStep step, String name) { MatrixND result = null; @@ -612,9 +603,6 @@ return result; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationResultGetter#getMatrix(fr.ifremer.isisfish.simulator.SimulationContext, java.lang.String) - */ @Override public MatrixND getMatrix(SimulationContext context, String name) { MatrixND result = null; @@ -656,16 +644,10 @@ return result; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationListener#afterSimulation(fr.ifremer.isisfish.simulator.SimulationContext) - */ @Override public void afterSimulation(SimulationContext context) { } - /* - * @see fr.ifremer.isisfish.simulator.SimulationListener#beforeSimulation(fr.ifremer.isisfish.simulator.SimulationContext) - */ @Override public void beforeSimulation(SimulationContext context) { } Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageCSV.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageCSV.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageCSV.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -203,7 +203,7 @@ protected HashSet<String> fileExistCache; protected HashSet<String> getFileExistCache() { if (fileExistCache == null) { - fileExistCache = new HashSet<String>(); + fileExistCache = new HashSet<>(); File matrixDir = getMatrixDirectory(""); File[] resultDirs = matrixDir.listFiles(); if (resultDirs != null) { @@ -229,7 +229,7 @@ } protected MatrixND readMatrix(String file) throws IOException { - MatrixND result = null; + MatrixND result; Reader in = null; try { in = new InputStreamReader( @@ -327,7 +327,7 @@ protected Map<String, MatrixND> getCacheForStep(TimeStep step) { Map<String, MatrixND> result = cache.get(step); if (result == null) { - result = new HashMap<String, MatrixND>(); + result = new HashMap<>(); cache.put(step, result); } return result; Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -109,7 +109,7 @@ MatrixND newMat = undecorate(mat); Map<String, MatrixND> mats = data.get(step); if (mats == null) { - mats = new HashMap<String, MatrixND>(); + mats = new HashMap<>(); data.put(step, mats); } @@ -120,7 +120,7 @@ protected void writeActiveRule(TimeStep step, String name, String params) { List<String> list = rules.get(step); if (list == null) { - list = new LinkedList<String>(); + list = new LinkedList<>(); rules.put(step, list); } @@ -127,24 +127,18 @@ list.add(name); } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.datastore.ResultStorage#getResultName() - */ @Override public List<String> getResultName() { - Set<String> result = new HashSet<String>(); + Set<String> result = new HashSet<>(); for (Map<String, MatrixND> mats : data.values()) { result.addAll(mats.keySet()); } - return new ArrayList<String>(result); + return new ArrayList<>(result); } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.datastore.ResultStorage#getMatrix(fr.ifremer.isisfish.types.TimeStep, java.lang.String) - */ @Override public MatrixND readResult(TimeStep step, String name) { MatrixND result = null; @@ -155,21 +149,4 @@ return result; } -// /* (non-Javadoc) -// * @see fr.ifremer.isisfish.datastore.ResultStorage#getMatrix(java.lang.String) -// */ -// @Override -// public Map<TimeStep, MatrixND> readResult(String name) { -// Map<TimeStep, MatrixND> result = new LinkedHashMap<TimeStep, MatrixND>(); -// for (Map.Entry<TimeStep, Map<String, MatrixND>> e : data.entrySet()) { -// TimeStep ts = e.getKey(); -// MatrixND mat = e.getValue().get(name); -// if (mat != null) { -// result.put(ts, mat); -// } -// } -// -// return result; -// } - } Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -68,7 +68,7 @@ public static final String RULE_TEMPLATE = "templates/script/rule.ftl"; /** Instance cache. */ - protected static Map<String, RuleStorage> rulesCache = new ReferenceMap<String, RuleStorage>(); + protected static Map<String, RuleStorage> rulesCache = new ReferenceMap<>(); /** * Contruit un nouveau rule storage Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -53,7 +53,7 @@ public static final String SCRIPT_TEMPLATE = "templates/script/script.ftl"; /** Instance cache. */ - static protected Map<String, ScriptStorage> scriptsCache = new ReferenceMap<String, ScriptStorage>(); + static protected Map<String, ScriptStorage> scriptsCache = new ReferenceMap<>(); /** * Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -55,7 +55,7 @@ public static final String SENSITIVITY_EXPORT_TEMPLATE = "templates/script/sensitivityexport.ftl"; /** Instance cache. */ - protected static Map<String, SensitivityExportStorage> sensitivityExportsCache = new ReferenceMap<String, SensitivityExportStorage>(); + protected static Map<String, SensitivityExportStorage> sensitivityExportsCache = new ReferenceMap<>(); /** * Constructeur. Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -112,9 +112,6 @@ } } - /* - * @see java.lang.Object#toString() - */ @Override public String toString() { String result = "Simulation Information:\n"; @@ -333,7 +330,7 @@ * @return a map with all export time */ protected Map<String, Long> getExportTimes() { - Map<String, Long> result = new TreeMap<String, Long>(); + Map<String, Long> result = new TreeMap<>(); for (String key : info.stringPropertyNames()) { if (key.startsWith(EXPORT_TIME + ".")) { String exportName = key.substring(EXPORT_TIME.length() + 1); @@ -349,7 +346,7 @@ * @return a map with all export size */ protected Map<String, Long> getExportSizes() { - Map<String, Long> result = new TreeMap<String, Long>(); + Map<String, Long> result = new TreeMap<>(); for (String key : info.stringPropertyNames()) { if (key.startsWith(EXPORT_SIZE + ".")) { String exportName = key.substring(EXPORT_SIZE.length() + 1); @@ -365,7 +362,7 @@ * @return a map with all export exception */ protected Map<String, String> getExportExceptions() { - Map<String, String> result = new TreeMap<String, String>(); + Map<String, String> result = new TreeMap<>(); for (String key : info.stringPropertyNames()) { if (key.startsWith(EXPORT_EXCEPTION + ".")) { String exportName = key.substring(EXPORT_EXCEPTION.length() + 1); @@ -560,7 +557,7 @@ * @return a map with all export time */ protected Set<String> getRuleNames() { - Set<String> result = new HashSet<String>(); + Set<String> result = new HashSet<>(); for (String key : info.stringPropertyNames()) { if (key.startsWith(RULE_TIME + ".")) { // recupere le nom apres le deuxieme "." Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -86,7 +86,7 @@ private static Log log = LogFactory.getLog(SimulationStorage.class); /** Cache des simulation storage. */ - protected static Map<String, SimulationStorage> simulations = new ReferenceMap<String, SimulationStorage>(); + protected static Map<String, SimulationStorage> simulations = new ReferenceMap<>(); /** some free information, that user can add during simulation */ protected SimulationInformation information = null; @@ -727,9 +727,6 @@ tx.closeContext(); } - /* - * @see fr.ifremer.isisfish.datastore.DataStorage#rename(java.lang.String) - */ @Override public void rename(String toName) throws StorageException { simulations.remove(getName()); @@ -835,7 +832,7 @@ // create a pseudo oldRegionName region tmpDir = FileUtil.createTempDirectory( "extractRegionFromSimulation", ""); - List<File> forZip = new ArrayList<File>(2); + List<File> forZip = new ArrayList<>(2); File file1; forZip.add(file1 = new File(tmpDir, oldRegionName)); //forZip.add(file1 = getDataBackupFile(file1)); @@ -855,10 +852,8 @@ tx.commitTransaction(); tx.closeContext(); - } catch (IOException ex) { + } catch (IOException | TopiaException ex) { throw new StorageException("Can't extract region", ex); - } catch (TopiaException ex) { - throw new StorageException("Can't extract region", ex); } finally { if (tmpDir != null && !FileUtils.deleteQuietly(tmpDir)) { log.warn(t("isisfish.error.delete.file", tmpDir)); @@ -874,9 +869,6 @@ return root + File.separator + "simulation.log"; } - /* - * @see fr.ifremer.isisfish.datastore.DataStorage#createZip(java.io.File) - */ @Override public File createZip(File file) throws IOException { Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -54,7 +54,7 @@ public static final String SIMULATOR_TEMPLATE = "templates/script/simulator.ftl"; /** Simulators cache. */ - static protected Map<String, SimulatorStorage> simulatorsCache = new ReferenceMap<String, SimulatorStorage>(); + static protected Map<String, SimulatorStorage> simulatorsCache = new ReferenceMap<>(); /** * Constructeur. Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -65,7 +65,7 @@ * TODO echatellier 20120224 la collection est static donc un listener sur les scripts * recevra trop d'evenement car il recevra aussi les evenements des regions... */ - protected static ListenerSet<StorageChangeListener> changeListeners = new ListenerSet<StorageChangeListener>(); + protected static ListenerSet<StorageChangeListener> changeListeners = new ListenerSet<>(); /** VCS root directory. */ protected File root = null; @@ -253,7 +253,7 @@ * @return la liste des fichiers trouvés */ protected List<File> getFiles(boolean withParent) { - List<File> result = new ArrayList<File>(); + List<File> result = new ArrayList<>(); // on ajoute tous les directories jusqu'a root File current = getFile(); @@ -394,7 +394,7 @@ * @return la liste des noms de toutes les storages disponible en local */ public static List<String> getStorageNames(File directory) { - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); if (directory.exists()) { for (File f : directory.listFiles()) { @@ -422,7 +422,7 @@ * est vide. */ public static List<String> getRemoteStorageNames(File directory) { - List<String> result = null; + List<String> result; try { result = getVCS().getFileList(directory); } catch (VCSException e) { @@ -429,7 +429,7 @@ if (log.isWarnEnabled()) { log.warn("Error during connection to VCS server", e); } - result = new ArrayList<String>(); + result = new ArrayList<>(); } Collections.sort(result); return result; Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -59,9 +59,7 @@ } protected static class MigrationResolver implements MigrationCallBackForVersionResolver { - /* - * @see org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersionResolver#getCallBack(org.nuiton.util.Version) - */ + @Override public Class<? extends MigrationCallBackForVersion> getCallBack(Version version) { Class<? extends MigrationCallBackForVersion> result = null; @@ -86,9 +84,6 @@ } - /* - * @see org.nuiton.topia.migration.AbstractTopiaMigrationCallback#getAvailableVersions() - */ @Override public Version[] getAvailableVersions() { Version[] result = new Version[] { VERSION_32, VERSION_33, VERSION_40, VERSION_41, VERSION_421, VERSION_43, VERSION_44}; @@ -95,9 +90,6 @@ return result; } - /* - * @see org.nuiton.topia.migration.AbstractTopiaMigrationCallback#getApplicationVersion() - */ @Override public Version getApplicationVersion() { Version appVersion = Versions.valueOf(IsisFishDAOHelper.getModelVersion()); @@ -104,9 +96,6 @@ return appVersion; } - /* - * @see org.nuiton.topia.migration.AbstractTopiaMigrationCallback#askUser(org.nuiton.util.Version, java.util.List) - */ @Override public boolean askUser(Version dbVersion, List<Version> versions) { boolean result = false; Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV0V32.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV0V32.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV0V32.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -52,9 +52,6 @@ super(version, callBack); } - /* - * @see org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion#prepareMigrationScript(org.nuiton.topia.framework.TopiaContextImplementor, java.util.List, boolean, boolean) - */ @Override protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, boolean showProgression) Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV32V33.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV32V33.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV32V33.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -52,9 +52,6 @@ super(version, callback); } - /* - * @see org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion#prepareMigrationScript(org.nuiton.topia.framework.TopiaContextImplementor, java.util.List, boolean, boolean) - */ @Override protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, boolean showProgression) Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -69,9 +69,6 @@ super(version, callback); } - /* - * @see org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion#prepareMigrationScript(org.nuiton.topia.framework.TopiaContextImplementor, java.util.List, boolean, boolean) - */ @Override protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, boolean showProgression) Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV40V41.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV40V41.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV40V41.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -52,9 +52,6 @@ super(version, callback); } - /* - * @see org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion#prepareMigrationScript(org.nuiton.topia.framework.TopiaContextImplementor, java.util.List, boolean, boolean) - */ @Override protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, boolean showProgression) Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV41V421.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV41V421.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV41V421.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -52,9 +52,6 @@ super(version, callback); } - /* - * @see org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion#prepareMigrationScript(org.nuiton.topia.framework.TopiaContextImplementor, java.util.List, boolean, boolean) - */ @Override protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, boolean showProgression) Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV421V43.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV421V43.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV421V43.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -52,9 +52,6 @@ super(version, callback); } - /* - * @see org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion#prepareMigrationScript(org.nuiton.topia.framework.TopiaContextImplementor, java.util.List, boolean, boolean) - */ @Override protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, boolean showProgression) Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -55,9 +55,6 @@ super(version, callback); } - /* - * @see org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion#prepareMigrationScript(org.nuiton.topia.framework.TopiaContextImplementor, java.util.List, boolean, boolean) - */ @Override protected void prepareMigrationScript(TopiaContextImplementor tx, List<String> queries, boolean showSql, boolean showProgression) Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/CellImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/CellImpl.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/CellImpl.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -55,9 +55,6 @@ } } - /* - * @see fr.ifremer.isisfish.entities.CellAbstract#toString() - */ @Override public String toString() { String result = getName(); Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/EffortDescriptionImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/EffortDescriptionImpl.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/EffortDescriptionImpl.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -43,9 +43,6 @@ /** serialVersionUID. */ private static final long serialVersionUID = 3668146790780517650L; - /* - * @see fr.ifremer.isisfish.entities.EffortDescriptionAbstract#toString() - */ @Override public String toString() { String result = t("isisfish.effortDescription.toString", Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -91,9 +91,6 @@ } } - /* - * @see fr.ifremer.isisfish.entities.EquationAbstract#toString() - */ @Override public String toString() { String result = getName() + "(" + getCategory() + ")"; Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -51,11 +51,9 @@ /** serialVersionUID */ private static final long serialVersionUID = 1L; - /* - * @see fr.ifremer.isisfish.entities.FisheryRegion#getMapFileList() - */ + @Override public List<String> getMapFileList() { - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); String mapfiles = getMapFiles(); if (mapfiles != null) { String[] mapNames = mapfiles.split(","); @@ -68,9 +66,7 @@ return result; } - /* - * @see fr.ifremer.isisfish.entities.FisheryRegion#setMapFileList(java.util.List) - */ + @Override public void setMapFileList(List<String> maps) { StringBuffer result = new StringBuffer(); String sep = ""; @@ -83,12 +79,10 @@ setMapFiles(result.toString()); } - /* - * @see fr.ifremer.isisfish.entities.FisheryRegion#getMapFilePath() - */ + @Override public List<String> getMapFilePath() { List<String> mapNames = getMapFileList(); - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); RegionStorage regionStorage = RegionStorage.getRegion(getName()); for (String mapName : mapNames) { result.add(regionStorage.getMapRepository().getPath() @@ -97,9 +91,7 @@ return result; } - /* - * @see fr.ifremer.isisfish.entities.FisheryRegion#getPort() - */ + @Override public List<Port> getPort() { try { PortDAO dao = IsisFishDAOHelper.getPortDAO(getTopiaContext()); @@ -110,9 +102,7 @@ } } - /* - * @see fr.ifremer.isisfish.entities.FisheryRegion#getCell() - */ + @Override public List<Cell> getCell() { try { CellDAO dao = IsisFishDAOHelper.getCellDAO(getTopiaContext()); @@ -123,9 +113,7 @@ } } - /* - * @see fr.ifremer.isisfish.entities.FisheryRegion#getVesselType() - */ + @Override public List<VesselType> getVesselType() { try { VesselTypeDAO dao = IsisFishDAOHelper @@ -137,9 +125,7 @@ } } - /* - * @see fr.ifremer.isisfish.entities.FisheryRegion#getGear() - */ + @Override public List<Gear> getGear() { try { GearDAO dao = IsisFishDAOHelper.getGearDAO(getTopiaContext()); @@ -150,9 +136,7 @@ } } - /* - * @see fr.ifremer.isisfish.entities.FisheryRegion#getMetier() - */ + @Override public List<Metier> getMetier() { try { MetierDAO dao = IsisFishDAOHelper.getMetierDAO(getTopiaContext()); @@ -163,9 +147,7 @@ } } - /* - * @see fr.ifremer.isisfish.entities.FisheryRegion#getSetOfVessels() - */ + @Override public List<SetOfVessels> getSetOfVessels() { try { SetOfVesselsDAO dao = IsisFishDAOHelper @@ -177,9 +159,7 @@ } } - /* - * @see fr.ifremer.isisfish.entities.FisheryRegion#getSpecies() - */ + @Override public List<Species> getSpecies() { try { SpeciesDAO dao = IsisFishDAOHelper.getSpeciesDAO(getTopiaContext()); @@ -190,9 +170,7 @@ } } - /* - * @see fr.ifremer.isisfish.entities.FisheryRegion#getStrategy() - */ + @Override public List<Strategy> getStrategy() { try { StrategyDAO dao = IsisFishDAOHelper @@ -204,9 +182,7 @@ } } - /* - * @see fr.ifremer.isisfish.entities.FisheryRegion#getTripType() - */ + @Override public List<TripType> getTripType() { try { TripTypeDAO dao = IsisFishDAOHelper @@ -218,9 +194,7 @@ } } - /* - * @see fr.ifremer.isisfish.entities.FisheryRegion#getZone() - */ + @Override public List<Zone> getZone() { try { ZoneDAO dao = IsisFishDAOHelper.getZoneDAO(getTopiaContext()); @@ -242,9 +216,6 @@ } } - /* - * @see fr.ifremer.isisfish.entities.FisheryRegionAbstract#toString() - */ @Override public String toString() { String result = getName(); Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/GearImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/GearImpl.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/GearImpl.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -56,9 +56,6 @@ } } - /* - * @see fr.ifremer.isisfish.entities.FisheryRegionAbstract#toString() - */ @Override public String toString() { String result = getName(); Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/MetierImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/MetierImpl.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/MetierImpl.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -73,9 +73,6 @@ addAllMetierSeasonInfo(metierSeasonInfo); } - /* - * @see fr.ifremer.isisfish.entities.Metier#getMetierSeasonInfo(fr.ifremer.isisfish.types.Month) - */ @Override public MetierSeasonInfo getMetierSeasonInfo(Month month) { Collection<MetierSeasonInfo> all = getMetierSeasonInfo(); @@ -99,9 +96,6 @@ return result; } - /* - * @see fr.ifremer.isisfish.entities.MetierAbstract#toString() - */ @Override public String toString() { String result = getName(); Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -50,12 +50,8 @@ private static final long serialVersionUID = 4554500494092542926L; /** Logger for this class. */ - private static final Log log = LogFactory - .getLog(MetierSeasonInfoImpl.class); + private static final Log log = LogFactory.getLog(MetierSeasonInfoImpl.class); - /* - * @see fr.ifremer.isisfish.entities.MetierSeasonInfo#targetFactor(fr.ifremer.isisfish.entities.PopulationGroup) - */ @Override public double getTargetFactor(PopulationGroup group) { // Par defaut on retourne 1 si dans les donnes rien n'est @@ -76,7 +72,7 @@ @Override public List<Cell> getCells() { - List<Cell> result = new ArrayList<Cell>(); + List<Cell> result = new ArrayList<>(); for (Zone zone : getZone()) { result.addAll(zone.getCell()); } @@ -83,9 +79,6 @@ return result; } - /* - * @see fr.ifremer.isisfish.entities.FisheryRegionAbstract#toString() - */ @Override public String toString() { String result = t("isisfish.metierSeasonInfo.toString", this Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -50,9 +50,6 @@ /** serialVersionUID. */ private static final long serialVersionUID = 1L; - /* - * @see fr.ifremer.isisfish.entities.PopulationGroup#getAge() - */ @Override public double getAge() { double result = 0; @@ -67,9 +64,6 @@ return result; } - /* - * @see fr.ifremer.isisfish.entities.PopulationGroup#getLongueurMin() - */ @Override public double getLength() { double result = 0.0; @@ -147,9 +141,6 @@ return result; } - /* - * @see fr.ifremer.isisfish.entities.PopulationGroup#getPrice() - */ @Override public double getPrice() { double result = 0; @@ -169,9 +160,6 @@ return result; } - /* - * @see fr.ifremer.isisfish.entities.PopulationGroup#getMaturityOgive() - */ @Override public double getMaturityOgive() { double result = 0; @@ -191,9 +179,6 @@ return result; } - /* - * @see fr.ifremer.isisfish.entities.PopulationGroup#getReproductionRate() - */ @Override public double getReproductionRate() { double result = 0; Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -116,9 +116,6 @@ super.delete(); } - /* - * @see fr.ifremer.isisfish.entities.PopulationAbstract#toString() - */ @Override public String toString() { return getName(); @@ -136,7 +133,7 @@ } private void updateEquationName() { - Equation eq = null; + Equation eq; eq = getGrowth(); if (eq != null) { eq.setName(getName()); @@ -495,9 +492,6 @@ } } - /* - * @see fr.ifremer.isisfish.entities.Population#getNaturalDeathBirth() - */ @Override public double getNaturalDeathBirth(Zone zone) { double result = 0; @@ -658,9 +652,6 @@ super.setCapturability(value); } - /* - * @see fr.ifremer.isisfish.entities.PopulationAbstract#getCapturability() - */ @Override public MatrixND getCapturability() { MatrixND mat = super.getCapturability(); @@ -759,9 +750,6 @@ } } - /* - * @see fr.ifremer.isisfish.entities.PopulationAbstract#getMappingZoneReproZoneRecru() - */ @Override public MatrixND getMappingZoneReproZoneRecru() { if (sizeReproductionZone() == 0 || sizeRecruitmentZone() == 0) { Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -71,9 +71,6 @@ setSimpleLengthChangeMatrix(true); } - /* - * @see fr.ifremer.isisfish.entities.PopulationSeasonInfoAbstract#getReproductionDistribution() - */ @Override public MatrixND getReproductionDistribution() { MatrixND result = super.getReproductionDistribution(); @@ -143,9 +140,6 @@ return mat; } - /* - * @see fr.ifremer.isisfish.entities.PopulationSeasonInfoAbstract#getEmigrationMatrix() - */ @Override public MatrixND getEmigrationMatrix() { // check the validity @@ -181,9 +175,6 @@ return mat; } - /* - * @see fr.ifremer.isisfish.entities.PopulationSeasonInfoAbstract#getImmigrationMatrix() - */ @Override public MatrixND getImmigrationMatrix() { // check the validity @@ -219,9 +210,7 @@ return mat; } - /* - * @see fr.ifremer.isisfish.entities.PopulationSeasonInfo#getCapturability(fr.ifremer.isisfish.entities.PopulationGroup) - */ + @Override public double getCapturability(PopulationGroup group) { double result = 0; if (getPopulation() != null) { @@ -293,7 +282,7 @@ List<Zone> zones = pop.getPopulationZone(); List<PopulationGroup> groups = pop.getPopulationGroup(); - ArrayList<String> semantique = new ArrayList<String>(); + List<String> semantique = new ArrayList<>(); for (PopulationGroup group : groups) { for (Zone zone : zones) { @@ -470,9 +459,7 @@ } } - /* - * @see fr.ifremer.isisfish.entities.PopulationSeasonInfo#getMigrationMatrix(fr.ifremer.isisfish.types.Month, org.nuiton.math.matrix.MatrixND) - */ + @Override public MatrixND getMigrationMatrix(Month month, MatrixND N) { if (month.getMonthNumber() == getFirstMonth().getMonthNumber()) { return getMigrationMatrix(N); @@ -566,9 +553,7 @@ return mat; } - /* - * @see fr.ifremer.isisfish.entities.PopulationSeasonInfo#getEmigrationMatrix(fr.ifremer.isisfish.types.Month, org.nuiton.math.matrix.MatrixND) - */ + @Override public MatrixND getEmigrationMatrix(Month month, MatrixND N) { if (month.getMonthNumber() == getFirstMonth().getMonthNumber()) { return getEmigrationMatrix(N); @@ -634,9 +619,7 @@ return mat; } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.entities.PopulationSeasonInfo#getImmigrationMatrix(fr.ifremer.isisfish.types.Month, org.nuiton.math.matrix.MatrixND) - */ + @Override public MatrixND getImmigrationMatrix(Month month, MatrixND N) { if (month.getMonthNumber() == getFirstMonth().getMonthNumber()) { return getImmigrationMatrix(N); Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/PortImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/PortImpl.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/PortImpl.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -55,9 +55,6 @@ } } - /* - * @see fr.ifremer.isisfish.entities.FisheryRegionAbstract#toString() - */ @Override public String toString() { String result = getName(); Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/RegionImportJson.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/RegionImportJson.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/RegionImportJson.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -99,7 +99,7 @@ try { this.merge = merge != null ? merge : new RegionMergeImportAll(); - entities = new LinkedHashMap<String, TopiaEntity>(); + entities = new LinkedHashMap<>(); ObjectMapper m = new ObjectMapper(); json = m.readTree(r); @@ -201,7 +201,7 @@ protected TopiaEntity ask(String id) { JsonNode node = jsonEntities.get(id); - Map<String, Object> details = new HashMap<String, Object>(); + Map<String, Object> details = new HashMap<>(); for (Iterator<Entry<String, JsonNode>> i = node.fields(); i.hasNext();) { Entry<String, JsonNode> e = i.next(); if (!e.getKey().startsWith("#")) { @@ -397,7 +397,7 @@ public String toString() { return toString; } - }; + } static public class Answer { public AnswerType type; @@ -471,7 +471,7 @@ public Set<Class> get(Object key) { Set<Class> result = super.get(key); if (result == null) { - result = new HashSet<Class>(); + result = new HashSet<>(); put((AnswerType)key, result); } return result; @@ -585,7 +585,7 @@ if (!isAcceptableAnswer(context.initAnswer(type), disallow)) { TopiaDAO<TopiaEntity> dao = IsisFishDAOHelper.getDAO(tx, type); - LinkedHashSet<TopiaEntity> possible = new LinkedHashSet<TopiaEntity>(); + Set<TopiaEntity> possible = new LinkedHashSet<>(); possible.add(dao.findByTopiaId(id)); if (Equation.class.isAssignableFrom(context.getCurrentType())) { @@ -630,8 +630,7 @@ JComboBox select = new JComboBox(possible.toArray()); - ArrayList<AnswerType> allowedOptions = - new ArrayList<AnswerType>(Arrays.asList(AnswerType.values())); + List<AnswerType> allowedOptions = new ArrayList<>(Arrays.asList(AnswerType.values())); for (AnswerType t : disallow) { allowedOptions.remove(t); } Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -47,20 +47,14 @@ /** serialVersionUID. */ private static final long serialVersionUID = 1L; - /** - * - */ public SeasonImpl() { - super(); setFirstMonth(Month.JANUARY); setLastMonth(Month.JANUARY); } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.entities.Season#getMonths() - */ + @Override public List<Month> getMonths() { - List<Month> result = new ArrayList<Month>(); + List<Month> result = new ArrayList<>(); Month m = getFirstMonth(); while (!m.equals(getLastMonth())) { result.add(m); @@ -70,9 +64,7 @@ return result; } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.entities.Season#setMonths(java.util.List) - */ + @Override public void setMonths(List<Month> listMonth) { if (listMonth == null || listMonth.size() == 0) { throw new IllegalArgumentException( @@ -85,9 +77,7 @@ setLastMonth(last); } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.entities.Season#containsMonth(fr.ifremer.isisfish.types.Month) - */ + @Override public boolean containsMonth(Month month) { boolean result = month.equals(getLastMonth()); // check first last month, because loop don't do that @@ -99,9 +89,6 @@ return result; } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.entities.SeasonAbstract#toString() - */ @Override public String toString() { String result = t("isisfish.season.toString", this.getFirstMonth(), Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -50,9 +50,7 @@ /** serialVersionUID. */ private static final long serialVersionUID = 1L; - /* - * @see fr.ifremer.isisfish.entities.Selectivity#getCoefficient(double, double, fr.ifremer.isisfish.entities.Metier) - */ + @Override public double getCoefficient(Population pop, PopulationGroup group, Metier metier) { Equation eq = getEquation(); @@ -65,9 +63,6 @@ return result; } - /* - * @see fr.ifremer.isisfish.entities.SelectivityAbstract#getEquation() - */ @Override public Equation getEquation() { if (super.getEquation() == null) { @@ -114,9 +109,6 @@ } } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.entities.SelectivityAbstract#setGear(fr.ifremer.isisfish.entities.Gear) - */ @Override public void setGear(Gear value) { super.setGear(value); @@ -123,9 +115,6 @@ setEquationName(getEquation()); } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.entities.SelectivityAbstract#setPopulation(fr.ifremer.isisfish.entities.Population) - */ @Override public void setPopulation(Population value) { super.setPopulation(value); @@ -139,9 +128,6 @@ } } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.entities.FisheryRegionAbstract#toString() - */ @Override public String toString() { String result = "" + getEquation(); Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -140,9 +140,6 @@ } } - /* - * @see fr.ifremer.isisfish.entities.FisheryRegionAbstract#toString() - */ @Override public String toString() { String result = getName(); Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -68,9 +68,6 @@ addAllPopulation(population); } - /* - * @see fr.ifremer.isisfish.entities.FisheryRegionAbstract#toString() - */ @Override public String toString() { String result = getName(); Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -89,9 +89,6 @@ } } - /* - * @see fr.ifremer.isisfish.entities.StrategyAbstract#getStrategyMonthInfo() - */ @Override public List<StrategyMonthInfo> getStrategyMonthInfo() { try { @@ -102,8 +99,7 @@ result.size())); clearStrategyMonthInfo(); } else { - result = new ArrayList<StrategyMonthInfo>( - Month.NUMBER_OF_MONTH); + result = new ArrayList<>(Month.NUMBER_OF_MONTH); setStrategyMonthInfo(result); } for (Month month : Month.MONTH) { @@ -125,9 +121,7 @@ } } - /* - * @see fr.ifremer.isisfish.entities.Strategy#getStrategyMonthInfo(fr.ifremer.isisfish.types.Month) - */ + @Override public StrategyMonthInfo getStrategyMonthInfo(Month month) { List<StrategyMonthInfo> smis = getStrategyMonthInfo(); StrategyMonthInfo result = smis.get(month.getMonthNumber()); @@ -226,7 +220,7 @@ Collection<EffortDescription> efforts = getSetOfVessels().getPossibleMetiers(); // dim 1 : metier - List<Metier> metiers = new ArrayList<Metier>(efforts.size()); + List<Metier> metiers = new ArrayList<>(efforts.size()); for (EffortDescription effort : efforts) { metiers.add(effort.getPossibleMetiers()); } @@ -273,9 +267,6 @@ } } - /* - * @see fr.ifremer.isisfish.entities.StrategyAbstract#toString() - */ @Override public String toString() { String result = getName(); Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -78,7 +78,7 @@ if (mat == null) { result = Collections.EMPTY_LIST; } else { - result = new ArrayList<Metier>(mat.getDim(0)); + result = new ArrayList<>(mat.getDim(0)); for (MatrixIterator i=mat.iteratorNotZero(); i.next();) { result.add((Metier)i.getSemanticsCoordinates()[0]); } @@ -121,7 +121,7 @@ Collection<EffortDescription> efforts = getStrategy().getSetOfVessels() .getPossibleMetiers(); - List<Metier> metiers = new ArrayList<Metier>(efforts.size()); + List<Metier> metiers = new ArrayList<>(efforts.size()); for (EffortDescription effort : efforts) { metiers.add(effort.getPossibleMetiers()); } @@ -149,9 +149,6 @@ return result; } - /* - * @see fr.ifremer.isisfish.entities.StrategyMonthInfoAbstract#setTripType(fr.ifremer.isisfish.entities.TripType) - */ @Override public void setTripType(TripType value) { super.setTripType(value); @@ -158,9 +155,6 @@ computeNumberOfTrips(); } - /* - * @see fr.ifremer.isisfish.entities.StrategyMonthInfoAbstract#setMinInactivityDays(int) - */ @Override public void setMinInactivityDays(double value) { super.setMinInactivityDays(value); @@ -182,9 +176,6 @@ } } - /* - * @see fr.ifremer.isisfish.entities.FisheryRegionAbstract#toString() - */ @Override public String toString() { String result = t("isisfish.strategyMonthInfo.toString", this Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/TargetSpeciesImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/TargetSpeciesImpl.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/TargetSpeciesImpl.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -55,9 +55,6 @@ /** Class logger. */ private static Log log = LogFactory.getLog(TargetSpeciesImpl.class); - /* (non-Javadoc) - * @see fr.ifremer.isisfish.entities.TargetSpeciesAbstract#getTargetFactorEquation() - */ @Override public Equation getTargetFactorEquation() { if (super.getTargetFactorEquation() == null) { @@ -106,9 +103,6 @@ } } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.entities.TargetSpeciesAbstract#setMetierSeasonInfo(fr.ifremer.isisfish.entities.MetierSeasonInfo) - */ @Override public void setMetierSeasonInfo(MetierSeasonInfo value) { super.setMetierSeasonInfo(value); @@ -115,9 +109,6 @@ setEquationName(getTargetFactorEquation()); } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.entities.TargetSpeciesAbstract#setSpecies(fr.ifremer.isisfish.entities.Species) - */ @Override public void setSpecies(Species value) { super.setSpecies(value); @@ -134,9 +125,7 @@ } } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.entities.TargetSpecies#targetFactor(fr.ifremer.isisfish.entities.PopulationGroup) - */ + @Override public double getTargetFactor(PopulationGroup group) { double result = 0; try { @@ -157,9 +146,6 @@ return result; } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.entities.FisheryRegionAbstract#toString() - */ @Override public String toString() { String result = "" + getTargetFactorEquation(); Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -90,9 +90,6 @@ } } - /* - * @see fr.ifremer.isisfish.entities.TripTypeAbstract#toString() - */ @Override public String toString() { String result = getName(); Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/VariableImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/VariableImpl.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/VariableImpl.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -122,7 +122,7 @@ @Override public String toString() { - String result = null; + String result; try { TopiaEntity entity = getTopiaContext().findByTopiaId(getEntityId()); result = BeanUtils.getProperty(entity, "name"); Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -60,9 +60,6 @@ } } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.entities.FisheryRegionAbstract#toString() - */ @Override public String toString() { String result = getName(); Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/ZoneImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/ZoneImpl.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/ZoneImpl.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -55,9 +55,6 @@ } } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.entities.FisheryRegionAbstract#toString() - */ @Override public String toString() { String result = getName(); Modified: trunk/src/main/java/fr/ifremer/isisfish/logging/LogLevelUtil.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/logging/LogLevelUtil.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/logging/LogLevelUtil.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -67,7 +67,7 @@ } public static LogLevel[] getLogLevels(int levels) { - List<LogLevel> result = new ArrayList<LogLevel>(); + List<LogLevel> result = new ArrayList<>(); for (LogLevel logLevel : LogLevel.values()) { if (contains(logLevel.ordinal(),levels)) { // it means present @@ -88,7 +88,7 @@ * @return the sum of the mask() value of each level found, 0 if */ public static int createSet(int firstOrdinal, int... ordinals) { - List<LogLevel> levelsUsed = new ArrayList<LogLevel>(); + List<LogLevel> levelsUsed = new ArrayList<>(); int result = 0; LogLevel levelFound; levelFound = LogLevel.getLogLevel(firstOrdinal); Modified: trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -93,7 +93,7 @@ this.model = model; - this.levelsReaders = new ArrayList<LevelsLineReader>(); + this.levelsReaders = new ArrayList<>(); // create the reader directory File logFile = model.getLogFile(); Modified: trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleModel.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleModel.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -41,9 +41,6 @@ */ public class LogConsoleModel { - /** to use log facility, just put in your code: log.info(\"...\"); */ - //static private Log log = LogFactory.getLog(LogConsoleModel.class); - /** the maximum number of items to display in ui */ protected int nbLinesInEditor; @@ -79,7 +76,7 @@ public LogConsoleModel(File logFile, int nbLinesInEditor, String smtpServer, String fromMail, String to) { this.nbLinesInEditor = nbLinesInEditor; this.listenerList = new EventListenerList(); - this.allItems = new ArrayList<String>(); + this.allItems = new ArrayList<>(); this.logFile = logFile; this.smtpServer = smtpServer; Modified: trunk/src/main/java/fr/ifremer/isisfish/logging/io/LineReader.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/logging/io/LineReader.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/logging/io/LineReader.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -93,8 +93,6 @@ try { reader = new RandomAccessFile(this.file, "r"); offstReader.open(this); - } catch (FileNotFoundException e) { - throw new IllegalArgumentException(e); } catch (IOException e) { throw new IllegalArgumentException(e); } Modified: trunk/src/main/java/fr/ifremer/isisfish/logging/io/LineReaderUtil.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/logging/io/LineReaderUtil.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/logging/io/LineReaderUtil.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -110,7 +110,7 @@ public LevelsLineReader(File file, OffsetReader offsetReader, LogLevel... level) { super(file, offsetReader); - levels = new ArrayList<String>(); + levels = new ArrayList<>(); for (LogLevel logLevel : level) { levels.add(logLevel.toString()); } @@ -118,7 +118,7 @@ public LevelsLineReader(LineReader parent, OffsetReader offsetReader, LogLevel... levels) { super(parent, offsetReader); - this.levels = new ArrayList<String>(); + this.levels = new ArrayList<>(); for (LogLevel level : levels) { if (!this.levels.contains(level.toString())) { this.levels.add(level.toString()); Modified: trunk/src/main/java/fr/ifremer/isisfish/logging/io/MemoryOffsetReader.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/logging/io/MemoryOffsetReader.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/logging/io/MemoryOffsetReader.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -52,7 +52,7 @@ public MemoryOffsetReader(int capacity) { super(); this.capacity = capacity; - this.offsetCache = new TreeMap<Long, Long>(); + this.offsetCache = new TreeMap<>(); } public void close() throws IOException { Modified: trunk/src/main/java/fr/ifremer/isisfish/logging/io/OffsetReader.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/logging/io/OffsetReader.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/logging/io/OffsetReader.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -157,7 +157,7 @@ private static Pattern LOG_ENTRY_PATTERN = Pattern.compile("(WARN|ERROR|INFO|DEBUG|TRACE).*"); protected boolean isLogEntry(String line) throws IOException { - boolean result = false; + boolean result; int index = line.indexOf('|'); if (index == -1) { return false; Modified: trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -126,7 +126,7 @@ // Recupere le vecteur de tous les carres possibles. List<OMGraphic> allRect = graphics.getTargets(); - List<LatLonPoint> result = new ArrayList<LatLonPoint>(); + List<LatLonPoint> result = new ArrayList<>(); // Parcours le vecteur de tous les carres possibles. for (OMGraphic rectg : allRect) { Modified: trunk/src/main/java/fr/ifremer/isisfish/map/DataMapInfo.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/map/DataMapInfo.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/map/DataMapInfo.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -42,7 +42,7 @@ /** serialVersionUID. */ private static final long serialVersionUID = -8530276186766231164L; - protected List<String> labels = new ArrayList<String>(); + protected List<String> labels = new ArrayList<>(); public DataMapInfo() { } Modified: trunk/src/main/java/fr/ifremer/isisfish/map/DataMapList.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/map/DataMapList.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/map/DataMapList.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -56,7 +56,7 @@ protected DataMapInfo info; - protected Vector<DataMap> dataMap = new Vector<DataMap>(); + protected Vector<DataMap> dataMap = new Vector<>(); protected Scale scale; @@ -97,7 +97,7 @@ * @return Get all the data map of this list */ public List<DataMap> getDataMaps(Coordinate c) { - List<DataMap> v = new ArrayList<DataMap>(); + List<DataMap> v = new ArrayList<>(); DataMap dm; for (Object aDataMap : dataMap) { dm = (DataMap) aDataMap; Modified: trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -95,7 +95,7 @@ protected float minLongitude; protected float maxLongitude; - protected List<MapMouseListener> orderedListener = new ArrayList<MapMouseListener>(); + protected List<MapMouseListener> orderedListener = new ArrayList<>(); protected LayerHandler layerHandler = new LayerHandler(); protected MapMouseMode currentMouseMode; protected MouseDelegator md; @@ -219,7 +219,7 @@ */ public List<Cell> getSelectedCells() { try { - List<Cell> result = new ArrayList<Cell>(); + List<Cell> result = new ArrayList<>(); List<LatLonPoint> pts = activeSelectionLayer.getSelected(); for (LatLonPoint llp : pts) { List<Cell> cells = null; Modified: trunk/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -130,8 +130,8 @@ return; } - Vector<float[]> latitude = new Vector<float[]>(); - Vector<float[]> longitude = new Vector<float[]>(); + Vector<float[]> latitude = new Vector<>(); + Vector<float[]> longitude = new Vector<>(); float pasMailleLatitude = 0f; float pasMailleLongitude = 0f; Modified: trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -179,9 +179,6 @@ graphics.render(g); } - /* - * @see org.nuiton.topia.event.TopiaTransactionListener#commit(org.nuiton.topia.event.TopiaTransactionEvent) - */ @Override public void commit(TopiaTransactionEvent event) { for (TopiaEntity e : event.getEntities()) { @@ -194,9 +191,6 @@ } } - /* - * @see org.nuiton.topia.event.TopiaTransactionListener#rollback(org.nuiton.topia.event.TopiaTransactionEvent) - */ @Override public void rollback(TopiaTransactionEvent event) { // nothing to do Modified: trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -134,7 +134,7 @@ */ public static DesignPlan getDesignPlanFromXML(File xmlFile, TopiaContext topiaContext) throws IOException { - DesignPlan designPlan = null; + DesignPlan designPlan; try { SAXReader reader = new SAXReader(); // don't use reader.read(String); @@ -293,8 +293,8 @@ String name = mxElement.attributeValue("name"); // get dimension names and semantics - List<String> dimNames = new ArrayList<String>(); - List<List<?>> semantics = new ArrayList<List<?>>(); + List<String> dimNames = new ArrayList<>(); + List<List<?>> semantics = new ArrayList<>(); List<Element> dimensionElements = mxElement.elements("dimension"); for (Element dimensionElement : dimensionElements) { @@ -302,7 +302,7 @@ dimNames.add(dimName); // parse sub semantics - List<Object> semantic = new ArrayList<Object>(); + List<Object> semantic = new ArrayList<>(); List<Element> labelElements = dimensionElement.elements("label"); for (Element labelElement : labelElements) { String content = labelElement.getText(); @@ -446,7 +446,7 @@ * @return rules as xml */ public static List<Rule> getRulesFromXml(Element rulesElement, TopiaContext topiaContext) { - List<Rule> rules = new ArrayList<Rule>(); + List<Rule> rules = new ArrayList<>(); List<Element> ruleElements = rulesElement.elements("rule"); for (Element ruleElement : ruleElements) { String name = ruleElement.attributeValue("name"); Modified: trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionEntityVisitor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionEntityVisitor.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionEntityVisitor.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -54,9 +54,6 @@ super(delegateVisitor); } - /* - * @see org.nuiton.topia.persistence.EntityVisitor#visit(org.nuiton.topia.persistence.TopiaEntity, java.lang.String, java.lang.Class, java.lang.Object) - */ @Override public void visit(TopiaEntity e, String name, Class<?> type, Object value) { // si c'est une entité Modified: trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -72,9 +72,6 @@ this.outputFile = outputFile; } - /* - * @see fr.ifremer.isisfish.mexico.export.RegionExport#beginExport() - */ @Override public void beginExport() { stringBuffer = new StringBuffer(); @@ -82,17 +79,11 @@ stringBuffer.append("<factors>"); } - /* - * @see org.nuiton.topia.persistence.EntityVisitor#start(org.nuiton.topia.persistence.TopiaEntity) - */ @Override public void start(TopiaEntity entity) { lastReadName = null; } - /* - * @see org.nuiton.topia.persistence.EntityVisitor#visit(org.nuiton.topia.persistence.TopiaEntity, java.lang.String, java.lang.Class, java.lang.Object) - */ @Override public void visit(TopiaEntity entity, String propertyName, Class<?> type, Object value) { @@ -130,9 +121,6 @@ } } - /* - * @see org.nuiton.topia.persistence.EntityVisitor#visit(org.nuiton.topia.persistence.TopiaEntity, java.lang.String, java.lang.Class, java.lang.Class, java.lang.Object) - */ @Override public void visit(TopiaEntity entity, String propertyName, Class<?> collectionType, Class<?> type, Object value) { @@ -139,9 +127,6 @@ visit(entity, propertyName, type, value); } - /* - * @see org.nuiton.topia.persistence.EntityVisitor#visit(org.nuiton.topia.persistence.TopiaEntity, java.lang.String, java.lang.Class, java.lang.Class, int, java.lang.Object) - */ @Override public void visit(TopiaEntity entity, String propertyName, Class<?> collectionType, Class<?> type, int index, Object value) { @@ -148,25 +133,16 @@ } - /* - * @see org.nuiton.topia.persistence.EntityVisitor#end(org.nuiton.topia.persistence.TopiaEntity) - */ @Override public void end(TopiaEntity entity) { } - /* - * @see org.nuiton.topia.persistence.EntityVisitor#clear() - */ @Override public void clear() { } - /* - * @see fr.ifremer.isisfish.mexico.export.RegionExport#endExport() - */ @Override public void endExport() { stringBuffer.append("</factors>"); Modified: trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -84,9 +84,6 @@ } - /* - * @see fr.ifremer.isisfish.simulator.sensitivity.visitor.DomainVisitor#end(fr.ifremer.isisfish.simulator.sensitivity.Domain) - */ @Override public void end(Domain domain) { xmlBuffer.append("</domain>"); Modified: trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -40,9 +40,6 @@ */ public class DiscreteDomainXMLVisitor extends DomainXMLVisitor { - /* - * @see fr.ifremer.isisfish.simulator.sensitivity.visitor.DomainVisitor#start(fr.ifremer.isisfish.simulator.sensitivity.Domain) - */ @Override public void start(Domain domain) { DiscreteDomain discreteDomain = (DiscreteDomain)domain; @@ -77,9 +74,6 @@ xmlBuffer.append("</level>"); } - /* - * @see fr.ifremer.isisfish.simulator.sensitivity.visitor.DomainVisitor#end(fr.ifremer.isisfish.simulator.sensitivity.Domain) - */ @Override public void end(Domain domain) { xmlBuffer.append("</domain>"); Modified: trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -590,7 +590,7 @@ protected static FactorGroup parseFactorGroupV3(Element fgElement, TopiaContext topiaContext) { FactorGroup rootGroup = new FactorGroup(null); // root group - Map<String, FactorGroup> groups = new HashMap<String, FactorGroup>(); + Map<String, FactorGroup> groups = new HashMap<>(); // normal factors List<Element> factorElements = fgElement.elements("factor"); Modified: trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorGroupXMLVisitor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorGroupXMLVisitor.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorGroupXMLVisitor.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -40,17 +40,11 @@ */ public class FactorGroupXMLVisitor extends AbstractXMLVisitor implements FactorGroupVisitor { - /* - * @see fr.ifremer.isisfish.simulator.sensitivity.visitor.FactorGroupVisitor#start(fr.ifremer.isisfish.simulator.sensitivity.FactorGroup) - */ @Override public void start(FactorGroup factorGroup) { } - /* - * @see fr.ifremer.isisfish.simulator.sensitivity.visitor.FactorGroupVisitor#visit(fr.ifremer.isisfish.simulator.sensitivity.FactorGroup, fr.ifremer.isisfish.simulator.sensitivity.Factor) - */ @Override public void visit(FactorGroup factorGroup, Factor factor) { if (factor instanceof FactorGroup) { @@ -64,9 +58,6 @@ } } - /* - * @see fr.ifremer.isisfish.simulator.sensitivity.visitor.FactorGroupVisitor#end(fr.ifremer.isisfish.simulator.sensitivity.FactorGroup) - */ @Override public void end(FactorGroup factorGroup) { Modified: trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -58,9 +58,6 @@ this.group = group; } - /* - * @see fr.ifremer.isisfish.simulator.sensitivity.visitor.FactorVisitor#start(fr.ifremer.isisfish.simulator.sensitivity.Factor) - */ @Override public void start(Factor factor) { @@ -100,9 +97,6 @@ } } - /* - * @see fr.ifremer.isisfish.simulator.sensitivity.visitor.FactorVisitor#visit(fr.ifremer.isisfish.simulator.sensitivity.Domain) - */ @Override public void visit(Factor factor, Domain domain) { DomainXMLVisitor visitor = null; @@ -119,9 +113,6 @@ xmlBuffer.append(visitor.getXML()); } - /* - * @see fr.ifremer.isisfish.simulator.sensitivity.visitor.FactorVisitor#end(fr.ifremer.isisfish.simulator.sensitivity.Factor) - */ @Override public void end(Factor factor) { xmlBuffer.append("</factor>"); Modified: trunk/src/main/java/fr/ifremer/isisfish/rule/AbstractRule.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/rule/AbstractRule.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/rule/AbstractRule.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -46,19 +46,13 @@ */ public abstract class AbstractRule implements Rule { - protected transient Map<String, Object> values = new HashMap<String, Object>(); + protected transient Map<String, Object> values = new HashMap<>(); - /* - * @see fr.ifremer.isisfish.rule.Rule#getValue(java.lang.String) - */ @Override public Object getValue(String name) { return values.get(name); } - /* - * @see fr.ifremer.isisfish.rule.Rule#setValue(java.lang.String, java.lang.Object) - */ @Override public void setValue(String name, Object value) { values.put(name, value); Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/Historic.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/Historic.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/Historic.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -50,10 +50,8 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(Historic.class); - - protected String id; - protected Map<Integer, Experience> experiences = new LinkedHashMap<Integer, Experience>(); + protected Map<Integer, Experience> experiences = new LinkedHashMap<>(); public Historic(String id) { this.id = id; @@ -145,7 +143,7 @@ public static class Experience { - Map<String, Double> values = new HashMap<String, Double>(); + Map<String, Double> values = new HashMap<>(); public Experience() { } Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -72,9 +72,9 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ private static Log log = LogFactory.getLog(MetierMonitor.class); - protected Set<Metier> forbiddenMetier = new HashSet<Metier>(); + protected Set<Metier> forbiddenMetier = new HashSet<>(); protected Set<MultiKey<Object>> forbiddenMetierMonth = new HashSet<>(); - protected Map<TimeStep, MatrixND> noActivity = new HashMap<TimeStep, MatrixND>(); + protected Map<TimeStep, MatrixND> noActivity = new HashMap<>(); /** * clear all data @@ -148,12 +148,12 @@ MatrixND result = getNoActivity(step); if (result == null){ if (strategies.size() == 0) { - strategies = new ArrayList<Strategy>(); + strategies = new ArrayList<>(); strategies.add(null); } if (metiers.size() == 0) { - metiers = new ArrayList<Metier>(); + metiers = new ArrayList<>(); metiers.add(null); } @@ -257,7 +257,7 @@ /** * @param metier - * @param i + * @param month * @return proportion month */ private double computeProportionMonth(Metier metier, Month month) { @@ -265,9 +265,8 @@ try { TopiaContext tx = metier.getTopiaContext(); - List<StrategyMonthInfo> res = null; // FIXME, c faux car il ne faut prendre que les str selectionnée pour la simulation - res = tx.findAll("select * from fr.ifremer.isisfish.entities.StrategyMonthInfo where strategyMonthInfo.month=?", + List<StrategyMonthInfo> res = tx.findAll("select * from fr.ifremer.isisfish.entities.StrategyMonthInfo where strategyMonthInfo.month=?", month, metier); for(StrategyMonthInfo smi : res){ @@ -294,7 +293,7 @@ // strategies = Regle_libUtil.getStrategiesMetier(metier); // Je l'ai traduit avec ce qui suit TopiaContext tx = metier.getTopiaContext(); - List<SetOfVessels> res = null; + List<SetOfVessels> res; // FIXME, c faux car il ne faut prendre que les str selectionnée pour la simulation res = tx.findAll("select setOfVessels from fr.ifremer.isisfish.entities.EffortDescription where possibleMetiers=?", metier); Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContextInternal.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContextInternal.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/OptimizationContextInternal.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -46,8 +46,7 @@ protected SimulationJob job; protected int generationNumber = 0; - protected List<List<SimulationStorage>> generations = - new ArrayList<List<SimulationStorage>>(); + protected List<List<SimulationStorage>> generations = new ArrayList<>(); /** Simulation to do during next generation simulation */ protected List<SimulationStorage> nextSimulations; @@ -60,7 +59,7 @@ @Override public List<SimulationStorage> getNextSimulations() { if (nextSimulations == null) { - nextSimulations = new ArrayList<SimulationStorage>(); + nextSimulations = new ArrayList<>(); } return nextSimulations; } @@ -129,7 +128,7 @@ public SimulationStorage newSimulation(Factor ... factors) { SimulationStorage s = newSimulation(); - Collection<Factor> colFactors = new ArrayList<Factor>(); + Collection<Factor> colFactors = new ArrayList<>(); Collections.addAll(colFactors, factors); String script = FactorHelper.generatePreScript(colFactors); Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -98,8 +98,7 @@ * @param pops */ public void init(List<Population> pops) { - this.pops = Collections - .unmodifiableList(new ArrayList<Population>(pops)); + this.pops = Collections.unmodifiableList(new ArrayList<>(pops)); for (Population pop : this.pops) { reproductions.put(pop, new HashMap<TimeStep, ReproductionData>()); } @@ -507,7 +506,7 @@ // meme si discards.get(pop) != null // replace toujours le précédent MatrixND tmp = discard.copy(); - discards.put(pop, new AbstractMap.SimpleEntry<TimeStep, MatrixND>(step, tmp)); + discards.put(pop, new AbstractMap.SimpleEntry<>(step, tmp)); } /** Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -62,7 +62,7 @@ static private Log log = LogFactory.getLog(ResultManager.class); protected SimulationContext context = null; - protected Set<SimulationResultListener> listeners = new LinkedHashSet<SimulationResultListener>(); + protected Set<SimulationResultListener> listeners = new LinkedHashSet<>(); protected SimulationResultGetter getter = null; /** result enabled */ Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/RuleMonitor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/RuleMonitor.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/RuleMonitor.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -44,7 +44,7 @@ */ public class RuleMonitor { - protected MultiKeyMap<Object, Boolean> evalutionCondition = new MultiKeyMap<Object, Boolean>(); + protected MultiKeyMap<Object, Boolean> evalutionCondition = new MultiKeyMap<>(); public boolean getEvalutionCondition(TimeStep step, Rule rule, Metier metier) { return this.evalutionCondition.get(step, rule, metier); Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -82,7 +82,7 @@ /** configuration for current simulation (some value of config is overwrited for simulation) */ protected ApplicationConfig config; - protected Map<String, Object> values = new HashMap<String, Object>(); + protected Map<String, Object> values = new HashMap<>(); protected SimulationStorage simulation = null; protected SimulationControl simulationControl = null; protected PopulationMonitor populationMonitor = null; @@ -89,7 +89,7 @@ protected MetierMonitor metierMonitor = null; protected RuleMonitor ruleMonitor = null; protected ResultManager resultManager = null; - protected Set<SimulationListener> simulationListeners = new LinkedHashSet<SimulationListener>(); + protected Set<SimulationListener> simulationListeners = new LinkedHashSet<>(); protected PropertyChangeListener stepListener = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { @@ -141,10 +141,10 @@ protected TopiaContext dbResult = null; /** CacheAspect des variables d'entités. Topia id > map of attributes. */ - protected Map<TopiaEntity, SimulationVariable> variablesCache = new HashMap<TopiaEntity, SimulationVariable>(); + protected Map<TopiaEntity, SimulationVariable> variablesCache = new HashMap<>(); /** Context value used in equation. */ - protected Map<String, Double> contextEquationValue = new HashMap<String, Double>(); + protected Map<String, Double> contextEquationValue = new HashMap<>(); private static ThreadLocal<SimulationContext> simulationContext = new ThreadLocal<SimulationContext>() { protected synchronized SimulationContext initialValue() { Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -402,9 +402,7 @@ } } - /* - * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent) - */ + @Override public void propertyChange(PropertyChangeEvent e) { if (!inUpdateFromProperties) { if (isAutoSaveState() && getSimulation() != null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -177,11 +177,8 @@ } - protected Map<ExportInfo, ExportContext> allExports = new HashMap<ExportInfo, ExportContext>(); + protected Map<ExportInfo, ExportContext> allExports = new HashMap<>(); - /* - * @see fr.ifremer.isisfish.simulator.SimulationListener#beforeSimulation(fr.ifremer.isisfish.simulator.SimulationContext) - */ @Override public void beforeSimulation(SimulationContext context) { SimulationStorage simulation = context.getSimulationStorage(); Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -93,7 +93,7 @@ throw new IsisFishRuntimeException("Can't cache param to disk", eee); } - ref = new SoftReference<SimulationParameter>(param); + ref = new SoftReference<>(param); } protected void store(SimulationParameter param) { @@ -120,7 +120,7 @@ prop.load(reader); result = new SimulationParameterImpl(); result.fromProperties(prop); - ref = new SoftReference<SimulationParameter>(result); + ref = new SoftReference<>(result); } catch (IOException eee) { throw new IsisFishRuntimeException("Can't cache param to disk", eee); } finally { @@ -131,9 +131,6 @@ return result; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#check() - */ @Override public List<String> check() { SimulationParameter param = getParam(); @@ -140,9 +137,6 @@ return param.check(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getIsisFishVersion() - */ @Override public String getIsisFishVersion() { SimulationParameter param = getParam(); @@ -149,9 +143,6 @@ return param.getIsisFishVersion(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setIsisFishVersion(java.lang.String) - */ @Override public void setIsisFishVersion(String isisFishVersion) { SimulationParameter param = getParam(); @@ -159,9 +150,6 @@ store(param); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getDescription() - */ @Override public String getDescription() { SimulationParameter param = getParam(); @@ -168,9 +156,6 @@ return param.getDescription(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setDescription(java.lang.String) - */ @Override public void setDescription(String description) { SimulationParameter param = getParam(); @@ -178,9 +163,6 @@ store(param); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getRegion() - */ @Override public RegionStorage getRegion() { SimulationParameter param = getParam(); @@ -187,9 +169,6 @@ return param.getRegion(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getNumberOf(fr.ifremer.isisfish.entities.Population) - */ @Override public MatrixND getNumberOf(Population pop) { SimulationParameter param = getParam(); @@ -196,9 +175,6 @@ return param.getNumberOf(pop); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getExtraRules() - */ @Override public List<String> getExtraRules() { SimulationParameter param = getParam(); @@ -205,9 +181,6 @@ return param.getExtraRules(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#addExtraRules(java.lang.String[]) - */ @Override public void addExtraRules(String... extraRules) { SimulationParameter param = getParam(); @@ -215,9 +188,6 @@ store(param); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getPopulations() - */ @Override public List<Population> getPopulations() { SimulationParameter param = getParam(); @@ -224,9 +194,6 @@ return param.getPopulations(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setPopulations(java.util.List) - */ @Override public void setPopulations(List<Population> populations) { SimulationParameter param = getParam(); @@ -234,9 +201,6 @@ store(param); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getStrategies() - */ @Override public List<Strategy> getStrategies() { SimulationParameter param = getParam(); @@ -243,9 +207,6 @@ return param.getStrategies(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setStrategies(java.util.List) - */ @Override public void setStrategies(List<Strategy> strategies) { SimulationParameter param = getParam(); @@ -253,9 +214,6 @@ store(param); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#addSimulationPlan(fr.ifremer.isisfish.simulator.SimulationPlan) - */ @Override public void addSimulationPlan(SimulationPlan plan) { SimulationParameter param = getParam(); @@ -263,9 +221,6 @@ store(param); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#removeSimulationPlan(fr.ifremer.isisfish.simulator.SimulationPlan) - */ @Override public boolean removeSimulationPlan(SimulationPlan plan) { SimulationParameter param = getParam(); @@ -274,9 +229,6 @@ return result; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getSimulationPlans() - */ @Override public List<SimulationPlan> getSimulationPlans() { SimulationParameter param = getParam(); @@ -283,9 +235,6 @@ return param.getSimulationPlans(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setSimulationPlans(java.util.List) - */ @Override public void setSimulationPlans(List<SimulationPlan> plans) { SimulationParameter param = getParam(); @@ -293,9 +242,6 @@ store(param); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isIndependentPlan() - */ @Override public boolean isIndependentPlan() { SimulationParameter param = getParam(); @@ -302,9 +248,6 @@ return param.isIndependentPlan(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#clearPlans() - */ @Override public void clearPlans() { SimulationParameter param = getParam(); @@ -312,9 +255,6 @@ store(param); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#addRule(fr.ifremer.isisfish.rule.Rule) - */ @Override public void addRule(Rule rule) { SimulationParameter param = getParam(); @@ -322,9 +262,6 @@ store(param); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#removeRule(fr.ifremer.isisfish.rule.Rule) - */ @Override public boolean removeRule(Rule rule) { SimulationParameter param = getParam(); @@ -333,9 +270,6 @@ return result; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getRules() - */ @Override public List<Rule> getRules() { SimulationParameter param = getParam(); @@ -342,9 +276,6 @@ return param.getRules(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setRules(java.util.List) - */ @Override public void setRules(List<Rule> rules) { SimulationParameter param = getParam(); @@ -352,9 +283,6 @@ store(param); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#clearRules() - */ @Override public void clearRules() { SimulationParameter param = getParam(); @@ -362,9 +290,6 @@ store(param); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getUseOptimization() - */ @Override public boolean getUseOptimization() { SimulationParameter param = getParam(); @@ -371,9 +296,6 @@ return param.getUseOptimization(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setUseOptimization(boolean) - */ @Override public void setUseOptimization(boolean useOptimization) { SimulationParameter param = getParam(); @@ -381,9 +303,6 @@ store(param); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getUseStatistic() - */ @Override public boolean getUseStatistic() { SimulationParameter param = getParam(); @@ -390,9 +309,6 @@ return param.getUseStatistic(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setUseStatistic(boolean) - */ @Override public void setUseStatistic(boolean useStatistic) { SimulationParameter param = getParam(); @@ -400,9 +316,6 @@ store(param); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getExportNames() - */ @Override public List<String> getExportNames() { SimulationParameter param = getParam(); @@ -409,9 +322,6 @@ return param.getExportNames(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setExportNames(java.util.List) - */ @Override public void setExportNames(List<String> exportNames) { SimulationParameter param = getParam(); @@ -419,9 +329,6 @@ store(param); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getNumberOfSensitivitySimulation() - */ @Override public int getNumberOfSensitivitySimulation() { SimulationParameter param = getParam(); @@ -428,9 +335,6 @@ return param.getNumberOfSensitivitySimulation(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setNumberOfSensitivitySimulation(int) - */ @Override public void setNumberOfSensitivitySimulation( int numberOfSensitivitySimulation) { @@ -439,9 +343,6 @@ store(param); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getSensitivityAnalysis() - */ @Override public SensitivityAnalysis getSensitivityAnalysis() { SimulationParameter param = getParam(); @@ -448,9 +349,6 @@ return param.getSensitivityAnalysis(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setSensitivityAnalysis(fr.ifremer.isisfish.simulator.sensitivity.SensitivityAnalysis) - */ @Override public void setSensitivityAnalysis(SensitivityAnalysis sensitivityAnalysis) { SimulationParameter param = getParam(); @@ -458,9 +356,6 @@ store(param); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getSensitivityExport() - */ @Override public List<SensitivityExport> getSensitivityExport() { SimulationParameter param = getParam(); @@ -467,9 +362,6 @@ return param.getSensitivityExport(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setSensitivityExport(java.util.List) - */ @Override public void setSensitivityExport(List<SensitivityExport> sensitivityExport) { SimulationParameter param = getParam(); @@ -477,9 +369,6 @@ store(param); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getUseSimulationPlan() - */ @Override public boolean getUseSimulationPlan() { SimulationParameter param = getParam(); @@ -486,9 +375,6 @@ return param.getUseSimulationPlan(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setUseSimulationPlan(boolean) - */ @Override public void setUseSimulationPlan(boolean useSimulationPlan) { SimulationParameter param = getParam(); @@ -496,9 +382,6 @@ store(param); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getSimualtionPlanNumber() - */ @Override public int getSimulationPlanNumber() { SimulationParameter param = getParam(); @@ -505,9 +388,6 @@ return param.getSimulationPlanNumber(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setSimulationPlanNumber(int) - */ @Override public void setSimulationPlanNumber(int simulationPlanNumber) { SimulationParameter param = getParam(); @@ -521,9 +401,6 @@ return param.getOptimizationGeneration(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setSimulationPlanNumber(int) - */ @Override public void setOptimizationGeneration(int optimizationGeneration) { SimulationParameter param = getParam(); @@ -537,9 +414,6 @@ return param.getOptimizationGenerationIndividual(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setSimulationPlanNumber(int) - */ @Override public void setOptimizationGenerationIndividual(int optimizationGenerationIndividual) { SimulationParameter param = getParam(); @@ -573,9 +447,6 @@ store(param); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getNumberOfYear() - */ @Override public int getNumberOfYear() { SimulationParameter param = getParam(); @@ -582,20 +453,13 @@ return param.getNumberOfYear(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setNumberOfYear(int) - */ @Override public void setNumberOfYear(int numberOfYear) { SimulationParameter param = getParam(); param.setNumberOfYear(numberOfYear); store(param); - } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getNumberOfMonths() - */ @Override public int getNumberOfMonths() { SimulationParameter param = getParam(); @@ -602,20 +466,13 @@ return param.getNumberOfMonths(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setNumberOfMonths(int) - */ @Override public void setNumberOfMonths(int numberOfMonths) { SimulationParameter param = getParam(); param.setNumberOfMonths(numberOfMonths); store(param); - } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getUsePreScript() - */ @Override public boolean getUsePreScript() { SimulationParameter param = getParam(); @@ -622,20 +479,13 @@ return param.getUsePreScript(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setUsePreScript(boolean) - */ @Override public void setUsePreScript(boolean usePreScript) { SimulationParameter param = getParam(); param.setUsePreScript(usePreScript); store(param); - } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getPreScript() - */ @Override public String getPreScript() { SimulationParameter param = getParam(); @@ -642,20 +492,13 @@ return param.getPreScript(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setPreScript(java.lang.String) - */ @Override public void setPreScript(String preScript) { SimulationParameter param = getParam(); param.setPreScript(preScript); store(param); - } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getGeneratedPreScript() - */ @Override public String getGeneratedPreScript() { SimulationParameter param = getParam(); @@ -662,9 +505,6 @@ return param.getGeneratedPreScript(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setGeneratedPreScript(java.lang.String) - */ @Override public void setGeneratedPreScript(String preScript) { SimulationParameter param = getParam(); @@ -672,9 +512,6 @@ store(param); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getRegionName() - */ @Override public String getRegionName() { SimulationParameter param = getParam(); @@ -681,20 +518,13 @@ return param.getRegionName(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setRegionName(java.lang.String) - */ @Override public void setRegionName(String regionName) { SimulationParameter param = getParam(); param.setRegionName(regionName); store(param); - } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getSimulatorName() - */ @Override public String getSimulatorName() { SimulationParameter param = getParam(); @@ -701,20 +531,13 @@ return param.getSimulatorName(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setSimulatorName(java.lang.String) - */ @Override public void setSimulatorName(String simulatorName) { SimulationParameter param = getParam(); param.setSimulatorName(simulatorName); store(param); - } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getResultEnabled() - */ @Override public Collection<String> getResultEnabled() { SimulationParameter param = getParam(); @@ -721,20 +544,13 @@ return param.getResultEnabled(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setResultEnabled(java.util.Collection) - */ @Override public void setResultEnabled(Collection<String> resultEnabled) { SimulationParameter param = getParam(); param.setResultEnabled(resultEnabled); store(param); - } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getTagValue() - */ @Override public Map<String, String> getTagValue() { SimulationParameter param = getParam(); @@ -741,20 +557,13 @@ return param.getTagValue(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setTagValue(java.util.Map) - */ @Override public void setTagValue(Map<String, String> tagValue) { SimulationParameter param = getParam(); param.setTagValue(tagValue); store(param); - } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getSimulLogLevel() - */ @Override public String getSimulLogLevel() { SimulationParameter param = getParam(); @@ -761,20 +570,13 @@ return param.getSimulLogLevel(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setSimulLogLevel(java.lang.String) - */ @Override public void setSimulLogLevel(String logLevel) { SimulationParameter param = getParam(); param.setSimulLogLevel(logLevel); store(param); - } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getScriptLogLevel() - */ @Override public String getScriptLogLevel() { SimulationParameter param = getParam(); @@ -781,20 +583,13 @@ return param.getScriptLogLevel(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setScriptLogLevel(java.lang.String) - */ @Override public void setScriptLogLevel(String logLevel) { SimulationParameter param = getParam(); param.setScriptLogLevel(logLevel); store(param); - } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getLibLogLevel() - */ @Override public String getLibLogLevel() { SimulationParameter param = getParam(); @@ -801,20 +596,13 @@ return param.getLibLogLevel(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setLibLogLevel(java.lang.String) - */ @Override public void setLibLogLevel(String logLevel) { SimulationParameter param = getParam(); param.setLibLogLevel(logLevel); store(param); - } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isSimulErrorLevel() - */ @Override public boolean isSimulErrorLevel() { SimulationParameter param = getParam(); @@ -821,9 +609,6 @@ return param.isSimulErrorLevel(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isSimulWarnLevel() - */ @Override public boolean isSimulWarnLevel() { SimulationParameter param = getParam(); @@ -830,9 +615,6 @@ return param.isSimulErrorLevel(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isSimulInfoLevel() - */ @Override public boolean isSimulInfoLevel() { SimulationParameter param = getParam(); @@ -839,9 +621,6 @@ return param.isScriptInfoLevel(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isSimulDebugLevel() - */ @Override public boolean isSimulDebugLevel() { SimulationParameter param = getParam(); @@ -848,9 +627,6 @@ return param.isSimulDebugLevel(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isScriptErrorLevel() - */ @Override public boolean isScriptErrorLevel() { SimulationParameter param = getParam(); @@ -857,9 +633,6 @@ return param.isScriptErrorLevel(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isScriptWarnLevel() - */ @Override public boolean isScriptWarnLevel() { SimulationParameter param = getParam(); @@ -866,9 +639,6 @@ return param.isScriptWarnLevel(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isScriptInfoLevel() - */ @Override public boolean isScriptInfoLevel() { SimulationParameter param = getParam(); @@ -875,9 +645,6 @@ return param.isScriptInfoLevel(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isScriptDebugLevel() - */ @Override public boolean isScriptDebugLevel() { SimulationParameter param = getParam(); @@ -884,9 +651,6 @@ return param.isScriptDebugLevel(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isLibErrorLevel() - */ @Override public boolean isLibErrorLevel() { SimulationParameter param = getParam(); @@ -893,9 +657,6 @@ return param.isLibErrorLevel(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isLibWarnLevel() - */ @Override public boolean isLibWarnLevel() { SimulationParameter param = getParam(); @@ -902,9 +663,6 @@ return param.isLibWarnLevel(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isLibInfoLevel() - */ @Override public boolean isLibInfoLevel() { SimulationParameter param = getParam(); @@ -911,9 +669,6 @@ return param.isLibInfoLevel(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isLibDebugLevel() - */ @Override public boolean isLibDebugLevel() { SimulationParameter param = getParam(); @@ -920,18 +675,12 @@ return param.isLibDebugLevel(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isLibDebugLevel() - */ @Override public void setProperty(String key, String value) { SimulationParameter param = getParam(); param.setProperty(key, value); } - - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#copy() - */ + @Override public SimulationParameter copy() { SimulationParameter param = getParam(); @@ -938,9 +687,6 @@ return param.copy(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#deepCopy() - */ @Override public SimulationParameter deepCopy() { SimulationParameter param = getParam(); @@ -947,9 +693,6 @@ return param.deepCopy(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#toProperties() - */ @Override public Properties toProperties() { SimulationParameter param = getParam(); @@ -956,9 +699,6 @@ return param.toProperties(); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#fromProperties(java.util.Properties) - */ @Override public void fromProperties(Properties props) { SimulationParameter param = getParam(); @@ -966,9 +706,6 @@ store(param); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#reloadContextParameters() - */ @Override public void reloadContextParameters() throws TopiaException { SimulationParameter param = getParam(); Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -233,12 +233,9 @@ /** La region corespondant au parametre {@link #regionName}. */ protected transient RegionStorage region; - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#check() - */ @Override public List<String> check() { - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); // TODO faire la verif et pour chaque erreur mettre un message // dans la liste result (par exemple si pas d'effectif // pour une pop @@ -245,9 +242,6 @@ return result; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getIsisFishVersion() - */ @Override public String getIsisFishVersion() { // if not already set @@ -262,17 +256,11 @@ return isisFishVersion; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setIsisFishVersion(java.lang.String) - */ @Override public void setIsisFishVersion(String isisFishVersion) { this.isisFishVersion = isisFishVersion; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getDescription() - */ @Override public String getDescription() { @@ -288,17 +276,11 @@ return this.description; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setDescription(java.lang.String) - */ @Override public void setDescription(String description) { this.description = description; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getRegion() - */ @Override public RegionStorage getRegion() { @@ -315,13 +297,10 @@ return this.region; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getNumberOf(fr.ifremer.isisfish.entities.Population) - */ @Override public MatrixND getNumberOf(Population pop) { if (numbers == null) { - numbers = new LinkedHashMap<Population, MatrixND>(); + numbers = new LinkedHashMap<>(); } MatrixND result = numbers.get(pop); if (result == null) { @@ -345,34 +324,25 @@ return result; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getExtraRules() - */ @Override public List<String> getExtraRules() { if (extraRules == null) { // no properties in config ? - extraRules = new ArrayList<String>(); + extraRules = new ArrayList<>(); } return extraRules; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#addExtraRules(java.lang.String) - */ @Override public void addExtraRules(String... extraRules) { getExtraRules().addAll(Arrays.asList(extraRules)); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getPopulations() - */ @Override public List<Population> getPopulations() { if (populations == null) { - populations = new ArrayList<Population>(); + populations = new ArrayList<>(); if (propertiesParameters != null) { @@ -429,26 +399,20 @@ return populations; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setPopulations(java.util.List) - */ @Override public void setPopulations(List<Population> populations) { this.populations = populations; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getStrategies() - */ @Override public List<Strategy> getStrategies() { if (strategies == null) { - strategies = new ArrayList<Strategy>(); + strategies = new ArrayList<>(); if (propertiesParameters != null) { - strategies = new ArrayList<Strategy>(); + strategies = new ArrayList<>(); try { @@ -499,38 +463,26 @@ return strategies; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setStrategies(java.util.List) - */ @Override public void setStrategies(List<Strategy> strategies) { this.strategies = strategies; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#addSimulationPlan(fr.ifremer.isisfish.simulator.SimulationPlan) - */ @Override public void addSimulationPlan(SimulationPlan plan) { getSimulationPlans().add(plan); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#removeSimulationPlan(fr.ifremer.isisfish.simulator.SimulationPlan) - */ @Override public boolean removeSimulationPlan(SimulationPlan plan) { return getSimulationPlans().remove(plan); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getSimulationPlans() - */ @Override public List<SimulationPlan> getSimulationPlans() { if (simulationPlans == null) { - simulationPlans = new ArrayList<SimulationPlan>(); + simulationPlans = new ArrayList<>(); if (propertiesParameters != null) { // simulation plan @@ -564,17 +516,11 @@ return this.simulationPlans; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setSimulationPlans(java.util.List) - */ @Override public void setSimulationPlans(List<SimulationPlan> plans) { this.simulationPlans = plans; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isIndependentPlan() - */ @Override public boolean isIndependentPlan() { boolean result = true; @@ -587,9 +533,6 @@ return result; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#clearPlans() - */ @Override public void clearPlans() { if (simulationPlans != null) { @@ -597,29 +540,20 @@ } } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#addRule(fr.ifremer.isisfish.rule.Rule) - */ @Override public void addRule(Rule rule) { getRules().add(rule); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#removeRule(fr.ifremer.isisfish.rule.Rule) - */ @Override public boolean removeRule(Rule rule) { return getRules().remove(rule); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getRules() - */ @Override public List<Rule> getRules() { if (rules == null) { - rules = new ArrayList<Rule>(); + rules = new ArrayList<>(); if (propertiesParameters != null) { try { @@ -672,17 +606,11 @@ return rules; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setRules(java.util.List) - */ @Override public void setRules(List<Rule> rules) { this.rules = rules; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#clearRules() - */ @Override public void clearRules() { if (rules != null) { @@ -715,9 +643,6 @@ this.useCache = useCache; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getUseStatistic() - */ @Override public boolean getUseStatistic() { @@ -731,21 +656,15 @@ return this.useStatistic; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setUseStatistic(boolean) - */ @Override public void setUseStatistic(boolean useStatistic) { this.useStatistic = useStatistic; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getExportNames() - */ @Override public List<String> getExportNames() { if (exportNames == null) { - exportNames = new ArrayList<String>(); + exportNames = new ArrayList<>(); if (propertiesParameters != null) { // exports @@ -760,17 +679,11 @@ return this.exportNames; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setExportNames(java.util.List) - */ @Override public void setExportNames(List<String> exportNames) { this.exportNames = exportNames; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getNumberOfSensitivitySimulation() - */ @Override public int getNumberOfSensitivitySimulation() { @@ -787,9 +700,6 @@ return numberOfSensitivitySimulation; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setNumberOfSensitivitySimulation(int) - */ @Override public void setNumberOfSensitivitySimulation( int numberOfSensitivitySimulation) { @@ -796,9 +706,6 @@ this.numberOfSensitivitySimulation = numberOfSensitivitySimulation; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getSensitivityAnalysis() - */ @Override public SensitivityAnalysis getSensitivityAnalysis() { @@ -827,9 +734,6 @@ return sensitivityAnalysis; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setSensitivityAnalysis(fr.ifremer.isisfish.simulator.sensitivity.SensitivityAnalysis) - */ @Override public void setSensitivityAnalysis( SensitivityAnalysis sensitivityAnalysis) { @@ -836,13 +740,10 @@ this.sensitivityAnalysis = sensitivityAnalysis; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getSensitivityExport() - */ @Override public List<SensitivityExport> getSensitivityExport() { if (sensitivityExports == null) { - sensitivityExports = new ArrayList<SensitivityExport>(); + sensitivityExports = new ArrayList<>(); if (propertiesParameters != null) { try { @@ -900,9 +801,6 @@ return sensitivityExports; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setSensitivityExport(java.util.List) - */ @Override public void setSensitivityExport(List<SensitivityExport> sensitivityExport) { this.sensitivityExports = sensitivityExport; @@ -1065,9 +963,6 @@ this.optimizationExportsObservations = optimizationExportsObservations; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getUseAnalysePlan() - */ @Override public boolean getUseSimulationPlan() { @@ -1082,17 +977,11 @@ return useSimulationPlan; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setUseAnalysePlan(boolean) - */ @Override public void setUseSimulationPlan(boolean useSimulationPlan) { this.useSimulationPlan = useSimulationPlan; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getSimulationPlanNumber() - */ @Override public int getSimulationPlanNumber() { @@ -1108,15 +997,12 @@ return simulationPlanNumber; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setSimulationPlanNumber(int) - */ @Override public void setSimulationPlanNumber(int simulationPlanNumber) { this.simulationPlanNumber = simulationPlanNumber; } - /** + /** * If this simulation is generated by Optimization, return generation number */ @Override @@ -1207,25 +1093,16 @@ this.resultDeleteAfterExport = resultDeleteAfterExport; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getNumberOfYear() - */ @Override public int getNumberOfYear() { return (int) Math.ceil((double) getNumberOfMonths() / Month.NUMBER_OF_MONTH); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setNumberOfYear(int) - */ @Override public void setNumberOfYear(int numberOfYear) { this.numberOfMonths = numberOfYear * Month.NUMBER_OF_MONTH; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getNumberOfMonths() - */ @Override public int getNumberOfMonths() { @@ -1241,17 +1118,11 @@ return numberOfMonths; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setNumberOfMonths(int) - */ @Override public void setNumberOfMonths(int numberOfMonths) { this.numberOfMonths = numberOfMonths; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getUsePreScript() - */ @Override public boolean getUsePreScript() { @@ -1267,17 +1138,11 @@ return usePreScript; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setUsePreScript(boolean) - */ @Override public void setUsePreScript(boolean usePreScript) { this.usePreScript = usePreScript; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getPreScript() - */ @Override public String getPreScript() { @@ -1293,9 +1158,6 @@ return preScript; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setPreScript(java.lang.String) - */ @Override public void setPreScript(String preScript) { this.preScript = preScript; @@ -1322,9 +1184,6 @@ this.generatedPreScript = preScript; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getRegionName() - */ @Override public String getRegionName() { @@ -1341,17 +1200,11 @@ return regionName; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setRegionName(java.lang.String) - */ @Override public void setRegionName(String regionName) { this.regionName = regionName; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getSimulatorName() - */ @Override public String getSimulatorName() { @@ -1366,17 +1219,11 @@ return simulatorName; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setSimulatorName(java.lang.String) - */ @Override public void setSimulatorName(String simulatorName) { this.simulatorName = simulatorName; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getResultEnabled() - */ @Override public Collection<String> getResultEnabled() { @@ -1407,17 +1254,11 @@ return resultEnabled; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setResultEnabled(java.util.Collection) - */ @Override public void setResultEnabled(Collection<String> resultEnabled) { this.resultEnabled = resultEnabled; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getTagValue() - */ @Override public Map<String, String> getTagValue() { @@ -1425,7 +1266,7 @@ if (propertiesParameters != null) { tagValue = SimulationParameterPropertiesHelper.getTagValue(propertiesParameters); } else { - tagValue = new LinkedHashMap<String, String>(); + tagValue = new LinkedHashMap<>(); } } @@ -1432,17 +1273,11 @@ return tagValue; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setTagValue(java.util.Map) - */ @Override public void setTagValue(Map<String, String> tagValue) { this.tagValue = tagValue; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getSimulLogLevel() - */ @Override public String getSimulLogLevel() { @@ -1459,9 +1294,6 @@ return simulLogLevel; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setSimulLogLevel(java.lang.String) - */ @Override public void setSimulLogLevel(String logLevel) { if (log.isDebugEnabled()) { @@ -1471,9 +1303,6 @@ this.simulLogLevel = logLevel; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getScriptLogLevel() - */ @Override public String getScriptLogLevel() { @@ -1489,9 +1318,6 @@ return scriptLogLevel; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setScriptLogLevel(java.lang.String) - */ @Override public void setScriptLogLevel(String logLevel) { if (log.isDebugEnabled()) { @@ -1501,9 +1327,6 @@ this.scriptLogLevel = logLevel; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#getLibLogLevel() - */ @Override public String getLibLogLevel() { if (libLogLevel == null) { @@ -1518,9 +1341,6 @@ return libLogLevel; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#setLibLogLevel(java.lang.String) - */ @Override public void setLibLogLevel(String logLevel) { if (log.isDebugEnabled()) { @@ -1529,97 +1349,61 @@ this.libLogLevel = logLevel; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isSimulErrorLevel() - */ @Override public boolean isSimulErrorLevel() { return "error".equals(getSimulLogLevel()); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isSimulWarnLevel() - */ @Override public boolean isSimulWarnLevel() { return "warn".equals(getSimulLogLevel()); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isSimulInfoLevel() - */ @Override public boolean isSimulInfoLevel() { return "info".equals(getSimulLogLevel()); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isSimulDebugLevel() - */ @Override public boolean isSimulDebugLevel() { return "debug".equals(getSimulLogLevel()); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isScriptErrorLevel() - */ @Override public boolean isScriptErrorLevel() { return "error".equals(getScriptLogLevel()); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isScriptWarnLevel() - */ @Override public boolean isScriptWarnLevel() { return "warn".equals(getScriptLogLevel()); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isScriptInfoLevel() - */ @Override public boolean isScriptInfoLevel() { return "info".equals(getScriptLogLevel()); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isScriptDebugLevel() - */ @Override public boolean isScriptDebugLevel() { return "debug".equals(getScriptLogLevel()); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isLibErrorLevel() - */ @Override public boolean isLibErrorLevel() { return "error".equals(getLibLogLevel()); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isLibWarnLevel() - */ @Override public boolean isLibWarnLevel() { return "warn".equals(getLibLogLevel()); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isLibInfoLevel() - */ @Override public boolean isLibInfoLevel() { return "info".equals(getLibLogLevel()); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#isLibDebugLevel() - */ @Override public boolean isLibDebugLevel() { return "debug".equals(getLibLogLevel()); @@ -1641,9 +1425,6 @@ propertiesParameters.setProperty(key, value); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#copy() - */ @Override public SimulationParameter copy() { SimulationParameterImpl result = new SimulationParameterImpl(); @@ -1670,19 +1451,19 @@ result.optimizationGeneration = getOptimizationGeneration(); result.optimizationGenerationIndividual = getOptimizationGenerationIndividual(); if (exportNames != null) { - result.exportNames = new LinkedList<String>(exportNames); + result.exportNames = new LinkedList<>(exportNames); } if (strategies != null) { - result.strategies = new LinkedList<Strategy>(strategies); + result.strategies = new LinkedList<>(strategies); } if (populations != null) { - result.populations = new LinkedList<Population>(populations); + result.populations = new LinkedList<>(populations); } if (rules != null) { - result.rules = new LinkedList<Rule>(rules); + result.rules = new LinkedList<>(rules); } if (simulationPlans != null) { - result.simulationPlans = new LinkedList<SimulationPlan>(simulationPlans); + result.simulationPlans = new LinkedList<>(simulationPlans); } if (objective != null) { result.objective = objective; @@ -1692,16 +1473,16 @@ result.optimization = optimization; } if (optimizationExportsObservations != null) { - result.optimizationExportsObservations = new LinkedHashMap<ExportInfo, Observation>(optimizationExportsObservations); + result.optimizationExportsObservations = new LinkedHashMap<>(optimizationExportsObservations); } if (resultEnabled != null) { - result.resultEnabled = new LinkedList<String>(resultEnabled); + result.resultEnabled = new LinkedList<>(resultEnabled); } if (numbers != null) { - result.numbers = new HashMap<Population, MatrixND>(numbers); + result.numbers = new HashMap<>(numbers); } if (tagValue != null) { - result.tagValue = new HashMap<String, String>(tagValue); + result.tagValue = new HashMap<>(tagValue); } result.simulLogLevel = getSimulLogLevel(); result.scriptLogLevel = getScriptLogLevel(); @@ -1708,7 +1489,7 @@ result.libLogLevel = getLibLogLevel(); result.numberOfSensitivitySimulation = getNumberOfSensitivitySimulation(); if (sensitivityExports != null) { - result.sensitivityExports = new LinkedList<SensitivityExport>(sensitivityExports); + result.sensitivityExports = new LinkedList<>(sensitivityExports); } result.sensitivityAnalysis = sensitivityAnalysis; @@ -1715,9 +1496,6 @@ return result; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#deepCopy() - */ @Override public SimulationParameter deepCopy() { Properties props = toProperties(); @@ -1726,9 +1504,6 @@ return newInstance; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#toString() - */ @Override public String toString() { Properties prop = toProperties(); @@ -1735,9 +1510,6 @@ return SimulationParameterPropertiesHelper.toString(prop); } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#toProperties() - */ @Override public Properties toProperties() { Properties result = new SortedProperties(); @@ -2022,9 +1794,6 @@ return result; } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#fromProperties(java.util.Properties) - */ @Override public void fromProperties(Properties props) { @@ -2034,9 +1803,6 @@ } - /* - * @see fr.ifremer.isisfish.simulator.SimulationParameter#reloadContextParameters() - */ @Override public void reloadContextParameters() throws TopiaException { Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterPropertiesHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterPropertiesHelper.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterPropertiesHelper.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -310,7 +310,7 @@ public static Map<String, String> getTagValue(Properties prop) { int tagValueLength = (TAG_VALUE_KEY + DOT).length(); // preserve order - Map<String, String> result = new LinkedHashMap<String, String>(); + Map<String, String> result = new LinkedHashMap<>(); for (String k : prop.stringPropertyNames()) { if (k.startsWith(TAG_VALUE_KEY + DOT)) { String key = k.substring(tagValueLength); @@ -331,7 +331,7 @@ * @return */ public static Map<String, String> getParamAsString(Properties prop, String prefix, int index) { - Map<String, String> result = new HashMap<String, String>(); + Map<String, String> result = new HashMap<>(); if (prop != null) { String paramTag = prefix + DOT + index + DOT + PARAMETER_KEY + DOT; int paramTagLength = paramTag.length(); Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanContextInternal.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanContextInternal.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanContextInternal.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -55,7 +55,7 @@ protected Historic historic; /** Additional context values. */ - protected Map<String, Object> values = new HashMap<String, Object>(); + protected Map<String, Object> values = new HashMap<>(); public SimulationPlanContextInternal(String id, SimulationParameter param) { this.id = id; Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScriptListener.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScriptListener.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScriptListener.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -47,16 +47,10 @@ */ public class SimulationPreScriptListener implements SimulationListener { - /* - * @see fr.ifremer.isisfish.simulator.SimulationListener#afterSimulation(fr.ifremer.isisfish.simulator.SimulationContext) - */ @Override public void afterSimulation(SimulationContext context) { } - /* - * @see fr.ifremer.isisfish.simulator.SimulationListener#beforeSimulation(fr.ifremer.isisfish.simulator.SimulationContext) - */ @Override public void beforeSimulation(SimulationContext context) { try { Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultXML.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultXML.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultXML.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -102,9 +102,7 @@ return outFilename; } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.simulator.SimulationListener#afterSimulation(fr.ifremer.isisfish.simulator.SimulationContext) - */ + @Override public void afterSimulation(SimulationContext context) { try { out.write("</outData>\n"); @@ -116,9 +114,7 @@ } } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.simulator.SimulationListener#beforeSimulation(fr.ifremer.isisfish.simulator.SimulationContext) - */ + @Override public void beforeSimulation(SimulationContext context) { try { File file = getOutFilename(); @@ -138,9 +134,7 @@ } } - /* (non-Javadoc) - * @see fr.ifremer.isisfish.simulator.SimulationResultListener#addResult(fr.ifremer.isisfish.simulator.SimulationContext, fr.ifremer.isisfish.types.TimeStep, java.lang.String, org.nuiton.math.matrix.MatrixND) - */ + @Override public void addResult(SimulationContext context, TimeStep step, String name, MatrixND mat) throws IsisFishException { try { Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationVariable.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationVariable.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationVariable.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -57,7 +57,7 @@ protected TopiaEntity topiaEntity; /** Variable name > variable entity. */ - protected Map<String, Variable> variablesCache = new HashMap<String, Variable>(); + protected Map<String, Variable> variablesCache = new HashMap<>(); public SimulationVariable(SimulationContext simulationContext, TopiaEntity topiaEntity) { this.simulationContext = simulationContext; @@ -158,7 +158,7 @@ protected double eval(Variable v) { Equation eq = v.getEquationValue(); - Map<String, Object> args = new HashMap<String, Object>(); + Map<String, Object> args = new HashMap<>(); args.put("context", simulationContext); args.put("entity", topiaEntity); args.put("step", simulationContext.getSimulationControl().getStep()); Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -169,16 +169,11 @@ // in this case, control is set directly by main thread } - /* - * @see fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher#maxSimulationThread() - */ + @Override public int maxSimulationThread() { return IsisFish.config.getSimulatorInMaxThreads(); } - /* - * @see fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher#getCheckProgressionInterval() - */ @Override public int getCheckProgressionInterval() { @@ -587,7 +582,7 @@ protected class ObjectCreationListener implements TopiaTransactionListener { /** List qui contient tous les objets creer durant la simulation */ - protected List<TopiaEntity> newObjects = new ArrayList<TopiaEntity>(); + protected List<TopiaEntity> newObjects = new ArrayList<>(); /** * @return Returns the newObjects. @@ -596,17 +591,13 @@ return this.newObjects; } - /* - * @see org.nuiton.topia.event.TopiaTransactionListener#commit(org.nuiton.topia.event.TopiaTransactionEvent) - */ + @Override public void commit(TopiaTransactionEvent event) { // rien a faire, car normalement toujours rollback en fin de mois } - /* (non-Javadoc) - * @see org.nuiton.topia.event.TopiaTransactionListener#rollback(org.nuiton.topia.event.TopiaTransactionEvent) - */ + @Override public void rollback(TopiaTransactionEvent event) { log.debug("Transaction rollback " + event.getEntities().size() + " object(s)"); Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -170,9 +170,6 @@ } } - /* - * @see fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher#maxSimulationThread() - */ @Override public int maxSimulationThread() { @@ -187,9 +184,6 @@ return maxSimulationThread; } - /* - * @see fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher#getCheckProgressionInterval() - */ @Override public int getCheckProgressionInterval() { @@ -199,9 +193,6 @@ return interval; } - /* - * @see java.lang.Object#toString() - */ @Override public String toString() { return t("isisfish.simulator.launcher.remote"); @@ -640,16 +631,10 @@ SSHUtils.exec(session, command); } - } catch (IOException e) { + } catch (IOException | SSHException e) { if (log.isErrorEnabled()) { - log.error(t("Error while uploading public key to remote serveur authorized_keys"), - e); + log.error(t("Error while uploading public key to remote serveur authorized_keys"), e); } - } catch (SSHException e) { - if (log.isErrorEnabled()) { - log.error(t("Error while uploading public key to remote serveur authorized_keys"), - e); - } } } @@ -670,7 +655,7 @@ // first check that remote directory exists String remoteTemp = getRemoteTempDirectory(); - String remotePath = null; + String remotePath; if (!simulationItem.isStandaloneSimulationZip()) { // get simulation file path for each simulation... @@ -790,9 +775,6 @@ this.control = control; } - /* - * @see fr.ifremer.isisfish.util.ssh.ProgressMonitor#init(long) - */ @Override public void init(long max) { super.init(max); @@ -799,9 +781,6 @@ control.setProgressMax(initFileSize); } - /* - * @see fr.ifremer.isisfish.util.ssh.ProgressMonitor#count(long) - */ @Override public void count(long len) { super.count(len); @@ -808,9 +787,6 @@ control.setProgress(totalLength); } - /* - * @see fr.ifremer.isisfish.util.ssh.ProgressMonitor#end() - */ @Override public void end() { super.end(); @@ -832,7 +808,7 @@ protected File downloadSimulationFile(Session sshSession, String simulationId, String fileName) throws IOException, SSHException { - File localFile = null; + File localFile; // build remote file path // FIXME this path should be given by remote IsisFish app @@ -1090,7 +1066,7 @@ String simulationZipResult, String preScriptPath, boolean multipleSimulationScript) throws IOException { - String scriptContent = null; + String scriptContent; // test null values for prescript String remotePreScript = preScriptPath; @@ -1104,7 +1080,7 @@ .getTemplate(templateName); // context values - Map<String, Object> root = new HashMap<String, Object>(); + Map<String, Object> root = new HashMap<>(); root.put("isishome", IsisFish.config.getSimulatorSshIsisHome()); root.put("isistemp", getRemoteTempDirectory()); root.put("javapath", IsisFish.config.getSimulatorSshJavaPath()); Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -59,7 +59,7 @@ transient protected String id; /** l'ensemble des post actions a effectuer pour ce job */ - protected Set<PostAction> postActions = new HashSet<PostAction>(); + protected Set<PostAction> postActions = new HashSet<>(); /** Le {@link SimulationService} dans lequel a ete cree ce job */ protected SimulationService simulationService; /** si non null contient le {@link SimulationJob} qui a genere ce job, ca Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -135,21 +135,21 @@ monitorFolder = IsisFish.config.getMonitoringDirectory(); // init monitor check map - checkSet = new TreeSet<SimpleEntry<Date, SimulationJob>>( - new Comparator<SimpleEntry<Date, SimulationJob>>() { - @Override - public int compare(SimpleEntry<Date, SimulationJob> o1, - SimpleEntry<Date, SimulationJob> o2) { - // TODO change this, it's a set with duplicated entries !!! - int result = o1.getKey().compareTo(o2.getKey()); - // with bad luck (or windows system) date can be equals :( - if (result == 0) { - result = o1.getValue().compareTo(o2.getValue()); + checkSet = new TreeSet<>( + new Comparator<SimpleEntry<Date, SimulationJob>>() { + @Override + public int compare(SimpleEntry<Date, SimulationJob> o1, + SimpleEntry<Date, SimulationJob> o2) { + // TODO change this, it's a set with duplicated entries !!! + int result = o1.getKey().compareTo(o2.getKey()); + // with bad luck (or windows system) date can be equals :( + if (result == 0) { + result = o1.getValue().compareTo(o2.getValue()); + } + return result; } - return result; - } - }); + }); // init timer checkScheduler = new Timer(); @@ -277,14 +277,10 @@ if (log.isErrorEnabled()) { log.error("Can't found launcher for this simulation", e); } - } catch (InstantiationException e) { + } catch (InstantiationException | IllegalAccessException e) { if (log.isErrorEnabled()) { log.error("Can't get launcher for this simulation", e); } - } catch (IllegalAccessException e) { - if (log.isErrorEnabled()) { - log.error("Can't get launcher for this simulation", e); - } } } @@ -378,7 +374,7 @@ //checkDate.setTime(checkDate.getTime() + intervalInSeconds); // add simulation to check queue - checkSet.add(new SimpleEntry<Date, SimulationJob>(checkDate, job)); + checkSet.add(new SimpleEntry<>(checkDate, job)); // start thread if not already started if (!this.isAlive()) { @@ -410,9 +406,6 @@ } } - /* - * @see java.util.TimerTask#run() - */ @Override public void run() { @@ -487,8 +480,7 @@ long nextJobTimeMs = date.getTime() + launcher.getCheckProgressionInterval() * 1000; Date nextJobDate = new Date(nextJobTimeMs); - checkSet.add(new SimpleEntry<Date, SimulationJob>( - nextJobDate, job)); + checkSet.add(new SimpleEntry<>(nextJobDate, job)); } } else { @@ -785,7 +777,7 @@ protected List<SimulationStorage> getStorageListForSecondPass(String asPrefixName, int numberOfSimulation) { // simulation start at 0 - List<SimulationStorage> simulationStorageForAnalyze = new LinkedList<SimulationStorage>(); + List<SimulationStorage> simulationStorageForAnalyze = new LinkedList<>(); // en sens inverse, il le fera carrement moins souvent for (int simulationIndex = 0; simulationIndex < numberOfSimulation; ++simulationIndex) { String currentId = asPrefixName + "_" + simulationIndex; Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationPlanPrepareJob.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationPlanPrepareJob.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationPlanPrepareJob.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -228,7 +228,7 @@ public SimulationJob next() { hasNext(); // pour etre sur qu'il a ete appele au moins une fois - SimulationJob result = null; + SimulationJob result; // next est appelee par un autre thread concurrent // via la methode finished(SimulationJob, SimulationStorage) synchronized (this) { Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationQueue.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationQueue.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationQueue.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -45,7 +45,7 @@ private static final long serialVersionUID = -6130030747211387382L; protected SimulationQueue parent = null; - protected List<SimulationQueue> childs = new LinkedList<SimulationQueue>(); + protected List<SimulationQueue> childs = new LinkedList<>(); public SimulationQueue() { } Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -79,7 +79,6 @@ import fr.ifremer.isisfish.datastore.SimulationPlanStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.datastore.SimulatorStorage; -import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.export.ExportInfo; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.mexico.MexicoHelper; @@ -147,7 +146,7 @@ protected PropertyChangeSupport propertyListeners = new PropertyChangeSupport( this); - protected ListenerSet<SimulationServiceListener> listeners = new ListenerSet<SimulationServiceListener>(); + protected ListenerSet<SimulationServiceListener> listeners = new ListenerSet<>(); // FIXME pouvoir configurer ceci en fichier de config // FIXME ainsi que la mise a false, lors de la simulation de la derniere @@ -160,19 +159,19 @@ .newSingleThreadExecutor(); /** Tous les types de {@link SimulatorLauncher} disponibles, et leur * executors associe */ - protected Map<SimulatorLauncher, SimulationExecutor> executors = new LinkedHashMap<SimulatorLauncher, SimulationExecutor>(); + protected Map<SimulatorLauncher, SimulationExecutor> executors = new LinkedHashMap<>(); /** Le nombre d'erreur pour les SimulatorLauncher */ - protected Map<SimulatorLauncher, MutableInt> launcherError = new HashMap<SimulatorLauncher, MutableInt>(); + protected Map<SimulatorLauncher, MutableInt> launcherError = new HashMap<>(); /** La queue contenant toutes les simulations a faire */ protected SimulationQueue queue = new SimulationQueue(); /** Contient les identifiants des simulations presentes dans {@link #jobs}*/ - protected Set<String> idJobs = new HashSet<String>(); + protected Set<String> idJobs = new HashSet<>(); /** La liste des jobs existant (queue + job demarre) */ - protected Set<SimulationJob> jobs = new TreeSet<SimulationJob>(); + protected Set<SimulationJob> jobs = new TreeSet<>(); /** La liste des jobs termines */ - protected Set<SimulationJob> jobDones = new TreeSet<SimulationJob>(); + protected Set<SimulationJob> jobDones = new TreeSet<>(); /** * Cree une instance et initialise les executors ainsi que le launcherError @@ -185,8 +184,7 @@ // sort simulation names by... names // this solve "local" "sub", "remote" order // default "local" is in first in UI. - List<String> simulationKeys = new ArrayList<String>(prop - .stringPropertyNames()); + List<String> simulationKeys = new ArrayList<>(prop.stringPropertyNames()); Collections.sort(simulationKeys); for (String key : simulationKeys) { @@ -220,8 +218,7 @@ * @return les SimulatorLauncher */ public List<SimulatorLauncher> getSimulationLaunchers() { - List<SimulatorLauncher> result = new ArrayList<SimulatorLauncher>( - executors.keySet()); + List<SimulatorLauncher> result = new ArrayList<>(executors.keySet()); return result; } Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -90,7 +90,7 @@ protected ArrayList<SimulationJob> jobs; protected Map<String, SimulationJob> jobIds; /** progress bar (one for each row) */ - protected Map<SimulationJob, JProgressBar> progress = new WeakHashMap<SimulationJob, JProgressBar>(); + protected Map<SimulationJob, JProgressBar> progress = new WeakHashMap<>(); protected AbstractJobListener jobListener; protected ControlListener controlListener; @@ -158,7 +158,7 @@ public void setJobs(ArrayList<SimulationJob> jobs) { this.jobs = jobs; synchronized (jobs) { - jobIds = new HashMap<String, SimulationJob>(jobs.size()); + jobIds = new HashMap<>(jobs.size()); for (SimulationJob job : jobs) { jobIds.put(job.getItem().getControl().getId(), job); } @@ -189,9 +189,6 @@ return result; } - /* - * @see javax.swing.table.TableModel#getRowCount() - */ @Override public int getRowCount() { int result = jobs.size(); @@ -198,9 +195,6 @@ return result; } - /* - * @see javax.swing.table.TableModel#getColumnCount() - */ @Override public int getColumnCount() { int result = COLUMN_HEADER.length; @@ -207,25 +201,16 @@ return result; } - /* - * @see javax.swing.table.AbstractTableModel#getColumnClass(int) - */ @Override public Class<?> getColumnClass(int columnIndex) { return columnClass[columnIndex]; } - /* - * @see javax.swing.table.AbstractTableModel#getColumnName(int) - */ @Override public String getColumnName(int column) { return COLUMN_HEADER[column]; } - /* - * @see javax.swing.table.TableModel#getValueAt(int, int) - */ @Override public Object getValueAt(int rowIndex, int columnIndex) { @@ -337,8 +322,7 @@ @Override public void setData() { - model.setJobs(new ArrayList<SimulationJob>(simulationService - .getJobDones())); + model.setJobs(new ArrayList<>(simulationService.getJobDones())); } @Override @@ -373,10 +357,9 @@ @Override public void setData() { - ArrayList<SimulationJob> jobs = new ArrayList<SimulationJob>(simulationService.getJobs()); + ArrayList<SimulationJob> jobs = new ArrayList<>(simulationService.getJobs()); for (SimulationJob job : jobs) { - job.getItem().getControl().addPropertyChangeListener( - controlListener); + job.getItem().getControl().addPropertyChangeListener(controlListener); } model.setJobs(jobs); } Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -122,9 +122,6 @@ return result; } - /* - * @see fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher#getCheckProgressionInterval() - */ @Override public int getCheckProgressionInterval() { @@ -194,7 +191,7 @@ } // common args - List<String> command = new ArrayList<String>(); + List<String> command = new ArrayList<>(); command.add(java); command.add("-Xmx" + IsisFish.config.getSimulatorSubMaxMemory()); @@ -297,7 +294,7 @@ // use tip available at // http://www.javaworld.com/javaworld/jw-12-2000/jw-1229-traps.html?page=4 // for reading subprocess output - String line = null; + String line; try { while ((line = br.readLine()) != null) { // add reading line to logging output @@ -332,9 +329,6 @@ } } - /* - * @see fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher#getSimulationStorage(fr.ifremer.isisfish.simulator.launcher.SimulationService, fr.ifremer.isisfish.simulator.SimulationControl) - */ @Override public SimulationStorage getSimulationStorage( SimulationService simulationService, SimulationControl control) @@ -349,9 +343,6 @@ } - /* - * @see fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher#updateControl(fr.ifremer.isisfish.simulator.launcher.SimulationService, fr.ifremer.isisfish.simulator.SimulationControl) - */ @Override public void updateControl(SimulationService simulationService, SimulationControl control) throws RemoteException { Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -96,7 +96,7 @@ */ public FactorGroup(String name) { super(name); - factors = new ArrayList<Factor>(); + factors = new ArrayList<>(); } /** @@ -318,7 +318,7 @@ FactorGroup f = (FactorGroup)super.clone(); // deep copy of subfactors - f.factors = new ArrayList<Factor>(factors.size()); + f.factors = new ArrayList<>(factors.size()); for (Factor subFactor : factors) { f.factors.add((Factor)subFactor.clone()); } Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorHelper.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorHelper.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -117,7 +117,7 @@ // cas special 2 : regles else if (factor.getPath().equals("parameters.rules")) { List<Rule> rules = (List<Rule>) factor.getValue(); - List<String> rulesNames = new ArrayList<String>(); + List<String> rulesNames = new ArrayList<>(); int ruleIndex = 0; for (Rule rule : rules) { rulesNames.add(rule.getClass().getSimpleName()); @@ -134,7 +134,7 @@ // special case for rule parameter with Pattern pattern = Pattern.compile("^parameters\\.(rule\\.\\d+\\.parameter\\.\\w+)(\\..+)?$"); Matcher matcher = pattern.matcher(factor.getPath()); - String paramName = null; + String paramName; if (matcher.matches()) { paramName = matcher.group(1); } else { Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -56,7 +56,7 @@ * Constructeur. */ public Scenario() { - factors = new ArrayList<Factor>(); + factors = new ArrayList<>(); } /** Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityScenarios.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityScenarios.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityScenarios.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -54,7 +54,7 @@ * Constructeur. */ public SensitivityScenarios() { - scenarios = new ArrayList<Scenario>(); + scenarios = new ArrayList<>(); } /** Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -63,7 +63,7 @@ protected Distribution distribution; /** Distribution params (param name > param value). */ - protected Map<String, Object> distributionParameters = new HashMap<String, Object>(); + protected Map<String, Object> distributionParameters = new HashMap<>(); /** * Default constructor. @@ -175,7 +175,7 @@ public Object getValueForIdentifier(Object identifier) { // first quantite args is always identifier value - List<Object> args = new ArrayList<Object>(); + List<Object> args = new ArrayList<>(); args.add(identifier); // build distribution param args list Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -58,7 +58,7 @@ * Constructor. */ public DiscreteDomain() { - values = new TreeMap<Object, Object>(); + values = new TreeMap<>(); } /** @@ -129,11 +129,11 @@ @Override public DiscreteDomain clone() { - DiscreteDomain cloned = null; + DiscreteDomain cloned; try { cloned = (DiscreteDomain)super.clone(); // special copy for values - cloned.setValues(new TreeMap<Object, Object>(this.values)); + cloned.setValues(new TreeMap<>(this.values)); } catch (CloneNotSupportedException e) { throw new IsisFishRuntimeException("Can't clone domain", e); } Modified: trunk/src/main/java/fr/ifremer/isisfish/types/Month.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/types/Month.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/types/Month.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -112,9 +112,6 @@ return nextMonth; } - /* - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { final int prime = 31; @@ -123,9 +120,6 @@ return result; } - /* - * @see org.nuiton.topia.persistence.TopiaEntityAbstract#equals(java.lang.Object) - */ @Override public boolean equals(Object o) { if (this == o) { @@ -137,11 +131,7 @@ } return false; } - - - /* - * @see java.lang.Object#toString() - */ + @Override public String toString() { switch (getMonthNumber()) { @@ -191,9 +181,7 @@ return this.getMonthNumber() >= d.getMonthNumber(); } - /* (non-Javadoc) - * @see java.lang.Comparable#compareTo(T) - */ + @Override public int compareTo(Month d) { if (this.before(d)) { return -1; @@ -223,7 +211,7 @@ * @return month list */ static public List<Month> getMonths(Month first, Month last) { - List<Month> result = new ArrayList<Month>(); + List<Month> result = new ArrayList<>(); result.add(first); while (first.before(last)) { first = first.next(); Modified: trunk/src/main/java/fr/ifremer/isisfish/types/RangeOfValues.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/types/RangeOfValues.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/types/RangeOfValues.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -134,7 +134,7 @@ } public boolean contains(int val) { - boolean result = false; + boolean result; if (! isContinueRange()){ result = getPossibleValues().contains(val); }else{ @@ -146,7 +146,7 @@ } public boolean contains(float val) { - boolean result = false; + boolean result; if (! isContinueRange()){ result = getPossibleValues().contains(val); }else{ @@ -172,7 +172,7 @@ String g = getValues(); - if(g.indexOf(";") != -1 || g.matches("^-?[^-]+$")){ + if(g.contains(";") || g.matches("^-?[^-]+$")){ continueRange = false; String [] val = g.split(";"); for(int i=0; i<val.length; i++){ @@ -201,9 +201,6 @@ return result; } - /* - * @see java.lang.Object#toString() - */ @Override public String toString() { String result = getAsString(); Modified: trunk/src/main/java/fr/ifremer/isisfish/types/TimeStep.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/types/TimeStep.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/types/TimeStep.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -209,9 +209,6 @@ return result; } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ @Override public String toString() { String result = t("isisfish.date.toString", getMonth(), getYear()); Modified: trunk/src/main/java/fr/ifremer/isisfish/types/TimeUnit.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/types/TimeUnit.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/types/TimeUnit.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -91,9 +91,7 @@ return this; } - /* (non-Javadoc) - * @see java.lang.Comparable#compareTo(T) - */ + @Override public int compareTo(TimeUnit o) { if (time < o.time) { return -1; @@ -103,10 +101,7 @@ return 0; } } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ + @Override public String toString() { String result = ""; Modified: trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -204,7 +204,7 @@ * @param str la chaine representant */ private List splitObjects(String name, String str, SessionImplementor session) { - List<Object> result = new LinkedList<Object>(); + List<Object> result = new LinkedList<>(); str = str.trim(); if (str.startsWith("[") && str.endsWith("]")) { str = str.substring(1, str.length() - 1); @@ -393,7 +393,7 @@ @Override public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor session, Object owner) throws HibernateException, SQLException { - MatrixND matrix = null; + MatrixND matrix; String nameAsString = rs.getString(names[0]); String dimAsString = rs.getString(names[1]); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -80,7 +80,7 @@ protected Map<JFrame, WelcomePanelUI> allFrameOpened; // URL alias - protected static final Map<String, String> URLSALIAS = new HashMap<String, String>(); + protected static final Map<String, String> URLSALIAS = new HashMap<>(); static { URLSALIAS.put("ISISFISH", "http://www.isis-fish.org/"); @@ -95,7 +95,7 @@ } public void afterInit() { - allFrameOpened = new HashMap<JFrame, WelcomePanelUI>(); + allFrameOpened = new HashMap<>(); welcomeUI.getWelcomePanelUI().setContent(new WelcomeTabUI(welcomeUI)); // increase tooltip display time Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -40,7 +40,7 @@ public class WelcomeSaveVerifier { /** Save verifier list. */ - protected List<SaveVerifier> verifiers = new ArrayList<SaveVerifier>(); + protected List<SaveVerifier> verifiers = new ArrayList<>(); /** * Add new verifier to manage. Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -90,7 +90,7 @@ * Test r configuration. */ public void testRCOnfiguration() { - REngine engine = null; + REngine engine; try { engine = new RProxy(); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -335,18 +335,12 @@ } setTestMessage(t("isisfish.error.simulation.remote.wrongportvalue", sPort), true); - } catch (JSchException e) { + } catch (JSchException | SSHException e) { if (log.isErrorEnabled()) { log.error("Can't connect", e); } setTestMessage(t("isisfish.simulator.ssh.configuration.connectionerror", e .getMessage()), true); - } catch (SSHException e) { - if (log.isErrorEnabled()) { - log.error("Can't connect", e); - } - setTestMessage(t("isisfish.simulator.ssh.configuration.connectionerror", e - .getMessage()), true); } catch (InvalidPassphraseException e) { if (log.isErrorEnabled()) { log.error("Can't connect", e); @@ -434,7 +428,7 @@ String host = currentSSHserver; int port = 22; // by default, 22 - String sPort = null; + String sPort; try { if (host.indexOf(':') > 0) { @@ -534,14 +528,10 @@ log.info("Finger print: " + kpair.getFingerPrint()); } kpair.dispose(); - } catch (JSchException e) { + } catch (JSchException | IOException e) { if (log.isErrorEnabled()) { log.error("Can't make ssh key", e); } - } catch (IOException e) { - if (log.isErrorEnabled()) { - log.error("Can't make ssh key", e); - } } // refresh ckeck Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -78,7 +78,7 @@ String sensitivityBeanID, String sensitivityMethod) { // get bean for component class info - TopiaEntityContextable bean = null; + TopiaEntityContextable bean; if (sensitivityBeanID == null) { bean = inputContentUI.getSaveVerifier().getEntity(sensitivityBeanClass); } else { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -510,10 +510,8 @@ RegionStorage.importAndRenameZip(zip, newName); } - } catch (IOException eee) { + } catch (IOException | StorageException eee) { throw new IsisFishRuntimeException("Can't copy region", eee); - } catch (StorageException eee) { - throw new IsisFishRuntimeException("Can't copy region", eee); } } @@ -708,7 +706,7 @@ } // look for parent node (Species type) - String speciesId = null; + String speciesId; FisheryTreeNode parentNode = selectedNode.getParent(); if (parentNode.getInternalClass().equals(Species.class)) { // cas selection du noeud type "Population" @@ -724,7 +722,7 @@ // look for entities TopiaContext topiaContext = inputUI.getContextValue(TopiaContext.class); - Species result = null; + Species result; try { SpeciesDAO dao = IsisFishDAOHelper.getSpeciesDAO(topiaContext); result = dao.findByTopiaId(speciesId); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -79,7 +79,7 @@ protected InputContentUI<?> inputContentUI; /** Map entity key to {@link TopiaEntity}. */ - protected HashMap<String, TopiaEntityContextable> currentEntities = new HashMap<String, TopiaEntityContextable>(); + protected HashMap<String, TopiaEntityContextable> currentEntities = new HashMap<>(); /** Intance unique de PCL pour pouvoir être ajouter et supprimé au bon moment. */ protected PropertyChangeListener entityPCL = new PropertyChangeListener() { @@ -195,10 +195,10 @@ * @return */ protected String toString(TopiaEntity e) { - String result = null; + String result; try { - result = (String)BeanUtils.getProperty(e, "name"); + result = BeanUtils.getProperty(e, "name"); } catch (Exception ex) { result = e.toString(); } @@ -251,7 +251,7 @@ * Commit opened topia context. */ public void save() { - TopiaEntityContextable topiaEntity = (TopiaEntityContextable)inputContentUI.getBean(); + TopiaEntityContextable topiaEntity = inputContentUI.getBean(); TopiaContext topiaContext = inputContentUI.getTopiaContext(); try { @@ -291,7 +291,7 @@ */ public void cancel() { TopiaContext topiaContext = inputContentUI.getTopiaContext(); - TopiaEntityContextable topiaEntity = (TopiaEntityContextable)inputContentUI.getBean(); + TopiaEntityContextable topiaEntity = inputContentUI.getBean(); try { topiaContext.rollbackTransaction(); noModif(); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -270,7 +270,7 @@ if (CollectionUtils.isEmpty(infoSaisons)) { result.addWarning(metier, t("isisfish.error.empty.season")); } else { - Set<Month> months = new HashSet<Month>(); + Set<Month> months = new HashSet<>(); for (MetierSeasonInfo info : infoSaisons) { if (!Collections.disjoint(months, info.getMonths())) { result.addError(info, t("isisfish.error.overlap.season")); @@ -337,7 +337,7 @@ if (CollectionUtils.isEmpty(infoSaisons)) { result.addWarning(pop, t("isisfish.error.empty.season")); } else { - Set<Month> months = new HashSet<Month>(); + Set<Month> months = new HashSet<>(); for (PopulationSeasonInfo info : infoSaisons) { if (!Collections.disjoint(months, info.getMonths())) { result.addError(info, t("isisfish.error.overlap.season")); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -46,7 +46,7 @@ */ public class CheckResult { // CheckResult - protected Set<Object> order = new LinkedHashSet<Object>(); + protected Set<Object> order = new LinkedHashSet<>(); protected Map<Object, List<String>> info = new HashMap<>(); protected Map<Object, List<String>> warning = new HashMap<>(); @@ -116,7 +116,7 @@ result.append("Info\n"); result.append("----\n"); for (Iterator<String> i = list.iterator(); i.hasNext();) { - result.append(i.next().toString()); + result.append(i.next()); result.append("\n"); } } @@ -130,7 +130,7 @@ result.append("Problème\n"); result.append("--------\n"); for (Iterator<String> i = list.iterator(); i.hasNext();) { - result.append(i.next().toString()); + result.append(i.next()); result.append("\n"); } } @@ -144,7 +144,7 @@ result.append("Erreur\n"); result.append("------\n"); for (Iterator<String> i = list.iterator(); i.hasNext();) { - result.append(i.next().toString()); + result.append(i.next()); result.append("\n"); } } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -112,7 +112,7 @@ } public Object getValueAt(int row, int column) { - Object[] rowData = (Object[]) data.get(row); + Object[] rowData = data.get(row); return rowData[column]; } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/EquationEditorPaneHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/EquationEditorPaneHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/EquationEditorPaneHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -92,7 +92,7 @@ StringWriter result = new StringWriter(); PrintWriter out = new PrintWriter(result); - int compileResult = 0; + int compileResult; try { compileResult = EvaluatorHelper.check(javaInterface, content, out); } catch (Exception eee) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/FormuleComboRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/FormuleComboRenderer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/FormuleComboRenderer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -47,9 +47,6 @@ /** serialVersionUID. */ private static final long serialVersionUID = -8277883340386163087L; - /* - * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) - */ @Override public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/equation/InputOneEquationHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -190,8 +190,8 @@ protected void setComboModel() { if (inputContentUI.getBean() != null){ - TopiaContext isisContext = ((org.nuiton.topia.persistence.TopiaEntityAbstract)inputContentUI.getBean()).getTopiaContext(); - List<Formule> formules = null; + TopiaContext isisContext = inputContentUI.getBean().getTopiaContext(); + List<Formule> formules; if (inputContentUI.formuleCategory != null) { formules = FormuleStorage.getFormules(isisContext, inputContentUI.formuleCategory); GenericComboModel<Formule> formulesModel = new GenericComboModel<>(formules); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/fisheryregion/FisheryRegionHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -286,11 +286,11 @@ TopiaContext isisContext = fisheryRegion.getTopiaContext(); // frame.setInfoText(t("isisfish.message.checking.cell")); - int latNumber = (int) Math + int latNumber = Math .round((fisheryRegion.getMaxLatitude() - fisheryRegion .getMinLatitude()) / fisheryRegion.getCellLengthLatitude()); - int lonNumber = (int) Math + int lonNumber = Math .round((fisheryRegion.getMaxLongitude() - fisheryRegion .getMinLongitude()) / fisheryRegion.getCellLengthLongitude()); @@ -340,7 +340,6 @@ // toutes les mailles restantes dans la liste sont des mailles en trop // on les supprimes - progresscpt = 0; for (Cell cell : cells) { // FIXME il faudrait aussi rechercher les objets dependants // des mailles que l'on va supprimer et demander confirmation Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearPopulationSelectivityModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearPopulationSelectivityModel.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearPopulationSelectivityModel.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -109,18 +109,12 @@ public List<Selectivity> getSelectivities() { return this.selectivities; } - - /* - * @see javax.swing.table.TableModel#getColumnCount() - */ + @Override public int getColumnCount() { return COLUMN_NAMES.length; } - /* - * @see javax.swing.table.TableModel#getRowCount() - */ @Override public int getRowCount() { int rows = 0; @@ -130,13 +124,10 @@ return rows; } - /* - * @see javax.swing.table.TableModel#getValueAt(int, int) - */ @Override public Object getValueAt(int rowIndex, int columnIndex) { - Object result = null; + Object result; Selectivity selectivity = selectivities.get(rowIndex); switch (columnIndex) { @@ -153,13 +144,10 @@ return result; } - /* - * @see javax.swing.table.TableModel#getColumnClass(int) - */ @Override public Class<?> getColumnClass(int columnIndex) { - Class<?> result = null; + Class<?> result; switch (columnIndex) { case 0: @@ -175,25 +163,16 @@ return result; } - /* - * @see javax.swing.table.TableModel#getColumnName(int) - */ @Override public String getColumnName(int columnIndex) { return COLUMN_NAMES[columnIndex]; } - /* - * @see javax.swing.table.TableModel#isCellEditable(int, int) - */ @Override public boolean isCellEditable(int rowIndex, int columnIndex) { return columnIndex > 0; } - /* - * @see javax.swing.table.TableModel#setValueAt(java.lang.Object, int, int) - */ @Override public void setValueAt(Object value, int rowIndex, int columnIndex) { @@ -215,14 +194,11 @@ } - /* - * @see javax.swing.table.TableCellRenderer#getTableCellRendererComponent(javax.swing.JTable, java.lang.Object, boolean, boolean, int, int) - */ @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - Component c = null; + Component c; switch (column) { case 0: c = new JLabel(value.toString()); @@ -237,9 +213,6 @@ return c; } - /* - * @see fr.ifremer.isisfish.ui.sensitivity.SensitivityTableModel#getPropertyAtColumn(int) - */ @Override public String getPropertyAtColumn(int column) { String result = null; @@ -248,13 +221,10 @@ } return result; } - - /* - * @see fr.ifremer.isisfish.ui.sensitivity.SensitivityTableModel#getBeanAtRow(int) - */ + @Override public Object getBeanAtRow(int rowIndex) { - Object result = null; + Object result; result = selectivities.get(rowIndex); return result; } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/RangeOfValuesHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/RangeOfValuesHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/RangeOfValuesHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -63,7 +63,7 @@ if (evt.getNewValue() != null) { init = true; - List<String> values = new ArrayList<String>(); + List<String> values = new ArrayList<>(); for (String value : RangeOfValues.getPossibleTypes()) { values.add(value); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/SelectivityHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/SelectivityHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/gear/SelectivityHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -88,7 +88,7 @@ protected void setSelectivityTableModel() { - List<Selectivity> selectivitiesList = new ArrayList<Selectivity>(); + List<Selectivity> selectivitiesList = new ArrayList<>(); // set model even if no selectivity // to clear data Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoComboRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoComboRenderer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoComboRenderer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -47,9 +47,6 @@ /** serialVersionUID. */ private static final long serialVersionUID = -8277883340386163087L; - /* - * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) - */ @Override public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesTableModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesTableModel.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesTableModel.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -103,17 +103,11 @@ this.targetSpeciesList = targetSpeciesList; } - /* - * @see javax.swing.table.TableModel#getColumnCount() - */ @Override public int getColumnCount() { return COLUMN_NAMES.length; } - /* - * @see javax.swing.table.TableModel#getRowCount() - */ @Override public int getRowCount() { int rows = 0; @@ -123,13 +117,10 @@ return rows; } - /* - * @see javax.swing.table.TableModel#getValueAt(int, int) - */ @Override public Object getValueAt(int rowIndex, int columnIndex) { - Object result = null; + Object result; TargetSpecies targetSpecies = targetSpeciesList.get(rowIndex); switch (columnIndex) { @@ -149,13 +140,10 @@ return result; } - /* - * @see javax.swing.table.TableModel#getColumnClass(int) - */ @Override public Class<?> getColumnClass(int columnIndex) { - Class<?> result = null; + Class<?> result; switch (columnIndex) { case 0: @@ -174,25 +162,16 @@ return result; } - /* - * @see javax.swing.table.TableModel#getColumnName(int) - */ @Override public String getColumnName(int columnIndex) { return COLUMN_NAMES[columnIndex]; } - /* - * @see javax.swing.table.TableModel#isCellEditable(int, int) - */ @Override public boolean isCellEditable(int rowIndex, int columnIndex) { return columnIndex > 0; } - /* - * @see javax.swing.table.TableModel#setValueAt(java.lang.Object, int, int) - */ @Override public void setValueAt(Object value, int rowIndex, int columnIndex) { @@ -218,14 +197,11 @@ } - /* - * @see javax.swing.table.TableCellRenderer#getTableCellRendererComponent(javax.swing.JTable, java.lang.Object, boolean, boolean, int, int) - */ @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - Component c = null; + Component c; switch (column) { case 0: c = new JLabel(value.toString()); @@ -245,9 +221,6 @@ return c; } - /* - * @see fr.ifremer.isisfish.ui.sensitivity.SensitivityTableModel#getPropertyAtColumn(int) - */ @Override public String getPropertyAtColumn(int column) { String property = null; @@ -257,12 +230,9 @@ return property; } - /* - * @see fr.ifremer.isisfish.ui.sensitivity.SensitivityTableModel#getBeanAtRow(int) - */ @Override public Object getBeanAtRow(int rowIndex) { - Object value = null; + Object value; value = targetSpeciesList.get(rowIndex); return value; } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoZoneHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoZoneHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoZoneHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -117,7 +117,7 @@ } public MetierSeasonInfo createMetierSeasonInfo(Metier metier) { - MetierSeasonInfo metierSeasonInfo = null; + MetierSeasonInfo metierSeasonInfo; if (log.isDebugEnabled()) { log.debug("createMetierSeasonInfo called"); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/observation/ObservationHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -114,7 +114,7 @@ if (StringUtils.isNotBlank(val)) { String[] values = val.trim().split("(,|;|\\*|x|\\s)"); - List<Integer> dims = new ArrayList<Integer>(); + List<Integer> dims = new ArrayList<>(); for (String value : values) { if (!value.isEmpty() && StringUtils.isNumeric(value)) { dims.add(Integer.valueOf(value)); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationBasicsHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -153,7 +153,7 @@ } protected Population createPopulation(TopiaContext context, Species species) { - Population pop = null; + Population pop; if (log.isTraceEnabled()) { log.trace("createPopulation called"); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationRecruitmentHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -96,7 +96,7 @@ } if (num > 0) { - List<String> sem = new ArrayList<String>(num); + List<String> sem = new ArrayList<>(num); for (int i = 0; i < num; i++) { sem.add(t("isisfish.common.month", i)); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonInfoComboRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonInfoComboRenderer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonInfoComboRenderer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -47,9 +47,6 @@ /** serialVersionUID. */ private static final long serialVersionUID = -8277883340386163087L; - /* - * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) - */ @Override public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionListRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionListRenderer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionListRenderer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -47,9 +47,6 @@ /** serialVersionUID. */ private static final long serialVersionUID = 1113492654780402245L; - /* - * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) - */ @Override public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionParametersHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionParametersHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionParametersHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -85,7 +85,7 @@ } protected void effortDescriptionSelectionChanged() { - EffortDescription selectedEffort = (EffortDescription)inputContentUI.fieldEffortDescriptionEffortDescriptionList.getSelectedValue(); + EffortDescription selectedEffort = inputContentUI.fieldEffortDescriptionEffortDescriptionList.getSelectedValue(); inputContentUI.setEffortDescription(selectedEffort); if (inputContentUI.getEffortDescription() != null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/MetierListRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/MetierListRenderer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/MetierListRenderer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -47,9 +47,6 @@ /** serialVersionUID. */ private static final long serialVersionUID = 1113492654780402245L; - /* - * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) - */ @Override public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryDataProvider.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryDataProvider.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryDataProvider.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -53,9 +53,6 @@ return fisheryRegion; } - /* - * @see jaxx.runtime.swing.nav.NavDataProvider#isEnabled() - */ @Override public boolean isEnabled() { return true; Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -84,7 +84,7 @@ stringValue = t(node.getId()); } else { FisheryRegion fisheryRegion = provider.getFisheryRegion(); - TopiaContext topiaContext = ((FisheryRegionImpl)fisheryRegion).getTopiaContext(); + TopiaContext topiaContext = fisheryRegion.getTopiaContext(); try { TopiaEntity entity = topiaContext.findByTopiaId(node.getId()); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PopulationsNodeLoador.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PopulationsNodeLoador.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PopulationsNodeLoador.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -51,9 +51,9 @@ @Override public List<Population> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) throws Exception { - List<Population> populations = null; + List<Population> populations; if (species.getPopulation() != null) { - populations = new ArrayList<Population>(species.getPopulation()); + populations = new ArrayList<>(species.getPopulation()); } else { populations = Collections.emptyList(); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeListRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeListRenderer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeListRenderer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -58,9 +58,6 @@ this.appendDetails = appendDetails; } - /* - * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) - */ @Override public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -43,7 +43,6 @@ import fr.ifremer.isisfish.entities.VariableDAO; import fr.ifremer.isisfish.entities.VariableType; import fr.ifremer.isisfish.ui.input.InputContentHandler; -import fr.ifremer.isisfish.ui.input.vesseltype.VesselTypeUI; import fr.ifremer.isisfish.ui.models.common.GenericListModel; /** @@ -150,7 +149,7 @@ */ public void deleteVariable(EntityVariableUI view) { JList<Variable> variableList = view.getVariablesList(); - Variable variable = (Variable)variableList.getSelectedValue(); + Variable variable = variableList.getSelectedValue(); try { // delete in db @@ -178,7 +177,7 @@ public void showSelectedVariable(EntityVariableUI view) { JList<Variable> variableList = view.getVariablesList(); - Variable variable = (Variable)variableList.getSelectedValue(); + Variable variable = variableList.getSelectedValue(); view.setVariable(variable); view.getSaveVerifier().addCurrentEntity(variable); @@ -213,7 +212,7 @@ */ public void saveVariable(EntityVariableUI view) { JList<Variable> variableList = view.getVariablesList(); - Variable variable = (Variable)variableList.getSelectedValue(); + Variable variable = variableList.getSelectedValue(); variable.setName(view.getVariableNameField().getText().trim()); VariableType type = (VariableType)view.getVariableTypeCombo().getSelectedItem(); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/VariableListRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/VariableListRenderer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/variable/VariableListRenderer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -47,9 +47,6 @@ /** serialVersionUID. */ private static final long serialVersionUID = 1113492654780402245L; - /* - * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) - */ @Override public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/models/common/GenericComboModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/common/GenericComboModel.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/common/GenericComboModel.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -97,17 +97,11 @@ return elementList.contains(elt); } - /* - * @see javax.swing.ListModel#getElementAt(int) - */ @Override public E getElementAt(int index) { return elementList.get(index); } - /* - * @see javax.swing.ListModel#getSize() - */ @Override public int getSize() { int size = 0; Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/models/common/GenericListModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/common/GenericListModel.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/common/GenericListModel.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -84,17 +84,11 @@ fireContentsChanged(this, 0, elementList == null ? 0 : elementList.size() - 1); } - /* - * @see javax.swing.ListModel#getElementAt(int) - */ @Override public E getElementAt(int index) { return elementList.get(index); } - /* - * @see javax.swing.ListModel#getSize() - */ @Override public int getSize() { int size = 0; Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableCellEditor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableCellEditor.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableCellEditor.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -57,7 +57,7 @@ */ public ScriptParametersTableCellEditor(Object script) { this.script = script; - scriptParametersTypes = new ArrayList<Class<?>>(); + scriptParametersTypes = new ArrayList<>(); //TODO map may be sorted Map<String, Class<?>> ruleParametersNamesAndTypes = JavaSourceStorage.getParameterNames(script); for (Class<?> type : ruleParametersNamesAndTypes.values()) { @@ -65,9 +65,6 @@ } } - /* - * @see fr.ifremer.isisfish.ui.widget.editor.ParameterTableCellEditor#getType(java.lang.Object, int, int) - */ @Override protected Class<?> getType(Object value, int row, int column) { return scriptParametersTypes.get(row); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableCellRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableCellRenderer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableCellRenderer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -55,9 +55,6 @@ this.script = script; } - /* - * @see javax.swing.table.TableCellRenderer#getTableCellRendererComponent(javax.swing.JTable, java.lang.Object, boolean, boolean, int, int) - */ @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableModel.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableModel.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -109,9 +109,6 @@ fireTableDataChanged(); } - /* - * @see javax.swing.table.TableModel#getColumnCount() - */ @Override public int getColumnCount() { int result = 2; @@ -121,9 +118,6 @@ return result; } - /* - * @see javax.swing.table.TableModel#getRowCount() - */ @Override public int getRowCount() { int result = 0; @@ -133,9 +127,6 @@ return result; } - /* - * @see javax.swing.table.TableModel#getValueAt(int, int) - */ @Override public Object getValueAt(int rowIndex, int columnIndex) { @@ -165,13 +156,10 @@ return result; } - /* - * @see javax.swing.table.TableModel#getColumnClass(int) - */ @Override public Class<?> getColumnClass(int columnIndex) { - Class<?> result = null; + Class<?> result; switch (columnIndex) { case 0: @@ -190,25 +178,16 @@ return result; } - /* - * @see javax.swing.table.TableModel#getColumnName(int) - */ @Override public String getColumnName(int columnIndex) { return COLUMN_NAMES[columnIndex]; } - /* - * @see javax.swing.table.TableModel#isCellEditable(int, int) - */ @Override public boolean isCellEditable(int rowIndex, int columnIndex) { return columnIndex > 0; } - /* - * @see javax.swing.table.TableModel#setValueAt(java.lang.Object, int, int) - */ @Override public void setValueAt(Object value, int rowIndex, int columnIndex) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -61,9 +61,6 @@ exportCache = new HashMap<>(); } - /* - * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) - */ @Override public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { @@ -74,7 +71,7 @@ index, isSelected, cellHasFocus); String exportName = (String) value; - String text = null; + String text; // c'est tres couteux d'avoir une instance // on les met en cache Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/models/misc/MonthComboModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/misc/MonthComboModel.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/misc/MonthComboModel.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -36,9 +36,6 @@ /** serialVersionUID. */ private static final long serialVersionUID = -2458250929660180160L; - /* - * @see javax.swing.ListModel#getElementAt(int) - */ @Override public Month getElementAt(int index) { Month result = null; @@ -48,9 +45,6 @@ return result; } - /* - * @see javax.swing.ListModel#getSize() - */ @Override public int getSize() { return Month.MONTH.length + 1; Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ExportObservationTableModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ExportObservationTableModel.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ExportObservationTableModel.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -75,18 +75,12 @@ fireTableRowsDeleted(index, index); } - /* - * @see javax.swing.table.TableModel#getColumnCount() - */ @Override public int getColumnCount() { int result = 2; return result; } - - /* - * @see javax.swing.table.TableModel#getRowCount() - */ + @Override public int getRowCount() { int result = 0; @@ -95,10 +89,7 @@ } return result; } - - /* - * @see javax.swing.table.TableModel#getColumnName(int) - */ + @Override public String getColumnName(int columnIndex) { return COLUMN_NAMES[columnIndex]; @@ -113,10 +104,7 @@ } return result; } - - /* - * @see javax.swing.table.TableModel#isCellEditable(int, int) - */ + @Override public boolean isCellEditable(int rowIndex, int columnIndex) { return columnIndex > 0; Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ExportTableCellEditor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ExportTableCellEditor.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ExportTableCellEditor.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -82,7 +82,7 @@ TopiaContext context = regionStorage.getStorage().beginTransaction(); if (context != null) { List<Observation> list = context.findAll("from " + Observation.class.getName()); - editorComponent = new JComboBox<Observation>(list.toArray(new Observation[list.size()])); + editorComponent = new JComboBox<>(list.toArray(new Observation[list.size()])); editorComponent.setSelectedItem(value); editorComponent.setRenderer(new ObservationComboRenderer()); editorComponent.addActionListener(this); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ExportTableCellRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ExportTableCellRenderer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ExportTableCellRenderer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -48,9 +48,6 @@ /** serialVersionUID. */ private static final long serialVersionUID = -1655744662816030649L; - /* - * @see javax.swing.table.TableCellRenderer#getTableCellRendererComponent(javax.swing.JTable, java.lang.Object, boolean, boolean, int, int) - */ @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ObjectiveComboRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ObjectiveComboRenderer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ObjectiveComboRenderer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -61,9 +61,6 @@ objectiveCache = new HashMap<>(); } - /* - * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) - */ @Override public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { @@ -74,7 +71,7 @@ index, isSelected, cellHasFocus); String objectiveName = (String) value; - String text = null; + String text; // c'est tres couteux d'avoir une instance // on les met en cache Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ObservationComboRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ObservationComboRenderer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ObservationComboRenderer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -47,9 +47,6 @@ /** serialVersionUID. */ private static final long serialVersionUID = -4070846632975105788L; - /* - * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) - */ @Override public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboRenderer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboRenderer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -61,9 +61,6 @@ optimizationCache = new HashMap<>(); } - /* - * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) - */ @Override public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { @@ -74,7 +71,7 @@ index, isSelected, cellHasFocus); String optimizationName = (String) value; - String text = null; + String text; // c'est tres couteux d'avoir une instance // on les met en cache Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultInfoNameListRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultInfoNameListRenderer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultInfoNameListRenderer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -67,9 +67,6 @@ resultNameCache = new HashMap<>(); } - /* - * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) - */ @Override public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { @@ -79,7 +76,7 @@ JLabel c = (JLabel)super.getListCellRendererComponent(list,value,index, isSelected, cellHasFocus); String resultNameName = (String)value; - String text = null; + String text; try { ResultInfo resultInfo = resultNameCache.get(resultNameName); if (resultInfo == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListCellRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListCellRenderer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListCellRenderer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -49,9 +49,6 @@ /** serialVersionUID. */ private static final long serialVersionUID = -948394724922547715L; - /* - * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) - */ @Override public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -61,9 +61,6 @@ ruleCache = new HashMap<>(); } - /* - * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) - */ @Override public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { @@ -95,7 +92,7 @@ }*/ String ruleName = (String)value; - String text = null; + String text; try { Rule rule = ruleCache.get(ruleName); if (rule == null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellEditor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellEditor.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellEditor.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -123,9 +123,6 @@ return comp; } - /* - * @see javax.swing.CellEditor#getCellEditorValue() - */ @Override public Object getCellEditorValue() { return null; Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellRenderer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellRenderer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -69,9 +69,6 @@ this.rule = rule; } - /* - * @see javax.swing.table.TableCellRenderer#getTableCellRendererComponent(javax.swing.JTable, java.lang.Object, boolean, boolean, int, int) - */ @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboRenderer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboRenderer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -61,9 +61,6 @@ sensitivityAnalysisCache = new HashMap<>(); } - /* - * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) - */ @Override public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { @@ -74,7 +71,7 @@ index, isSelected, cellHasFocus); String sensitivityName = (String) value; - String text = null; + String text; // c'est tres couteux d'avoir une instance // on les met en cache Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisListRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisListRenderer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisListRenderer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -48,9 +48,6 @@ /** serialVersionUID. */ private static final long serialVersionUID = -4070846632975105788L; - /* - * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) - */ @Override public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListRenderer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListRenderer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -48,9 +48,6 @@ /** serialVersionUID. */ private static final long serialVersionUID = -4070846632975105788L; - /* - * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) - */ @Override public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -61,9 +61,6 @@ sensitivityExportCache = new HashMap<>(); } - /* - * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) - */ @Override public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { @@ -74,7 +71,7 @@ index, isSelected, cellHasFocus); String exportName = (String) value; - String text = null; + String text; // c'est tres couteux d'avoir une instance // on les met en cache Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -61,9 +61,6 @@ simulationPlanCache = new HashMap<>(); } - /* - * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) - */ @Override public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { @@ -74,7 +71,7 @@ index, isSelected, cellHasFocus); String simulationPlanName = (String) value; - String text = null; + String text; // c'est tres couteux d'avoir une instance // on les met en cache Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListRenderer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListRenderer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -48,9 +48,6 @@ /** serialVersionUID. */ private static final long serialVersionUID = -4070846632975105788L; - /* - * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) - */ @Override public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/LegendPanel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/LegendPanel.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/LegendPanel.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -74,7 +74,7 @@ labelMin = new JLabel(Double.toString(model.getMin())); labelMax = new JLabel(Double.toString(model.getMax())); - GridBagConstraints c = null; + GridBagConstraints c; c = new GridBagConstraints(); c.gridx = 0; Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -115,7 +115,7 @@ List<String> value = SimulationStorage.getSimulationNames(); //resultUI.getSimulationComboBox().setEditable(false); - GenericComboModel<String> model = new GenericComboModel<String>(value); + GenericComboModel<String> model = new GenericComboModel<>(value); resultUI.getSimulationComboBox().setModel(model); resultUI.getSimulationComboBox().setSelectedItem(null); } @@ -222,10 +222,8 @@ // ne pas ouvrir de resultat par defaut. model.setSelectedItem(model.getElementAt(0)); } - } catch (TopiaException ex) { + } catch (TopiaException | StorageException ex) { throw new IsisFishRuntimeException("Can't open simulation", ex); - } catch (StorageException ex) { - throw new IsisFishRuntimeException("Can't open simulation", ex); } } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultMatrixFilter.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultMatrixFilter.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultMatrixFilter.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -59,9 +59,6 @@ return matrix; } - /* - * @see org.nuiton.math.matrix.viewer.MatrixFilter#filterDimension(org.nuiton.math.matrix.MatrixND, int, int) - */ @Override public MatrixND filterDimension(MatrixND matrix, int dim, int sumStep) { @@ -79,7 +76,7 @@ if (dim == 0) { List sem = matrix.getSemantic(dim); List<Object> semList = (List<Object>)sem; - List<Object> newList = new ArrayList<Object>(); + List<Object> newList = new ArrayList<>(); for (int index = 0 ; index < semList.size(); ++index) { Object semObject = semList.get(index); if (semObject instanceof TimeStep) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/result/SumByYearMatrixFilter.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/result/SumByYearMatrixFilter.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/result/SumByYearMatrixFilter.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -43,23 +43,17 @@ */ public class SumByYearMatrixFilter implements MatrixFilter { - /* - * @see org.nuiton.math.matrix.viewer.MatrixFilter#filter(org.nuiton.math.matrix.MatrixND) - */ @Override public MatrixND filter(MatrixND matrix) { return matrix; } - /* - * @see org.nuiton.math.matrix.viewer.MatrixFilter#filterDimension(org.nuiton.math.matrix.MatrixND, int, int) - */ @Override public MatrixND filterDimension(MatrixND matrix, int dim, int sumStep) { if (dim == 0) { // in isis 0 = time step int semCount = matrix.getSemantic(0).size(); - List<String> newSems = new ArrayList<String>(semCount); + List<String> newSems = new ArrayList<>(semCount); for (int i = 0; i < semCount ; i++) { newSems.add(t("isisfish.result.matrix.sumbyyearlabel", i)); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/FileSelectionTableModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/script/FileSelectionTableModel.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/FileSelectionTableModel.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -64,31 +64,22 @@ */ public FileSelectionTableModel(List<String> availableFiles) { this.availableFiles = availableFiles; - this.selectedFiles = new ArrayList<String>(availableFiles); + this.selectedFiles = new ArrayList<>(availableFiles); } - /* - * @see javax.swing.table.TableModel#getColumnCount() - */ @Override public int getColumnCount() { return COLUMN_NAMES.length; } - /* - * @see javax.swing.table.AbstractTableModel#getColumnName(int) - */ @Override public String getColumnName(int column) { return COLUMN_NAMES[column]; } - /* - * @see javax.swing.table.AbstractTableModel#getColumnClass(int) - */ @Override public Class<?> getColumnClass(int columnIndex) { - Class<?> result = null; + Class<?> result; switch (columnIndex) { case 0: @@ -102,9 +93,6 @@ return result; } - /* - * @see javax.swing.table.AbstractTableModel#isCellEditable(int, int) - */ @Override public boolean isCellEditable(int rowIndex, int columnIndex) { // seulement les cases a cocher sont editables @@ -111,17 +99,11 @@ return columnIndex == 0; } - /* - * @see javax.swing.table.TableModel#getRowCount() - */ @Override public int getRowCount() { return availableFiles.size(); } - /* - * @see javax.swing.table.TableModel#getValueAt(int, int) - */ @Override public Object getValueAt(int rowIndex, int columnIndex) { @@ -152,9 +134,6 @@ return result; } - /* - * @see javax.swing.table.AbstractTableModel#setValueAt(java.lang.Object, int, int) - */ @Override public void setValueAt(Object value, int rowIndex, int columnIndex) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -386,7 +386,7 @@ .getTemplate(scriptTemplatePath); // context values - Map<String, Object> root = new HashMap<String, Object>(); + Map<String, Object> root = new HashMap<>(); root.put("name", realFilename); root.put("date", new Date()); root.put("author", IsisFish.config.getUserName()); @@ -424,9 +424,6 @@ ErrorHelper.showErrorDialog(s, eee); } - /* - * @see javax.swing.event.TreeSelectionListener#valueChanged(javax.swing.event.TreeSelectionEvent) - */ @Override public void valueChanged(TreeSelectionEvent e) { if (e.getNewLeadSelectionPath() != null) { @@ -627,9 +624,9 @@ protected static List<String> extractFiles(int prefixLength, TreePath[] selectedPaths) { - List<String> result = new ArrayList<String>(); - List<File> dirFound = new ArrayList<File>(); - List<File> dirWithFileFound = new ArrayList<File>(); + List<String> result = new ArrayList<>(); + List<File> dirFound = new ArrayList<>(); + List<File> dirWithFileFound = new ArrayList<>(); for (TreePath selectedPath : selectedPaths) { @@ -663,7 +660,7 @@ dirWithFileFound.clear(); if (!dirFound.isEmpty()) { - List<File> listF = new ArrayList<File>(); + List<File> listF = new ArrayList<>(); // there is some directories selected by user for (File dir : dirFound) { FileFilter filter = new FileFilter() { @@ -875,8 +872,8 @@ */ protected static List<String>[] scanZip(File source, File root) { - List<String> overwrittenFiles = new ArrayList<String>(); - List<String> newFiles = new ArrayList<String>(); + List<String> overwrittenFiles = new ArrayList<>(); + List<String> newFiles = new ArrayList<>(); // ontain list of relative paths (to add or overwrite) try { @@ -943,7 +940,7 @@ } try { - String result = null; + String result; if (IsisFish.vcs.isOnRemote(codeStorage.getFile())) { result = IsisFish.vcs.getDiff(codeStorage.getFile()); } else { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -54,7 +54,7 @@ */ public ScriptTypesComboModel() { ScriptMapping[] values = ScriptMapping.values(); - mappings = new ArrayList<ScriptMapping>(values.length); + mappings = new ArrayList<>(values.length); for (ScriptMapping mapping : values) { if (!mapping.isOfficialVCS()) { mappings.add(mapping); @@ -67,17 +67,11 @@ } } - /* - * @see javax.swing.ListModel#getElementAt(int) - */ @Override public ScriptMapping getElementAt(int index) { return mappings.get(index); } - /* - * @see javax.swing.ListModel#getSize() - */ @Override public int getSize() { return mappings.size(); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTranferable.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTranferable.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTranferable.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -78,14 +78,11 @@ } } - /* - * @see java.awt.datatransfer.Transferable#getTransferData(java.awt.datatransfer.DataFlavor) - */ @Override public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException { - List<File> filesToTransfer = null; + List<File> filesToTransfer; if (flavor == null) { throw new IOException("flavor is null"); @@ -100,17 +97,11 @@ return filesToTransfer; } - /* - * @see java.awt.datatransfer.Transferable#getTransferDataFlavors() - */ @Override public DataFlavor[] getTransferDataFlavors() { return new DataFlavor[] { myData }; } - /* - * @see java.awt.datatransfer.Transferable#isDataFlavorSupported(java.awt.datatransfer.DataFlavor) - */ @Override public boolean isDataFlavorSupported(DataFlavor flavor) { return flavor.equals(myData); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTransferHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTransferHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTransferHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -128,7 +128,7 @@ // only task can be moved ! List<File> selectedFiles = scriptTree.getSelectedFiles(); if (CollectionUtils.isNotEmpty(selectedFiles)) { - List<File> files = new LinkedList<File>(selectedFiles); + List<File> files = new LinkedList<>(selectedFiles); transferable = new ScriptTranferable(files); } @@ -153,14 +153,10 @@ List<File> movedFiles = (List<File>) myObject; scriptUI.getHandler().moveFiles(directory, movedFiles); } - } catch (IOException e) { + } catch (IOException | UnsupportedFlavorException e) { if (log.isErrorEnabled()) { log.error("Exception while transfering task", e); } - } catch (UnsupportedFlavorException e) { - if (log.isErrorEnabled()) { - log.error("Exception while transfering task", e); - } } } } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTree.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTree.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTree.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -66,7 +66,7 @@ */ public List<File> getSelectedFiles() { - List<File> selectedFiles = new ArrayList<File>(); + List<File> selectedFiles = new ArrayList<>(); TreePath[] selectedPaths = getSelectionModel().getSelectionPaths(); if (selectedPaths != null) { @@ -115,7 +115,7 @@ if (selectedPath != null) { Object[] pathWay = selectedPath.getPath(); - Object selectedFile = (Object)pathWay[pathWay.length - 1]; + Object selectedFile = pathWay[pathWay.length - 1]; if (selectedFile instanceof File && ((File)selectedFile).isDirectory()) { selectedDirectory = (File)selectedFile; break; Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeCellRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeCellRenderer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeCellRenderer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -66,9 +66,6 @@ protected static final Icon VCS_ICON = Resource.getIcon("/icons/script/database.png"); - /* - * @see javax.swing.tree.TreeCellRenderer#getTreeCellRendererComponent(javax.swing.JTree, java.lang.Object, boolean, boolean, boolean, int, boolean) - */ @Override public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeModel.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeModel.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -95,7 +95,7 @@ modelSupport = new TreeModelSupport(this); rootFiles = new HashMap<>(); - List<File> offFiles = new ArrayList<File>(); + List<File> offFiles = new ArrayList<>(); offFiles.add(ExportStorage.getExportDirectory()); offFiles.add(FormuleStorage.getFormuleDirectory()); offFiles.add(ObjectiveStorage.getObjectiveDirectory()); @@ -128,21 +128,15 @@ vcsList.add(IsisFish.communityVcs); } - /* - * @see javax.swing.tree.TreeModel#addTreeModelListener(javax.swing.event.TreeModelListener) - */ @Override public void addTreeModelListener(TreeModelListener l) { modelSupport.addTreeModelListener(l); } - /* - * @see javax.swing.tree.TreeModel#getChild(java.lang.Object, int) - */ @Override public Object getChild(Object parent, int index) { - Object result = null; + Object result; if (parent == vcsList) { result = vcsList.get(index); @@ -158,9 +152,6 @@ return result; } - /* - * @see javax.swing.tree.TreeModel#getChildCount(java.lang.Object) - */ @Override public int getChildCount(Object parent) { @@ -180,12 +171,9 @@ return count; } - /* - * @see javax.swing.tree.TreeModel#getIndexOfChild(java.lang.Object, java.lang.Object) - */ @Override public int getIndexOfChild(Object parent, Object child) { - int index = 0; + int index; if (parent == vcsList) { index = vcsList.indexOf(child); } else if (parent instanceof VCS) { @@ -199,17 +187,11 @@ return index; } - /* - * @see javax.swing.tree.TreeModel#getRoot() - */ @Override public Object getRoot() { return vcsList; } - /* - * @see javax.swing.tree.TreeModel#isLeaf(java.lang.Object) - */ @Override public boolean isLeaf(Object node) { boolean result = false; @@ -221,17 +203,11 @@ return result; } - /* - * @see javax.swing.tree.TreeModel#removeTreeModelListener(javax.swing.event.TreeModelListener) - */ @Override public void removeTreeModelListener(TreeModelListener l) { modelSupport.removeTreeModelListener(l); } - /* - * @see javax.swing.tree.TreeModel#valueForPathChanged(javax.swing.tree.TreePath, java.lang.Object) - */ @Override public void valueForPathChanged(TreePath path, Object newValue) { @@ -244,7 +220,7 @@ * @return sorted list */ protected List<File> getVersionnableSortedFiles(File[] filesArray) { - List<File> files = new ArrayList<File>(); + List<File> files = new ArrayList<>(); for (File fileArray : filesArray) { if (IsisFish.vcs.isVersionnableFile(fileArray)) { files.add(fileArray); @@ -298,7 +274,7 @@ */ protected boolean updateChildren(File file, TreePath path, int operation) { - Object pathLastComponent = (Object) path.getLastPathComponent(); + Object pathLastComponent = path.getLastPathComponent(); // pour ses enfants boolean updated = false; @@ -370,7 +346,7 @@ * @return tree path */ protected TreePath getRecursiveTreePath(File file, TreePath path) { - Object pathLastComponent = (Object) path.getLastPathComponent(); + Object pathLastComponent = path.getLastPathComponent(); TreePath resultTreePath = null; int childCount = getChildCount(pathLastComponent); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -169,7 +169,7 @@ public void setFactorCardinalityTableModel() { List<Factor> factors = getFactorGroup().getFactors(); - List<Factor> factorsContinue = new ArrayList<Factor>(); + List<Factor> factorsContinue = new ArrayList<>(); /* get sublist with only Continous factor */ for (Factor f : factors) { Domain domain = f.getDomain(); @@ -255,7 +255,7 @@ */ protected void setExportParams() { if (sensitivityChooserUI.selectedSensitivityExports.getSelectedIndices().length == 1) { - SensitivityExport export = (SensitivityExport)sensitivityChooserUI.selectedSensitivityExports.getSelectedValue(); + SensitivityExport export = sensitivityChooserUI.selectedSensitivityExports.getSelectedValue(); ScriptParametersTableModel model = new ScriptParametersTableModel(export); sensitivityChooserUI.exportParamsTable.setModel(model); sensitivityChooserUI.exportParamsTable.getColumnModel().getColumn(0).setCellRenderer(new ScriptParametersTableCellRenderer(export)); @@ -317,7 +317,7 @@ * @return sensitivity analysis names list */ public List<String> getSensitivityAnalysisNames() { - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); for (String r : SensitivityAnalysisStorage.getSensitivityAnalysisNames()) { // there is some non java files in sensitivity directory if (r.endsWith(".java")) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -198,7 +198,7 @@ inputContentUI.getSaveVerifier().setInputContentUI(inputContentUI); } - inputContentUI.setBean((TopiaEntityContextable)topiaEntity); + inputContentUI.setBean(topiaEntity); inputContentUI.setActive(topiaEntity != null); inputContentUI.setLayer(true); inputContentUI.setSensitivity(true); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -145,7 +145,7 @@ // sensitivity analysis found SensitivityAnalysis sensitivityAnalysis = null; //List<SimulationStorage> simulationStorageForAnalyze = new ArrayList<SimulationStorage>(); - SortedMap<Integer, SimulationStorage> simulationStorageForAnalyze = new TreeMap<Integer, SimulationStorage>(); + SortedMap<Integer, SimulationStorage> simulationStorageForAnalyze = new TreeMap<>(); File simuationDirectory = SimulationStorage.getSimulationDirectory(); for (File simuation : simuationDirectory.listFiles()) { if (simuation.isDirectory() @@ -174,7 +174,7 @@ if (!masterExportDirectory.isDirectory()) { masterExportDirectory.mkdirs(); } - List<SimulationStorage> simulationStorageForAnalyzeList = new ArrayList<SimulationStorage>( + List<SimulationStorage> simulationStorageForAnalyzeList = new ArrayList<>( simulationStorageForAnalyze.values()); sensitivityAnalysis.analyzeResult( simulationStorageForAnalyzeList, masterExportDirectory); @@ -200,7 +200,7 @@ public List<File> getSensitivitySecondPassResults( String masterSensitivitySimulationName) { - List<File> result = new ArrayList<File>(); + List<File> result = new ArrayList<>(); // build master sensitivity export directory File masterExportDirectory = new File(SimulationStorage.getSensitivityResultsDirectory(), masterSensitivitySimulationName); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -85,9 +85,6 @@ this.parent = parent; } - /* - * @see org.jdesktop.jxlayer.plaf.AbstractLayerUI#processMouseEvent(java.awt.event.MouseEvent, org.jdesktop.jxlayer.JXLayer) - */ @Override protected void processMouseEvent(MouseEvent event, JXLayer<? extends JComponent> layer) { @@ -147,9 +144,6 @@ } } - /* - * @see org.jdesktop.jxlayer.plaf.AbstractLayerUI#processMouseMotionEvent(java.awt.event.MouseEvent, org.jdesktop.jxlayer.JXLayer) - */ @Override protected void processMouseMotionEvent(MouseEvent e, JXLayer<? extends JComponent> l) { processMouseEvent(e, l); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorCardinalityTableModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorCardinalityTableModel.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorCardinalityTableModel.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -84,17 +84,11 @@ this.factors = factors; } - /* - * @see javax.swing.table.TableModel#getColumnCount() - */ @Override public int getColumnCount() { return COLUMN_NAMES.length; } - /* - * @see javax.swing.table.TableModel#getRowCount() - */ @Override public int getRowCount() { int count = 0; @@ -105,9 +99,6 @@ return count; } - /* - * @see javax.swing.table.TableModel#getValueAt(int, int) - */ @Override public Object getValueAt(int rowIndex, int columnIndex) { @@ -128,9 +119,6 @@ return result; } - /* - * @see javax.swing.table.TableModel#getColumnClass(int) - */ @Override public Class<?> getColumnClass(int columnIndex) { @@ -150,25 +138,16 @@ return result; } - /* - * @see javax.swing.table.TableModel#getColumnName(int) - */ @Override public String getColumnName(int columnIndex) { return COLUMN_NAMES[columnIndex]; } - /* - * @see javax.swing.table.TableModel#isCellEditable(int, int) - */ @Override public boolean isCellEditable(int rowIndex, int columnIndex) { return columnIndex > 0; } - /* - * @see javax.swing.table.TableModel#setValueAt(java.lang.Object, int, int) - */ @Override public void setValueAt(Object value, int rowIndex, int columnIndex) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListModel.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListModel.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -69,17 +69,11 @@ fireContentsChanged(this, 0, factors.size()); } - /* - * @see javax.swing.ListModel#getElementAt(int) - */ @Override public Factor getElementAt(int index) { return factors.get(index); } - /* - * @see javax.swing.ListModel#getSize() - */ @Override public int getSize() { int size = 0; Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTranferable.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTranferable.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTranferable.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -79,14 +79,11 @@ } } - /* - * @see java.awt.datatransfer.Transferable#getTransferData(java.awt.datatransfer.DataFlavor) - */ @Override public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException { - List<Factor> factorsToTransfer = null; + List<Factor> factorsToTransfer; if (flavor == null) { throw new IOException("flavor is null"); @@ -101,17 +98,11 @@ return factorsToTransfer; } - /* - * @see java.awt.datatransfer.Transferable#getTransferDataFlavors() - */ @Override public DataFlavor[] getTransferDataFlavors() { return new DataFlavor[] { myData }; } - /* - * @see java.awt.datatransfer.Transferable#isDataFlavorSupported(java.awt.datatransfer.DataFlavor) - */ @Override public boolean isDataFlavorSupported(DataFlavor flavor) { return flavor.equals(myData); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTransferHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTransferHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTransferHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -129,7 +129,7 @@ // only task can be moved ! List<Factor> selectedFactors = factorTree.getSelectedFactors(); if (selectedFactors != null && !selectedFactors.isEmpty()) { - List<Factor> factors = new LinkedList<Factor>(selectedFactors); + List<Factor> factors = new LinkedList<>(selectedFactors); transferable = new FactorTranferable(factors); } @@ -154,14 +154,10 @@ List<Factor> movedFactors = (List<Factor>) myObject; sensitivityInputUI.getHandler().moveFactor(selectedFactorGroup, movedFactors); } - } catch (IOException e) { + } catch (IOException | UnsupportedFlavorException e) { if (log.isErrorEnabled()) { log.error("Exception while transfering task", e); } - } catch (UnsupportedFlavorException e) { - if (log.isErrorEnabled()) { - log.error("Exception while transfering task", e); - } } } } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTree.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTree.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTree.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -100,7 +100,7 @@ */ public List<Factor> getSelectedFactors() { - List<Factor> factors = new ArrayList<Factor>(); + List<Factor> factors = new ArrayList<>(); TreePath[] selectedPaths = getSelectionModel().getSelectionPaths(); if (selectedPaths != null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -62,7 +62,7 @@ protected Map<String, Icon> iconCache; public FactorTreeCellRenderer() { - iconCache = new HashMap<String, Icon>(); + iconCache = new HashMap<>(); iconCache.put("c", Resource.getIcon("/icons/factors/c.png")); // continuous iconCache.put("d", Resource.getIcon("/icons/factors/d.png")); // discrete iconCache.put("dg", Resource.getIcon("/icons/factors/dgroup.png")); // group discrete @@ -69,9 +69,6 @@ iconCache.put("cg", Resource.getIcon("/icons/factors/cgroup.png")); // group continuous } - /* - * @see javax.swing.tree.TreeCellRenderer#getTreeCellRendererComponent(javax.swing.JTree, java.lang.Object, boolean, boolean, boolean, int, boolean) - */ @Override public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeModel.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeModel.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -60,12 +60,9 @@ */ public FactorTreeModel(Factor rootFactor) { this.rootFactor = rootFactor; - modelListeners = new ArrayList<TreeModelListener>(); + modelListeners = new ArrayList<>(); } - /* - * @see javax.swing.tree.TreeModel#getChild(java.lang.Object, int) - */ @Override public Object getChild(Object parent, int index) { @@ -79,9 +76,6 @@ return value; } - /* - * @see javax.swing.tree.TreeModel#getChildCount(java.lang.Object) - */ @Override public int getChildCount(Object parent) { @@ -95,9 +89,6 @@ return childCount; } - /* - * @see javax.swing.tree.TreeModel#getIndexOfChild(java.lang.Object, java.lang.Object) - */ @Override public int getIndexOfChild(Object parent, Object child) { @@ -111,41 +102,26 @@ return childIndex; } - /* - * @see javax.swing.tree.DefaultTreeModel#isLeaf(java.lang.Object) - */ @Override public boolean isLeaf(Object node) { return getChildCount(node) == 0; } - /* - * @see javax.swing.tree.TreeModel#addTreeModelListener(javax.swing.event.TreeModelListener) - */ @Override public void addTreeModelListener(TreeModelListener l) { modelListeners.add(l); } - /* - * @see javax.swing.tree.TreeModel#getRoot() - */ @Override public Object getRoot() { return rootFactor; } - /* - * @see javax.swing.tree.TreeModel#removeTreeModelListener(javax.swing.event.TreeModelListener) - */ @Override public void removeTreeModelListener(TreeModelListener l) { modelListeners.remove(l); } - /* - * @see javax.swing.tree.TreeModel#valueForPathChanged(javax.swing.tree.TreePath, java.lang.Object) - */ @Override public void valueForPathChanged(TreePath path, Object newValue) { throw new IsisFishRuntimeException("Not implemented"); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousDistributionPanel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousDistributionPanel.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/ContinuousDistributionPanel.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -77,7 +77,7 @@ protected Object originalValue; /** UI components used to fill distribution params value. */ - protected List<JComponent> paramComponents = new ArrayList<JComponent>(); + protected List<JComponent> paramComponents = new ArrayList<>(); public ContinuousDistributionPanel(Object originalValue) { @@ -98,7 +98,7 @@ } // combobox - distributionCombo = new JComboBox<Distribution>(values); + distributionCombo = new JComboBox<>(values); // important : for setSelectedItem to fire event distributionCombo.setSelectedItem(null); distributionCombo.addItemListener(this); @@ -151,9 +151,6 @@ } } - /* - * @see java.awt.event.ItemListener#itemStateChanged(java.awt.event.ItemEvent) - */ @Override public void itemStateChanged(ItemEvent e) { @@ -248,9 +245,6 @@ return result; } - /* - * @see fr.ifremer.isisfish.ui.sensitivity.wizard.ContinuousPanelContainerUI#isFactorValid() - */ @Override public boolean isFactorValid() { return true; Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/FactorWizardHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/FactorWizardHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/FactorWizardHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -671,7 +671,7 @@ */ protected JComponent getTypeDiscreteComponent(FactorWizardUI factorWizardUI, Class type, Object value) { - JComponent result = null; + JComponent result; if (TopiaEntity.class.isAssignableFrom(type)) { try { @@ -817,7 +817,7 @@ */ protected void saveDiscret(String name, String comment, String path, Component[] components, boolean exist) { - List<Object> values = new ArrayList<Object>(); + List<Object> values = new ArrayList<>(); boolean ruleFactor = false; boolean equationFactor = false; @@ -917,7 +917,7 @@ protected void addDiscreteFactor(DiscreteDomain domain, String name, String comment, String path, List<Object> values, boolean exist) { Factor f = new Factor(name); - SortedMap<Object, Object> domainValues = new TreeMap<Object, Object>(); + SortedMap<Object, Object> domainValues = new TreeMap<>(); int label = 0; for (Object value : values) { // FIXME test when integer @@ -964,7 +964,7 @@ * @param factorPath factor path to remove */ protected void removeFactor(FactorGroup factorGroup, String factorPath) { - Collection<Factor> factorCopy = new ArrayList<Factor>(factorGroup.getFactors()); + Collection<Factor> factorCopy = new ArrayList<>(factorGroup.getFactors()); for (Factor factor : factorCopy) { if (factor instanceof FactorGroup) { removeFactor((FactorGroup)factor, factorPath); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -25,7 +25,6 @@ import static org.nuiton.i18n.I18n.t; import java.util.Iterator; -import java.util.List; import java.util.Map; import javax.swing.event.ListSelectionEvent; @@ -57,7 +56,7 @@ } protected void afterInit() { - /** + /* * Listener to enable/disable remove button. */ tabUI.tableTagValues.getSelectionModel().addListSelectionListener(new ListSelectionListener() { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -237,7 +237,7 @@ */ @Deprecated protected void removeFactor(FactorGroup factorGroup, String factorPath) { - Collection<Factor> factorCopy = new ArrayList<Factor>(factorGroup.getFactors()); + Collection<Factor> factorCopy = new ArrayList<>(factorGroup.getFactors()); for (Factor factor : factorCopy) { if (factor instanceof FactorGroup) { removeFactor((FactorGroup)factor, factorPath); @@ -254,7 +254,7 @@ * @return model */ public GenericComboModel<String> getOptimizationComboModel() { - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); for (String r : OptimizationStorage.getOptimizationNames()) { // there is some non java files in sensitivity directory if (r.endsWith(".java")) { @@ -321,7 +321,7 @@ } } - GenericComboModel<String> model = new GenericComboModel<String>(result); + GenericComboModel<String> model = new GenericComboModel<>(result); return model; } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -120,7 +120,7 @@ regionStorageListener = new StorageChangeListener() { @Override public void versionDataChanged(StorageChangeEvent e) { - GenericComboModel<String> model = new GenericComboModel<String>(fr.ifremer.isisfish.datastore.RegionStorage.getRegionNames()); + GenericComboModel<String> model = new GenericComboModel<>(fr.ifremer.isisfish.datastore.RegionStorage.getRegionNames()); tabUI.fieldSimulParamsRegion.setModel(model); } }; @@ -301,14 +301,10 @@ FisheryRegion fisheryRegion = RegionStorage.getFisheryRegion(tx); tabUI.getParentContainer(SensitivityUI.class).getSensitivityInputUI().setFisheryRegion(fisheryRegion); tabUI.getParentContainer(SensitivityUI.class).getSensitivityInputUI().getHandler().setTreeModel(); - } catch (StorageException ex) { + } catch (StorageException | TopiaException ex) { if (log.isErrorEnabled()) { log.error("Can't reload factors", ex); } - } catch (TopiaException ex) { - if (log.isErrorEnabled()) { - log.error("Can't reload factors", ex); - } } } } @@ -426,7 +422,7 @@ if (result) { // force all necessary config simulation in tag value - Map<String, String> m = new HashMap<String, String>( + Map<String, String> m = new HashMap<>( IsisFish.config.getDefaultSimulationConfig()); Map<String, String> tv = getParameters().getTagValue(); m.putAll(tv); @@ -675,7 +671,7 @@ protected ComboBoxModel<String> getSimulParamsSelectModel(boolean force) { List<String> items = getFilteredOldSimulatorNames(force); - GenericComboModel<String> result = new GenericComboModel<String>(items); + GenericComboModel<String> result = new GenericComboModel<>(items); return result; } @@ -692,7 +688,7 @@ public List<String> getOldSimulationItem() { //try { - oldSimulNames = new ArrayList<String>(); + oldSimulNames = new ArrayList<>(); //FilterModel<SimulationProperties, String> filterModel; // keep in context list of old simulation names (for filter process) Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/PlanHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/PlanHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/PlanHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -138,7 +138,7 @@ } protected void removeSimulationPlan() { - SimulationPlan selectedSimulationPlan = (SimulationPlan)tabUI.listSimulParamsSimulationPlansList.getSelectedValue(); + SimulationPlan selectedSimulationPlan = tabUI.listSimulParamsSimulationPlansList.getSelectedValue(); removeSimulationPlan(selectedSimulationPlan); tabUI.listSimulParamsSimulationPlansList.setModel(getSimulationSimulationPlansListModel()); setSimulationPlanButtons(); @@ -166,7 +166,7 @@ } protected void setSimulParamsSimulationPlans() { - SimulationPlan selectedSimulationPlan = (SimulationPlan)tabUI.listSimulParamsSimulationPlansList.getSelectedValue(); + SimulationPlan selectedSimulationPlan = tabUI.listSimulParamsSimulationPlansList.getSelectedValue(); if (selectedSimulationPlan != null) { ScriptParametersTableModel model = new ScriptParametersTableModel(selectedSimulationPlan); tabUI.simulParamsSimulationPlans.setModel(model); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -247,7 +247,7 @@ * Display parameters table form single selected list. */ protected void displayRuleParameters() { - Rule selectedRule = (Rule)ruleChooser.getSelectedRulesList().getSelectedValue(); + Rule selectedRule = ruleChooser.getSelectedRulesList().getSelectedValue(); if (selectedRule != null) { ruleChooser.getSelectedRuleParameterTableModel().setScript(selectedRule); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulatorContext.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulatorContext.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulatorContext.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -103,7 +103,7 @@ } // tag values - Map<String, String> tv = new LinkedHashMap<String, String>(); + Map<String, String> tv = new LinkedHashMap<>(); tv.putAll(IsisFish.config.getDefaultTagValueAsMap()); tv.putAll(IsisFish.config.getDefaultSimulationConfig()); param.setTagValue(tv); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -112,9 +112,6 @@ return result; } - /* - * @see org.jdesktop.swingx.error.ErrorReporter#reportError(org.jdesktop.swingx.error.ErrorInfo) - */ @Override public void reportError(ErrorInfo errorInfo) throws NullPointerException { @@ -142,7 +139,7 @@ // message configuration message += formatMessage("Configuration", null); - List<String> propertiesNames = new ArrayList<String>(IsisFish.config.getOptions().stringPropertyNames()); + List<String> propertiesNames = new ArrayList<>(IsisFish.config.getOptions().stringPropertyNames()); Collections.sort(propertiesNames); for (String propertyName : propertiesNames) { // security, don't send string containing password : Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -75,7 +75,7 @@ protected boolean filtering = false; public FilterableComboBox() { - actionListeners = new ArrayList<ActionListener>(); + actionListeners = new ArrayList<>(); buildLayout(); } @@ -91,7 +91,7 @@ protected ComboBoxModel<T> model; - protected List<Integer> realIndexes = new ArrayList<Integer>(); + protected List<Integer> realIndexes = new ArrayList<>(); protected Object selectedItem; @@ -125,7 +125,7 @@ } // filter list - List<Integer> newRealIndexes = new ArrayList<Integer>(); + List<Integer> newRealIndexes = new ArrayList<>(); for (int i = 0; i < model.getSize(); ++i) { Object element = model.getElementAt(i); if (element.toString().contains(filterField.getText())) { @@ -173,9 +173,7 @@ } class FilterActionListener implements ActionListener { - /* - * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) - */ + @Override public void actionPerformed(ActionEvent e) { filterField.setText(""); @@ -183,9 +181,7 @@ } class ComboBoxActionListener implements ActionListener { - /* - * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) - */ + @Override public void actionPerformed(ActionEvent e) { if (!filtering) { @@ -253,9 +249,6 @@ return actionListeners.remove(o); } - /* - * @see javax.swing.event.ListDataListener#intervalAdded(javax.swing.event.ListDataEvent) - */ @Override public void intervalAdded(ListDataEvent e) { if (!filtering) { @@ -266,9 +259,6 @@ } } - /* - * @see javax.swing.event.ListDataListener#intervalRemoved(javax.swing.event.ListDataEvent) - */ @Override public void intervalRemoved(ListDataEvent e) { if (!filtering) { @@ -279,9 +269,6 @@ } } - /* - * @see javax.swing.event.ListDataListener#contentsChanged(javax.swing.event.ListDataEvent) - */ @Override public void contentsChanged(ListDataEvent e) { if (!filtering) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalLabel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalLabel.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalLabel.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -72,7 +72,7 @@ } protected String toString(int val) { - String result = null; + String result; if (renderArray != null && renderArray.length > val) { result = String.valueOf(renderArray[val]); } else { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -60,7 +60,7 @@ /** serialVersionUID. */ private static final long serialVersionUID = -2483612426979170213L; - protected Set<CellEditorListener> listeners = new HashSet<CellEditorListener>(); + protected Set<CellEditorListener> listeners = new HashSet<>(); protected EquationEditorPaneUI frame = null; Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -178,7 +178,7 @@ } break; case Boolean: - List<Boolean> listB = new ArrayList<Boolean>(); + List<Boolean> listB = new ArrayList<>(); listB.add(Boolean.TRUE); listB.add(Boolean.FALSE); c = new JComboBox(listB.toArray()); @@ -217,7 +217,7 @@ if (JComboBox.class.isInstance(editor)) { ((JComboBox) editor).addActionListener(getStopEditingListener()); } else if (JTextField.class.isInstance(editor)) { - ((JTextField) editor).addFocusListener(new FocusAdapter() { + editor.addFocusListener(new FocusAdapter() { @Override public void focusLost(FocusEvent e) { if (log.isDebugEnabled()) { Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/StepComponent.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/StepComponent.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/StepComponent.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -85,7 +85,7 @@ } public static JComboBox<Integer> createYearCombo(int nb, int selectedYear) { - JComboBox<Integer> year = new JComboBox<Integer>(); + JComboBox<Integer> year = new JComboBox<>(); for (int i = 0; i < nb; i++) { year.addItem(i); } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/text/LogTokenMarker.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/text/LogTokenMarker.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/widget/text/LogTokenMarker.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -36,9 +36,6 @@ */ public class LogTokenMarker extends AbstractTokenMaker { - private int currentTokenStart; - private int currentTokenType; - @Override public Token getTokenList(Segment text, int initialTokenType, int startOffset) { resetTokenList(); @@ -54,8 +51,8 @@ // 'newStartOffset+currentTokenStart' for one less subtraction operation. int newStartOffset = startOffset - offset; - currentTokenStart = offset; - currentTokenType = initialTokenType; + int currentTokenStart = offset; + int currentTokenType = initialTokenType; //beginning: for (int i=offset; i<end; i++) { @@ -81,7 +78,7 @@ // The "separators". case '|': - addToken(text, currentTokenStart,i, Token.SEPARATOR, newStartOffset+currentTokenStart); + addToken(text, currentTokenStart,i, Token.SEPARATOR, newStartOffset+ currentTokenStart); currentTokenType = Token.NULL; break; @@ -110,7 +107,7 @@ break; // Still whitespace. case '"': - addToken(text, currentTokenStart,i-1, Token.WHITESPACE, newStartOffset+currentTokenStart); + addToken(text, currentTokenStart,i-1, Token.WHITESPACE, newStartOffset + currentTokenStart); currentTokenStart = i; currentTokenType = Token.ERROR_STRING_DOUBLE; break; @@ -117,7 +114,7 @@ // The "separators". case '|': - addToken(text, currentTokenStart,i-1, Token.WHITESPACE, newStartOffset+currentTokenStart); + addToken(text, currentTokenStart,i-1, Token.WHITESPACE, newStartOffset + currentTokenStart); addToken(text, i,i, Token.SEPARATOR, newStartOffset+i); currentTokenType = Token.NULL; break; @@ -124,7 +121,7 @@ default: // Add the whitespace token and start anew. - addToken(text, currentTokenStart,i-1, Token.WHITESPACE, newStartOffset+currentTokenStart); + addToken(text, currentTokenStart,i-1, Token.WHITESPACE, newStartOffset + currentTokenStart); currentTokenStart = i; // Just to speed things up a tad, as this will usually be the case (if spaces above failed). @@ -148,7 +145,7 @@ case ' ': case '\t': // Check for REM comments. - if (i-currentTokenStart==3 && + if (i - currentTokenStart == 3 && (array[i-3]=='r' || array[i-3]=='R') && (array[i-2]=='e' || array[i-2]=='E') && (array[i-1]=='m' || array[i-1]=='M')) { @@ -155,13 +152,13 @@ currentTokenType = Token.COMMENT_EOL; break; } - addToken(text, currentTokenStart,i-1, Token.IDENTIFIER, newStartOffset+currentTokenStart); + addToken(text, currentTokenStart,i-1, Token.IDENTIFIER, newStartOffset+ currentTokenStart); currentTokenStart = i; currentTokenType = Token.WHITESPACE; break; case '"': - addToken(text, currentTokenStart,i-1, Token.IDENTIFIER, newStartOffset+currentTokenStart); + addToken(text, currentTokenStart,i-1, Token.IDENTIFIER, newStartOffset+ currentTokenStart); currentTokenStart = i; currentTokenType = Token.ERROR_STRING_DOUBLE; break; @@ -168,7 +165,7 @@ // The "separators". case '|': - addToken(text, currentTokenStart,i-1, Token.IDENTIFIER, newStartOffset+currentTokenStart); + addToken(text, currentTokenStart,i-1, Token.IDENTIFIER, newStartOffset+ currentTokenStart); addToken(text, i,i, Token.SEPARATOR, newStartOffset+i); currentTokenType = Token.NULL; break; @@ -189,7 +186,7 @@ case Token.COMMENT_EOL: i = end - 1; - addToken(text, currentTokenStart,i, Token.COMMENT_EOL, newStartOffset+currentTokenStart); + addToken(text, currentTokenStart,i, Token.COMMENT_EOL, newStartOffset+ currentTokenStart); // We need to set token type to null so at the bottom we don't add one more token. currentTokenType = Token.NULL; break; @@ -196,7 +193,7 @@ case Token.PREPROCESSOR: // Used for labels i = end - 1; - addToken(text, currentTokenStart,i, Token.PREPROCESSOR, newStartOffset+currentTokenStart); + addToken(text, currentTokenStart,i, Token.PREPROCESSOR, newStartOffset+ currentTokenStart); // We need to set token type to null so at the bottom we don't add one more token. currentTokenType = Token.NULL; break; @@ -204,7 +201,7 @@ case Token.ERROR_STRING_DOUBLE: if (c=='"') { - addToken(text, currentTokenStart,i, Token.LITERAL_STRING_DOUBLE_QUOTE, newStartOffset+currentTokenStart); + addToken(text, currentTokenStart,i, Token.LITERAL_STRING_DOUBLE_QUOTE, newStartOffset+ currentTokenStart); currentTokenStart = i + 1; currentTokenType = Token.NULL; } @@ -220,7 +217,7 @@ if (currentTokenType != Token.NULL) { // Check for REM comments. - if (end-currentTokenStart==3 && + if (end- currentTokenStart ==3 && (array[end-3]=='r' || array[end-3]=='R') && (array[end-2]=='e' || array[end-2]=='E') && (array[end-1]=='m' || array[end-1]=='M')) { @@ -227,7 +224,7 @@ currentTokenType = Token.COMMENT_EOL; } - addToken(text, currentTokenStart,end-1, currentTokenType, newStartOffset+currentTokenStart); + addToken(text, currentTokenStart,end-1, currentTokenType, newStartOffset+ currentTokenStart); } addNullToken(); Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditorUI.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditorUI.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/widget/text/SyntaxEditorUI.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -300,7 +300,7 @@ SearchEvent.Type type = e.getType(); SearchContext context = e.getSearchContext(); - SearchResult result = null; + SearchResult result; switch (type) { default: // Prevent FindBugs warning later @@ -326,10 +326,7 @@ break; } } - - /* - * @see javax.swing.event.CaretListener#caretUpdate(javax.swing.event.CaretEvent) - */ + @Override public void caretUpdate(CaretEvent e) { // selection pas vide si dot = mark Modified: trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -80,7 +80,7 @@ * @return File list */ public static List<File> searchSrcToCompile(File srcDir, File destDir) { - List<File> result = new ArrayList<File>(); + List<File> result = new ArrayList<>(); for (File src : srcDir.listFiles()) { File dest = new File(FileUtil.basename(src, ".java"), ".class"); if (src.getName().endsWith(".java") && FileUtils.isFileNewer(src, dest)) { @@ -187,7 +187,7 @@ PrintWriter out) { int result = -10000; try { - List<File> classpath = new ArrayList<File>(); + List<File> classpath = new ArrayList<>(); classpath.add(rootSrc.getAbsoluteFile()); @@ -220,7 +220,7 @@ int result = -1000; try { - List<String> args = new ArrayList<String>(); + List<String> args = new ArrayList<>(); // use eclipse ecj compiler JavaCompiler compiler = new EclipseCompiler(); @@ -342,7 +342,7 @@ Args args = interfaceMethod.getAnnotation(Args.class); String[] names = args.value(); - String[] stringTypes = null; + String[] stringTypes; ArgTypes argTypes = interfaceMethod.getAnnotation(ArgTypes.class); if (argTypes != null) { stringTypes = argTypes.value(); @@ -377,7 +377,7 @@ text = texts[0]; } - String result = null; + String result; if (type.startsWith("fr.ifremer.isisfish")) { String ref = IsisFish.config.getJavadocURL() + type.replaceAll("\\.", "/") + ".html"; result = "<a href='" + ref + "'>" + text + "</a>"; Modified: trunk/src/main/java/fr/ifremer/isisfish/util/DependencyUtil.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/DependencyUtil.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/util/DependencyUtil.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -81,8 +81,8 @@ * @return extract class set */ public static Set<String> extractDependencies(File rootDirectory, Collection<File> files) { - Set<String> deps = new HashSet<String>(); - Set<File> alreadyDone = new HashSet<File>(); + Set<String> deps = new HashSet<>(); + Set<File> alreadyDone = new HashSet<>(); recursiveExtractDependencies(rootDirectory, files, alreadyDone, deps); return deps; } Modified: trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -115,7 +115,7 @@ // on est dans une simulation, on verifie dans le cache de la simulation Map<String, String> cache = (Map<String, String>)context.getValue(HASH_CACHE_KEY); if (cache == null) { - context.setValue(HASH_CACHE_KEY, cache = new HashMap<String, String>()); + context.setValue(HASH_CACHE_KEY, cache = new HashMap<>()); } cache.put(fileCheckSum.getPath(), hashcode); @@ -191,7 +191,7 @@ className = javaInterface.getSimpleName() + normalizeClassName(className); Object result; - Class clazz = null; + Class clazz; // recherche la methode de l'interface Method [] methods = javaInterface.getDeclaredMethods(); @@ -253,7 +253,7 @@ protected static void compile(File fileRootSrc, File fileSrc) { try { - List<File> classpath = new ArrayList<File>(); + List<File> classpath = new ArrayList<>(); classpath.add(fileRootSrc.getAbsoluteFile()); classpath.add(IsisFish.config.getDatabaseDirectory().getAbsoluteFile()); int compileResult = CompileHelper.compile(classpath, Collections.singletonList(fileSrc), fileRootSrc, null); Modified: trunk/src/main/java/fr/ifremer/isisfish/util/IsisCache.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/IsisCache.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/util/IsisCache.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -90,7 +90,7 @@ * La representation de la methode en string, la representation commence * par un @ si il y a l'annotation noCache trouver pour cette methode. */ - protected Map<Method, String> methodStringCache = new HashMap<Method, String>(); + protected Map<Method, String> methodStringCache = new HashMap<>(); // use to compute key, isis simulation is monothread, we can instanciate it here // to minimise object instanciation protected StringBuilder sbKey = new StringBuilder(300); @@ -276,9 +276,6 @@ // this.maxMemory = maxMemory; // } // -// /* (non-Javadoc) -// * @see java.util.LinkedHashMap#removeEldestEntry(java.util.Map.Entry) -// */ // @Override // protected boolean removeEldestEntry(Entry<String, Object> eldest) { // double free = 100.0 * Runtime.getRuntime().freeMemory() / Runtime.getRuntime().maxMemory() ; Modified: trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -66,7 +66,7 @@ public Class getType(String typeName) { // In simulation context : - Class clazz = null; + Class clazz; try { // try first exact class (need for java.lang.String, java.lang.Integer, ...) clazz = Class.forName(typeName); @@ -97,7 +97,7 @@ public Object getValue(Class type, String valueId) { // In simulation context : - Object value = null; + Object value; try { // les populations groupes sont speciaux car ils n'ont pas de // noms. Dans l'import il sont composé du nom de la population Modified: trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -143,7 +143,7 @@ PrintWriter out) { int result = -1; try { - List<File> classpath = new ArrayList<File>(); + List<File> classpath = new ArrayList<>(); classpath.add(rootSrc.getAbsoluteFile()); result = generateJavadoc(classpath, filesSrc, dest, out); } catch (Exception eee) { @@ -176,7 +176,7 @@ // Options de compilations String classpathAsString = CompileHelper.getClassPathAsString(classpath); - List<String> args = new ArrayList<String>(); + List<String> args = new ArrayList<>(); args.add("-classpath"); args.add(classpathAsString); args.add("-d"); Modified: trunk/src/main/java/fr/ifremer/isisfish/util/MatrixCSVHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/MatrixCSVHelper.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/util/MatrixCSVHelper.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -106,7 +106,7 @@ * @return new list */ protected List<String> undecorate(List l) { - ArrayList<String> result = new ArrayList<String>(l.size()); + List<String> result = new ArrayList<>(l.size()); for (Object o : l) { result.add(undecorate(o)); } @@ -142,13 +142,13 @@ // lecture du nom des dimensions et des semantics - List<String> dimNames = new ArrayList<String>(); - List<List<String>> semantics = new ArrayList<List<String>>(); + List<String> dimNames = new ArrayList<>(); + List<List<String>> semantics = new ArrayList<>(); String dimName = sp.readString(':'); while (!sp.isEOL() || StringUtils.isNotBlank(dimName)) { dimNames.add(dimName); - List<String> sems = new ArrayList<String>(); + List<String> sems = new ArrayList<>(); semantics.add(sems); while (!sp.isEOL()) { String sem = sp.readString(';'); Modified: trunk/src/main/java/fr/ifremer/isisfish/util/MatrixConverter.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/MatrixConverter.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/util/MatrixConverter.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -48,9 +48,7 @@ protected Converter defaultStringConverter = new org.apache.commons.beanutils.converters.StringConverter(); - /* - * @see org.apache.commons.beanutils.Converter#convert(java.lang.Class, java.lang.Object) - */ + @Override public Object convert(Class type, Object value) { Object result; if (value instanceof MatrixND) { @@ -67,9 +65,6 @@ return result; } - /* - * @see org.nuiton.math.matrix.MatrixStringEncoder#getQualifiedName(java.lang.Object) - */ @Override public String getQualifiedName(Object o) { Modified: trunk/src/main/java/fr/ifremer/isisfish/util/MonthConverter.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/MonthConverter.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/util/MonthConverter.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -39,11 +39,9 @@ */ public class MonthConverter implements Converter { - /* (non-Javadoc) - * @see org.apache.commons.beanutils.Converter#convert(java.lang.Class, java.lang.Object) - */ + @Override public Object convert(Class type, Object value) { - Object result = null; + Object result; if (value instanceof Month) { result = value; } else if (value instanceof String) { Modified: trunk/src/main/java/fr/ifremer/isisfish/util/RangeOfValuesConverter.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/RangeOfValuesConverter.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/util/RangeOfValuesConverter.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -40,9 +40,7 @@ */ public class RangeOfValuesConverter implements Converter { - /* (non-Javadoc) - * @see org.apache.commons.beanutils.Converter#convert(java.lang.Class, java.lang.Object) - */ + @Override public Object convert(Class type, Object value) { Object result; if (value instanceof RangeOfValues) { Modified: trunk/src/main/java/fr/ifremer/isisfish/util/StringConverter.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/StringConverter.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/util/StringConverter.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -51,9 +51,7 @@ protected Converter defaultStringConverter = new org.apache.commons.beanutils.converters.StringConverter(); - /* - * @see org.apache.commons.beanutils.Converter#convert(java.lang.Class, java.lang.Object) - */ + @Override public Object convert(Class type, Object o) { Object result = null; if (o != null) { Modified: trunk/src/main/java/fr/ifremer/isisfish/util/TimeStepConverter.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/TimeStepConverter.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/util/TimeStepConverter.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -40,9 +40,7 @@ */ public class TimeStepConverter implements Converter { - /* (non-Javadoc) - * @see org.apache.commons.beanutils.Converter#convert(java.lang.Class, java.lang.Object) - */ + @Override public Object convert(Class type, Object value) { Object result; if (value instanceof TimeStep) { Modified: trunk/src/main/java/fr/ifremer/isisfish/util/TimeUnitConverter.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/TimeUnitConverter.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/util/TimeUnitConverter.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -40,9 +40,7 @@ */ public class TimeUnitConverter implements Converter { - /* (non-Javadoc) - * @see org.apache.commons.beanutils.Converter#convert(java.lang.Class, java.lang.Object) - */ + @Override public Object convert(Class type, Object value) { Object result; if (value instanceof TimeUnit) { Modified: trunk/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -66,7 +66,7 @@ @Override public Object convert(Class type, Object value) { - Object result = null; + Object result; if (value == null) { result = null; } else if (value instanceof TopiaEntity) { Modified: trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -132,9 +132,6 @@ JOptionPane.showMessageDialog(null, message); } - /* - * @see com.jcraft.jsch.UIKeyboardInteractive#promptKeyboardInteractive(java.lang.String, java.lang.String, java.lang.String, java.lang.String[], boolean[]) - */ @Override public String[] promptKeyboardInteractive(String destination, String name, String instruction, String[] prompt, boolean[] echo) { Modified: trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -195,7 +195,7 @@ public static int exec(Session session, String command, Writer out) throws SSHException { - int exitStatus = 0; + int exitStatus; BufferedReader br = null; try { @@ -205,7 +205,7 @@ br = new BufferedReader(new InputStreamReader(channel.getInputStream())); channel.connect(); - String line = null; + String line; while (true) { while ((line = br.readLine()) != null) { if (out != null) { @@ -230,10 +230,8 @@ } channel.disconnect(); // end read buffer - } catch (JSchException e) { + } catch (JSchException | IOException e) { throw new SSHException("I/O error while executing command", e); - } catch (IOException e) { - throw new SSHException("I/O error while executing command", e); } finally { IOUtils.closeQuietly(br); } @@ -283,10 +281,8 @@ sendAck(out); startRemoteCpProtocol(in, out, localFile, monitor); - } catch (IOException e) { + } catch (IOException | JSchException e) { throw new SSHException(e); - } catch (JSchException e) { - throw new SSHException(e); } finally { if (channel != null) { channel.disconnect(); @@ -308,10 +304,8 @@ try { doSingleTransfer(session, localFile, remoteFilePath); - } catch (IOException e) { + } catch (IOException | JSchException e) { throw new SSHException(e); - } catch (JSchException e) { - throw new SSHException(e); } } @@ -469,12 +463,10 @@ waitForAck(in); // send a content of lfile - FileInputStream fis = null; byte[] buf = new byte[BUFFER_SIZE]; //long totalLength = 0; - try { - fis = new FileInputStream(localFile); + try (FileInputStream fis = new FileInputStream(localFile)) { while (true) { int len = fis.read(buf, 0, buf.length); if (len <= 0) { @@ -486,8 +478,6 @@ out.flush(); sendAck(out); waitForAck(in); - } finally { - fis.close(); } } @@ -558,12 +548,8 @@ // Ignored } getDir(channel, remotePath, localFile); - } catch (SftpException e) { + } catch (SftpException | JSchException | IOException e) { throw new SSHException(e); - } catch (JSchException e) { - throw new SSHException(e); - } catch (IOException e) { - throw new SSHException(e); } finally { if (channel != null) { channel.disconnect(); @@ -608,7 +594,7 @@ String remoteFile = le.getFilename(); if (!localFile.exists()) { String path = localFile.getAbsolutePath(); - int i = 0; + int i; if ((i = path.lastIndexOf(File.pathSeparator)) != -1) { if (path.length() > File.pathSeparator.length()) { new File(path.substring(0, i)).mkdirs(); @@ -643,10 +629,8 @@ String remoteFilePath) throws SSHException { try { doSingleSftpransfer(session, localFile, remoteFilePath); - } catch (IOException e) { + } catch (IOException | JSchException e) { throw new SSHException(e); - } catch (JSchException e) { - throw new SSHException(e); } } Modified: trunk/src/main/java/fr/ifremer/isisfish/vcs/AbstractVCS.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/vcs/AbstractVCS.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/vcs/AbstractVCS.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -46,7 +46,7 @@ /** Class logger */ private static Log log = LogFactory.getLog(AbstractVCS.class); - protected Set<VetoableActionListener> listeners = new HashSet<VetoableActionListener>(); + protected Set<VetoableActionListener> listeners = new HashSet<>(); protected File localRepository; protected String protocol; protected String host; Modified: trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -123,10 +123,10 @@ */ static protected VCS makeVCSInstance(String classname, File dataDir, String protocol, String host, String path, File sshKeyFile, String login, String password) { - VCS result = null; + VCS result; try { Class<VCS> clazz = (Class<VCS>) ConvertUtils.convert(classname, Class.class); - result = (VCS) ConstructorUtils.invokeConstructor(clazz, + result = ConstructorUtils.invokeConstructor(clazz, new Object[]{dataDir, protocol, host, path, sshKeyFile, login, password}); } catch (Exception eee) { if (log.isErrorEnabled()) { Modified: trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSNone.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSNone.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSNone.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -33,6 +33,8 @@ import org.nuiton.util.version.Version; +import javax.persistence.OrderColumn; + /** * VCSNone (svn or vcs) must extends this class. This class can be used as dummy * VCSNone if not valid VCSNone found. @@ -51,6 +53,7 @@ password); } + @Override public boolean isValidLocalRepository() { return true; } @@ -60,6 +63,7 @@ * @param version version number like 3.2 * @return true if tag found with this name */ + @Override public boolean isTag(Version version) throws VCSException { return false; } @@ -68,6 +72,7 @@ * Ask if there are some new or modified files on server * @return true if new file available */ + @Override public boolean haveUpdate() throws VCSException { return false; } @@ -76,8 +81,9 @@ * get list of new or modified files on server * @return list of modified or new files */ + @Override public List<File> getUpdatedFile() throws VCSException { - return new ArrayList<File>(); + return new ArrayList<>(); } /** @@ -86,18 +92,17 @@ * @param files * @return changelog for each file */ + @Override public Map<File, String> getChanglog(List<File> files) { - return new HashMap<File, String>(); + return new HashMap<>(); } - /* - * @see fr.ifremer.isisfish.vcs.VCS#cleanup() - */ @Override public void cleanup(File path) throws VCSException { } - + + @Override public void commit(List<File> files, String msg) throws VCSException { throw new VCSException("Can't commit file with dummy VCS"); } @@ -108,6 +113,7 @@ * @param msg message for commit * @throws VCSException */ + @Override public void add(List<File> files, String msg) throws VCSException { throw new VCSException("Can't add file with dummy VCS"); } @@ -119,6 +125,7 @@ * @param b * @throws VCSException */ + @Override public void checkout(Version tag, boolean b) throws VCSException { throw new VCSException("Can't checkout with dummy VCS"); } @@ -129,6 +136,7 @@ * @param msg message for commit * @throws VCSException */ + @Override public void delete(List<File> files, String msg) throws VCSException { // do nothing } @@ -140,13 +148,11 @@ * @return diff * @throws VCSException */ + @Override public String getDiff(File file) throws VCSException { throw new VCSException("Can't diff with dummy VCS"); } - /* - * @see fr.ifremer.isisfish.vcs.VCS#getLocalStatus(java.io.File) - */ @Override public Status getLocalStatus(File file) throws VCSException { return Status.STATUS_NORMAL; @@ -158,8 +164,9 @@ * @param directory * @return files list */ + @Override public List<String> getFileList(File directory) throws VCSException { - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); return result; } @@ -167,6 +174,7 @@ * Get connection state. * @return true if server is connected */ + @Override public boolean isConnected() { return false; } @@ -177,6 +185,7 @@ * @return true if file available * @throws VCSException */ + @Override public boolean isOnRemote(File file) throws VCSException { return false; } @@ -187,6 +196,7 @@ * @return true if file is in last version * @throws VCSException */ + @Override public boolean isUpToDate(File file) throws VCSException { return true; } @@ -197,32 +207,34 @@ * @return true if there are some merging conflict, false otherwise * @throws VCSException */ + @Override public List<File> update(File file, boolean recurse) throws VCSException { throw new VCSException("Can't update file with dummy VCS"); } + @Override public void checkProtocol() throws VCSException { // nothing to do } - public void checkPath() throws VCSException { - // nothing to do - } - + @Override public List<File> checkFileStatus() throws VCSException { // nothing to do return null; } + @Override public boolean isWriteable() throws VCSException { return false; } + @Override public List<File> setTag(Version version) throws VCSException { // do nothing return null; } + @Override public String getTag() throws VCSException { return null; } Modified: trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -359,7 +359,7 @@ String host = getHost(); String path = getPath(); - String result = null; + String result; if (proto.startsWith("file")) { result = proto + "://" + path; @@ -375,9 +375,6 @@ return result; } - /* - * @see fr.ifremer.isisfish.vcs.AbstractVCS#isVersionnableFile(java.io.File) - */ @Override public boolean isVersionnableFile(File file) { @@ -511,9 +508,6 @@ } } - /* - * @see org.nuiton.isisfish.vcs.VCS#checkout(org.nuiton.util.Version, boolean) - */ @Override public void checkout(Version tag, boolean recurse) throws VCSException { @@ -569,9 +563,6 @@ } } - /* - * @see fr.ifremer.isisfish.vcs.VCS#getLocalStatus(java.io.File) - */ @Override public Status getLocalStatus(File file) throws VCSException { @@ -619,9 +610,8 @@ localFile = getLocalRepository(); } - final Map<File, SVNStatus> result = new HashMap<File, SVNStatus>(); - final Set<SVNStatusType> acceptedStatusType = new HashSet<SVNStatusType>( - Arrays.asList(wanted)); + final Map<File, SVNStatus> result = new HashMap<>(); + final Set<SVNStatusType> acceptedStatusType = new HashSet<>(Arrays.asList(wanted)); ISVNStatusHandler handler = new ISVNStatusHandler() { public void handleStatus(SVNStatus status) throws SVNException { @@ -683,7 +673,7 @@ localFile = getLocalRepository(); } - final Map<File, SVNStatus> result = new HashMap<File, SVNStatus>(); + final Map<File, SVNStatus> result = new HashMap<>(); ISVNStatusHandler handler = new ISVNStatusHandler() { public void handleStatus(SVNStatus status) throws SVNException { @@ -736,7 +726,7 @@ */ public Map<File, String> getChanglog(List<File> files) throws VCSException { - final Map<File, String> changLog = new HashMap<File, String>(); + final Map<File, String> changLog = new HashMap<>(); try { SVNInfo info = getSVNManager().getWCClient().doInfo(getLocalRepository(), @@ -751,8 +741,7 @@ public void handleLogEntry(SVNLogEntry logEntry) throws SVNException { - for (Map.Entry<String, SVNLogEntryPath> entry : (Set<Map.Entry<String, SVNLogEntryPath>>) logEntry - .getChangedPaths().entrySet()) { + for (Map.Entry<String, SVNLogEntryPath> entry : logEntry.getChangedPaths().entrySet()) { String path = entry.getKey(); SVNLogEntryPath value = entry.getValue(); @@ -807,7 +796,7 @@ @Override public String getDiff(File file) throws VCSException { - String diff = null; + String diff; try (ByteArrayOutputStream byte1 = new ByteArrayOutputStream()) { @@ -823,18 +812,13 @@ diff = byte1.toString(StandardCharsets.UTF_8.name()); - } catch (SVNException e) { + } catch (SVNException | IOException e) { throw new VCSException(t("isisfish.vcs.vcssvn.diff.error"), e); - } catch (IOException e) { - throw new VCSException(t("isisfish.vcs.vcssvn.diff.error"), e); } return diff; } - /* - * @see org.nuiton.isisfish.vcs.VCS#getFileList(java.io.File) - */ @Override public List<String> getFileList(File directory) throws VCSException { @@ -844,7 +828,7 @@ } // Handler - final List<String> files = new ArrayList<String>(); + final List<String> files = new ArrayList<>(); ISVNDirEntryHandler handler = new ISVNDirEntryHandler() { @Override @@ -886,7 +870,7 @@ try { - final List<File> result = new ArrayList<File>(); + final List<File> result = new ArrayList<>(); ISVNStatusHandler handler = new ISVNStatusHandler() { @@ -1039,12 +1023,9 @@ return isUpToDate; } - /* - * @see org.nuiton.isisfish.vcs.VCS#update(java.io.File, boolean) - */ @Override public List<File> update(File file, boolean recurse) throws VCSException { - List<File> result = new ArrayList<File>(); + List<File> result = new ArrayList<>(); try { File localFile = file; @@ -1096,9 +1077,6 @@ return result; } - /* - * @see org.nuiton.isisfish.vcs.VCS#isWriteable() - */ @Override public boolean isWriteable() throws VCSException { @@ -1123,9 +1101,6 @@ return result; } - /* - * @see org.nuiton.isisfish.vcs.VCS#isTag(org.nuiton.util.Version) - */ @Override public boolean isTag(Version version) throws VCSException { boolean result = version == null; // le trunk exist toujours @@ -1145,9 +1120,6 @@ return result; } - /* - * @see org.nuiton.isisfish.vcs.VCS#getTag() - */ @Override public String getTag() throws VCSException { try { @@ -1169,9 +1141,6 @@ } } - /* - * @see org.nuiton.isisfish.vcs.VCS#setTag(org.nuiton.util.Version) - */ @Override public List<File> setTag(Version version) throws VCSException { @@ -1223,7 +1192,7 @@ Map<File, SVNStatus> status = getLocalStatus(localRoot, true, SVNStatusType.STATUS_CONFLICTED); if (!status.isEmpty()) { - filesInConflict = new ArrayList<File>(); + filesInConflict = new ArrayList<>(); filesInConflict.addAll(status.keySet()); // on supprime les conflits pour pouvoir commiter convenablement // les fichiers Modified: trunk/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/resources/i18n/isis-fish_en_GB.properties 2017-03-08 14:17:18 UTC (rev 4397) @@ -795,7 +795,7 @@ isisfish.script.commit.tooltip=Commit script to SVN server isisfish.script.compilation.failed=%s isisfish.script.compilation.ok=Compilation complete.\n---------------------\n\n%s -isisfish.script.compilingfile=Compiling %s... +isisfish.script.compilingfile=Compiling %s... isisfish.script.copy=Copy isisfish.script.copy.tooltip=Copy current selection (Ctrl-c) isisfish.script.cut=Cut @@ -922,7 +922,7 @@ isisfish.simulator.configuration.r.testok=R successfully tested \! isisfish.simulator.configuration.r.title=R Configuration isisfish.simulator.launcher.inprocess=in current process -isisfish.simulator.launcher.remote=on Caparmor server +isisfish.simulator.launcher.remote=on Caparmor server isisfish.simulator.launcher.subprocess=in subprocess isisfish.simulator.simulaction.badid=Can't start simulation, bad id\: %s isisfish.simulator.ssh.configuration.connecting=Connection... @@ -1045,7 +1045,7 @@ isisfish.welcome.menu.close=Close isisfish.welcome.menu.configuration=Configuration isisfish.welcome.menu.configuration.r=R configuration -isisfish.welcome.menu.configuration.sshlauncher=Caparmor configuration +isisfish.welcome.menu.configuration.sshlauncher=Caparmor configuration isisfish.welcome.menu.configuration.vcs=VCS configuration isisfish.welcome.menu.file=File isisfish.welcome.menu.frame=Window Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2017-03-08 14:17:18 UTC (rev 4397) @@ -538,7 +538,7 @@ isisfish.message.delete.entities=Supprimer les entités isisfish.message.delete.entity=Supprimer l'entité isisfish.message.delete.finished=Suppression terminée -isisfish.message.delete.object=Pour supprimer l'objet %1$s, tous les objets suivants seront aussi supprimés \n\n +isisfish.message.delete.object=Pour supprimer l'objet %1$s, tous les objets suivants seront aussi supprimés\n\n isisfish.message.evaluation.finished=évaluation terminée isisfish.message.export.done=Export terminé isisfish.message.export.export=Export des résultats @@ -652,7 +652,7 @@ isisfish.params.toString.script.presimulation=Script de presimulation isisfish.params.toString.simul.logger.level=niveau du logger de simulateur \: %1$s isisfish.params.toString.simulation.done=Simulation réalisée avec \: %1$s -isisfish.params.toString.strategies=Stratégies d'exploitation \: +isisfish.params.toString.strategies=Stratégies d'exploitation \: isisfish.params.toString.use.cache=Utiliser le cache de simulation isisfish.params.toString.use.optimization=Utiliser une méthode d'optimisation isisfish.params.useOptimization=Utiliser une méthode d'optimisation @@ -929,7 +929,7 @@ isisfish.simulator.ssh.configuration.connectingpk=Connexion en cours (avec clé publique) isisfish.simulator.ssh.configuration.connection=Information de connexion isisfish.simulator.ssh.configuration.connectionerror=Connexion impossible (%s) -isisfish.simulator.ssh.configuration.connectionok=Connecté avec succès +isisfish.simulator.ssh.configuration.connectionok=Connecté avec succès isisfish.simulator.ssh.configuration.environment=Configuration sur Caparmor isisfish.simulator.ssh.configuration.freespace=Espace disque utilisé \: isisfish.simulator.ssh.configuration.freespace.confirmdelete=Attention, la suppression du dossier '%s' est irréversible.\nConfirmez-vous la suppression de son contenu ? Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/ExportStepStorageTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/ExportStepStorageTest.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/ExportStepStorageTest.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -73,7 +73,7 @@ .getTemplate(ExportStorage.EXPORT_TEMPLATE); // context values - Map<String, Object> root = new HashMap<String, Object>(); + Map<String, Object> root = new HashMap<>(); // FIXME what is category ? root.put("category", ""); root.put("name", fileName); Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/ExportStorageTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/ExportStorageTest.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/ExportStorageTest.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -73,7 +73,7 @@ .getTemplate(ExportStorage.EXPORT_TEMPLATE); // context values - Map<String, Object> root = new HashMap<String, Object>(); + Map<String, Object> root = new HashMap<>(); // FIXME what is category ? root.put("category", ""); root.put("name", fileName); Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/migration/AutoDatabaseMigrationClass.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/migration/AutoDatabaseMigrationClass.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/migration/AutoDatabaseMigrationClass.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -41,9 +41,6 @@ */ public class AutoDatabaseMigrationClass extends DatabaseMigrationClass { - /* - * @see org.nuiton.topia.migration.AbstractTopiaMigrationCallback#askUser(org.nuiton.util.Version, java.util.List) - */ @Override public boolean askUser(Version dbVersion, List<Version> versions) { return true; Modified: trunk/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -62,7 +62,7 @@ /** Logger for this class */ private static final Log log = LogFactory.getLog(PopulationSeasonInfoTest.class); - /* + /** * Test method for 'fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl.getGroupChangeMatrix(Month)' */ @Test @@ -72,7 +72,7 @@ int nbrZone = 2; boolean groupplus = true; - List<String> sem = new ArrayList<String>(); + List<String> sem = new ArrayList<>(); for (int i = 0; i < nbrAge; i++) { for (int j = 0; j < nbrZone; j++) { @@ -152,7 +152,7 @@ mi.setValue(i++); } - List<String> sem = new ArrayList<String>(); + List<String> sem = new ArrayList<>(); for (i = 0; i < nbclasses; i++) { for (int j = 0; j < nbsecteurs; j++) { Modified: trunk/src/test/java/fr/ifremer/isisfish/logging/LoggerHelper.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/logging/LoggerHelper.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/test/java/fr/ifremer/isisfish/logging/LoggerHelper.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -270,15 +270,6 @@ /** the throwable details the event */ protected String[] throwableStrRep; - /** origin filename of the event */ - //protected transient String filename; - - /** origin method name of the event */ - //protected transient String methodName; - - /** origin line number of the event */ - //protected transient int lineNumber; - /** * the string represention of logEvent, transient since we use a lazy getter * we don't need to store it. Modified: trunk/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -56,8 +56,8 @@ Log logInit = LogFactory.getLog(appenderId); Log logInit2 = LogFactory.getLog(appenderId + ".hip"); - List<String> messagesToWrite = new ArrayList<String>(); - List<String> messagesToSkip = new ArrayList<String>(); + List<String> messagesToWrite = new ArrayList<>(); + List<String> messagesToSkip = new ArrayList<>(); logInfo(logInit, "before new config", null, null); logInfo(logInit2, "before new config", null, null); @@ -128,12 +128,12 @@ System.out.println("test messages to be skipped"); for (String s : messagesToSkip) { - Assert.assertTrue("should not have write this entry : '" + s + "'", logFileContent.indexOf(s) == -1); + Assert.assertTrue("should not have write this entry : '" + s + "'", !logFileContent.contains(s)); } System.out.println("test messages to be written"); for (String s : messagesToWrite) { - Assert.assertTrue("should have write this entry : '" + s + "'", logFileContent.indexOf(s) > -1); + Assert.assertTrue("should have write this entry : '" + s + "'", logFileContent.contains(s)); } logFile.delete(); @@ -146,8 +146,8 @@ Log logInit = LogFactory.getLog(appenderId); Log logInit2 = LogFactory.getLog(appenderId + ".hip"); - List<String> messagesToWrite = new ArrayList<String>(); - List<String> messagesToSkip = new ArrayList<String>(); + List<String> messagesToWrite = new ArrayList<>(); + List<String> messagesToSkip = new ArrayList<>(); logDebug(logInit, "before new config", null); logDebug(logInit2, "before new config", null); @@ -219,11 +219,11 @@ for (String s : messagesToSkip) { - Assert.assertTrue(logFileContent.indexOf(s) == -1); + Assert.assertTrue(!logFileContent.contains(s)); } for (String s : messagesToWrite) { - Assert.assertTrue(s, logFileContent.indexOf(s) > -1); + Assert.assertTrue(s, logFileContent.contains(s)); } logFile.delete(); Modified: trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -195,7 +195,7 @@ // factor 7 : rule factor Factor factorRuleDiscrete = new Factor("factor 7 (RuleDiscrete)"); RuleDiscreteDomain domain7 = new RuleDiscreteDomain(); - SortedMap<Object, Object> rules = new TreeMap<Object, Object>(); + SortedMap<Object, Object> rules = new TreeMap<>(); rules.put("ruleset1", Arrays.asList(ruleTacPoids, ruleTailleMin)); rules.put("ruleset2", Arrays.asList(ruleTailleMin)); domain7.setValues(rules); @@ -217,7 +217,7 @@ // factor 8 : discrete rule params factor Factor factorRuleParamsDiscrete = new Factor("factor 8 (RuleParamsDiscrete)"); DiscreteDomain domain8 = new DiscreteDomain(); - SortedMap<Object, Object> values8 = new TreeMap<Object, Object>(); + SortedMap<Object, Object> values8 = new TreeMap<>(); TopiaContext context = regionContext.beginTransaction(); values8.put("1", IsisFishDAOHelper.getStrategyDAO(context).findByName("PelProfil1")); values8.put("2", IsisFishDAOHelper.getStrategyDAO(context).findByName("PelProfil2")); @@ -362,16 +362,16 @@ } // factor groups - Assert.assertTrue(xml.indexOf("<feature name=\"group\">continuousgrp") != -1); - Assert.assertTrue(xml.indexOf("<feature name=\"grouptype\">continuous") != -1); - Assert.assertTrue(xml.indexOf("<feature name=\"group\">discretegrp") != -1); - Assert.assertTrue(xml.indexOf("<feature name=\"group\">discrete") != -1); + Assert.assertTrue(xml.contains("<feature name=\"group\">continuousgrp")); + Assert.assertTrue(xml.contains("<feature name=\"grouptype\">continuous")); + Assert.assertTrue(xml.contains("<feature name=\"group\">discretegrp")); + Assert.assertTrue(xml.contains("<feature name=\"group\">discrete")); // factor 6 - Assert.assertTrue(xml.indexOf("<rule name=\"TACpoids\">") != -1); - Assert.assertTrue(xml.indexOf("<rule name=\"TailleMin\">") != -1); - Assert.assertTrue(xml.indexOf("<param key=\"rule.0.parameter.propSurvie\">42.0</param>") != -1); - Assert.assertTrue(xml.indexOf("<param key=\"rule.0.parameter.species\">fr.ifremer.isisfish.entities.Species#1169028645830#0.022262364425031378:EngEnc</param>") != -1); + Assert.assertTrue(xml.contains("<rule name=\"TACpoids\">")); + Assert.assertTrue(xml.contains("<rule name=\"TailleMin\">")); + Assert.assertTrue(xml.contains("<param key=\"rule.0.parameter.propSurvie\">42.0</param>")); + Assert.assertTrue(xml.contains("<param key=\"rule.0.parameter.species\">fr.ifremer.isisfish.entities.Species#1169028645830#0.022262364425031378:EngEnc</param>")); } /** @@ -429,11 +429,11 @@ } // factor groups - Assert.assertTrue(xml.indexOf("type=\"string\"") != -1); + Assert.assertTrue(xml.contains("type=\"string\"")); // factor 8 - Assert.assertTrue(xml.indexOf("<level>Strategy:PelProfil1</level>") != -1); - Assert.assertTrue(xml.indexOf("<level>Strategy:PelProfil2</level>") != -1); + Assert.assertTrue(xml.contains("<level>Strategy:PelProfil1</level>")); + Assert.assertTrue(xml.contains("<level>Strategy:PelProfil2</level>")); } /** Modified: trunk/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -87,7 +87,7 @@ // ========== here some tests ========== // all factors must have a non null name - Assert.assertTrue("A factor has a null name", xmlExport.indexOf("name=\"null\"") == -1); + Assert.assertTrue("A factor has a null name", !xmlExport.contains("name=\"null\"")); // TODO this assert is correct, for <factor name=""> // but fail on <mx name=""> //Assert.assertTrue("A factor has no name", xmlExport.indexOf("name=\"\"") == -1); @@ -94,7 +94,7 @@ // must be present (for BaseMotosICA base) // equation is a special case (entity too) - Assert.assertTrue("An equation factor is missing", xmlExport.indexOf("Population.Anchois_long.growth") != -1); + Assert.assertTrue("An equation factor is missing", xmlExport.contains("Population.Anchois_long.growth")); // close all context.closeContext(); @@ -135,10 +135,10 @@ continue; } - Assert.assertTrue("Entity " + entityPart + " is not present in xml export", xmlExport.indexOf(entityPart) != -1); + Assert.assertTrue("Entity " + entityPart + " is not present in xml export", xmlExport.contains(entityPart)); String propertyPart = property.substring(property.indexOf('.')); - Assert.assertTrue("Property " + property + " is not present in xml export", xmlExport.indexOf(propertyPart) != -1); + Assert.assertTrue("Property " + property + " is not present in xml export", xmlExport.contains(propertyPart)); } // close all Modified: trunk/src/test/java/fr/ifremer/isisfish/rule/RuleMock.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/rule/RuleMock.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/test/java/fr/ifremer/isisfish/rule/RuleMock.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -46,33 +46,21 @@ this.description = description; } - /* - * @see fr.ifremer.isisfish.rule.Rule#getNecessaryResult() - */ @Override public String[] getNecessaryResult() { return null; } - /* - * @see fr.ifremer.isisfish.rule.Rule#getDescription() - */ @Override public String getDescription() throws Exception { return description; } - /* - * @see fr.ifremer.isisfish.rule.Rule#init(fr.ifremer.isisfish.simulator.SimulationContext) - */ @Override public void init(SimulationContext context) throws Exception { } - /* - * @see fr.ifremer.isisfish.rule.Rule#condition(fr.ifremer.isisfish.simulator.SimulationContext, fr.ifremer.isisfish.types.TimeStep, fr.ifremer.isisfish.entities.Metier) - */ @Override public boolean condition(SimulationContext context, TimeStep step, Metier metier) throws Exception { @@ -79,9 +67,6 @@ return false; } - /* - * @see fr.ifremer.isisfish.rule.Rule#preAction(fr.ifremer.isisfish.simulator.SimulationContext, fr.ifremer.isisfish.types.TimeStep, fr.ifremer.isisfish.entities.Metier) - */ @Override public void preAction(SimulationContext context, TimeStep step, Metier metier) throws Exception { @@ -89,9 +74,6 @@ } - /* - * @see fr.ifremer.isisfish.rule.Rule#postAction(fr.ifremer.isisfish.simulator.SimulationContext, fr.ifremer.isisfish.types.TimeStep, fr.ifremer.isisfish.entities.Metier) - */ @Override public void postAction(SimulationContext context, TimeStep step, Metier metier) throws Exception { Modified: trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitorTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitorTest.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitorTest.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -49,11 +49,11 @@ */ public class SimulationMonitorTest extends AbstractIsisFishTest { - protected SortedSet<SimpleEntry<Date, SimulationJob>> checkSet = new TreeSet<SimpleEntry<Date, SimulationJob>>(new Comparator<SimpleEntry<Date, SimulationJob>>(){ + protected SortedSet<SimpleEntry<Date, SimulationJob>> checkSet = new TreeSet<>(new Comparator<SimpleEntry<Date, SimulationJob>>() { @Override public int compare(SimpleEntry<Date, SimulationJob> o1, - SimpleEntry<Date, SimulationJob> o2) { - + SimpleEntry<Date, SimulationJob> o2) { + int result = o1.getKey().compareTo(o2.getKey()); if (result == 0) { result = o1.getValue().compareTo(o2.getValue()); @@ -60,7 +60,7 @@ } return result; } - + }); @Test @@ -76,8 +76,8 @@ SimulationJob job2 = new SimulationJob(service, item2, 0); Date d = new Date(); - checkSet.add(new SimpleEntry<Date, SimulationJob>(d, job1)); - checkSet.add(new SimpleEntry<Date, SimulationJob>(d, job2)); + checkSet.add(new SimpleEntry<>(d, job1)); + checkSet.add(new SimpleEntry<>(d, job2)); Assert.assertEquals(2, checkSet.size()); } Modified: trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -105,7 +105,7 @@ // simulator params.setSimulatorName("SimulatorEffortByCell.java"); // set population - List<Population> pops = new ArrayList<Population>(); + List<Population> pops = new ArrayList<>(); Population pop = new PopulationImpl(); pop.setName("test population"); pop.setPopulationGroup(new ArrayList<PopulationGroup>()); @@ -113,7 +113,7 @@ pops.add(pop); params.setPopulations(pops); // strat - List<Strategy> strats = new ArrayList<Strategy>(); + List<Strategy> strats = new ArrayList<>(); Strategy strategy = new StrategyImpl(); strategy.setName("stratest"); strats.add(strategy); @@ -247,7 +247,7 @@ // set params region params.setRegionName("DemoRegion"); // set population - List<Population> pops = new ArrayList<Population>(); + List<Population> pops = new ArrayList<>(); Population pop = new PopulationImpl(); pop.setName("test population"); pop.setPopulationGroup(new ArrayList<PopulationGroup>()); @@ -255,7 +255,7 @@ pops.add(pop); params.setPopulations(pops); // strat - List<Strategy> strats = new ArrayList<Strategy>(); + List<Strategy> strats = new ArrayList<>(); Strategy strategy = new StrategyImpl(); strategy.setName("stratest"); strats.add(strategy); @@ -303,7 +303,7 @@ // scenario Scenario scenario = new Scenario(); - List<Factor> factors = new ArrayList<Factor>(); + List<Factor> factors = new ArrayList<>(); factors.add(factor); scenario.setFactors(factors); @@ -361,7 +361,7 @@ // scenario Scenario scenario = new Scenario(); - List<Factor> factors = new ArrayList<Factor>(); + List<Factor> factors = new ArrayList<>(); factors.add(factor1); factors.add(factor2); scenario.setFactors(factors); @@ -394,7 +394,7 @@ // scenario Scenario scenario = new Scenario(); - List<Factor> factors = new ArrayList<Factor>(); + List<Factor> factors = new ArrayList<>(); factors.add(factorEquation); scenario.setFactors(factors); @@ -444,12 +444,12 @@ Factor factorRule = new Factor("myRuleParams"); factorPop.setDomain(new RuleDiscreteDomain()); factorRule.setPath("parameters.rules"); - List<Rule> rules = new ArrayList<Rule>(); + List<Rule> rules = new ArrayList<>(); rules.add(ruleTacPoids); rules.add(ruleTailleMin); factorRule.setValue(rules); - List<Factor> factors = new ArrayList<Factor>(); + List<Factor> factors = new ArrayList<>(); factors.add(factorPop); factors.add(factorRule); scenario1.setFactors(factors); @@ -483,7 +483,7 @@ factorPop.setPath("parameters.rule.0.parameter.tacInTons"); factorPop.setValue(42.0); - List<Factor> factors = new ArrayList<Factor>(); + List<Factor> factors = new ArrayList<>(); factors.add(factorPop); scenario1.setFactors(factors); @@ -590,7 +590,7 @@ // factor 1 Factor factor1 = new Factor("factor 1 (equation)"); EquationDiscreteDomain domain1 = new EquationDiscreteDomain(); - SortedMap<Object, Object> values = new TreeMap<Object, Object>(); + SortedMap<Object, Object> values = new TreeMap<>(); values.put("1", "String myValue=\"test\";\nreturn 0.0;"); values.put("2", "String myValue=\"test2\";\nreturn 0.2;"); domain1.setValues(values); Modified: trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -211,10 +211,10 @@ Rule ruleC = new RuleMock("ship number restriction"); // rules set - Collection<Rule> rules1 = new ArrayList<Rule>(); // 0 rule - Collection<Rule> rules2 = new ArrayList<Rule>(); // 1 rule + Collection<Rule> rules1 = new ArrayList<>(); // 0 rule + Collection<Rule> rules2 = new ArrayList<>(); // 1 rule rules2.add(ruleA); - Collection<Rule> rules3 = new ArrayList<Rule>(); // 3 rule + Collection<Rule> rules3 = new ArrayList<>(); // 3 rule rules3.add(ruleA); rules3.add(ruleB); rules3.add(ruleC); Modified: trunk/src/test/java/fr/ifremer/isisfish/types/MonthTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/types/MonthTest.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/test/java/fr/ifremer/isisfish/types/MonthTest.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -52,7 +52,7 @@ @Test public void listTest() { - List<Month> monthList = new LinkedList<Month>(); + List<Month> monthList = new LinkedList<>(); monthList.add(new Month(0)); monthList.add(new Month(1)); monthList.add(new Month(2)); @@ -67,12 +67,12 @@ @Test public void maxtrixWithMonth() { - List<Month> monthList = new LinkedList<Month>(); + List<Month> monthList = new LinkedList<>(); monthList.add(new Month(0)); monthList.add(new Month(1)); monthList.add(new Month(2)); - List<Month> monthList2 = new LinkedList<Month>(); + List<Month> monthList2 = new LinkedList<>(); monthList2.add(Month.FEBRUARY); MatrixND tmp = MatrixFactory.getInstance().create( Modified: trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -111,7 +111,7 @@ String code = getFirstClassContent(filename); FileUtils.writeStringToFile(f, code); - List<File> classpath = new ArrayList<File>(); + List<File> classpath = new ArrayList<>(); classpath.add(f.getParentFile()); CompileHelper.compile(classpath, Collections.singletonList(f), f @@ -152,7 +152,7 @@ File dest = new File(fB.getParentFile(), "testCompile"); - List<File> classpath = new ArrayList<File>(); + List<File> classpath = new ArrayList<>(); classpath.add(fB.getParentFile()); int result = CompileHelper.compile(classpath, Collections.singletonList(fB), dest, null); Assert.assertEquals(0, result); Modified: trunk/src/test/java/fr/ifremer/isisfish/util/EvaluatorHelperTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/util/EvaluatorHelperTest.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/test/java/fr/ifremer/isisfish/util/EvaluatorHelperTest.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -95,7 +95,7 @@ @Test public void testDoubleContentEvaluate() { - Map<String, Object> args = new HashMap<String, Object>(); + Map<String, Object> args = new HashMap<>(); args.put("context", null); args.put("length", 2.0); args.put("group", null); Modified: trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2017-03-08 10:27:30 UTC (rev 4396) +++ trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2017-03-08 14:17:18 UTC (rev 4397) @@ -454,7 +454,7 @@ File secondFile = new File(vcs.getLocalRepository() + File.separator + "simulations" + File.separator + "simu1" + File.separator + "simulation.properties"); - List<File> files = new ArrayList<File>(); + List<File> files = new ArrayList<>(); files.add(firstFile); files.add(secondFile); @@ -530,7 +530,7 @@ vcs.checkout(null, true); File directory = null; - List<String> expResult = new ArrayList<String>(3); + List<String> expResult = new ArrayList<>(3); expResult.add("regions"); expResult.add("scripts"); expResult.add("simulations"); @@ -568,7 +568,7 @@ // previous added dir, should not appear in list File directory = null; - List<String> expResult = new ArrayList<String>(3); + List<String> expResult = new ArrayList<>(3); expResult.add("regions"); expResult.add("scripts"); expResult.add("simulations"); @@ -606,7 +606,7 @@ // previous added dir, should appear in list File directory = null; - List<String> expResult = new ArrayList<String>(3); + List<String> expResult = new ArrayList<>(3); expResult.add("regions"); expResult.add("scripts"); expResult.add("simulations"); @@ -630,7 +630,7 @@ log.info("testGetUpdatedFile()"); } - List<File> expResult = new ArrayList<File>(); + List<File> expResult = new ArrayList<>(); expResult.add(new File(vcs.getLocalRepository().getAbsolutePath() + File.separator + "test")); expResult.add(vcs.getLocalRepository()); @@ -666,7 +666,7 @@ log.info("testGetUpdatedFile()"); } - List<File> expResult = new ArrayList<File>(); + List<File> expResult = new ArrayList<>(); // checkout current trunk vcs.checkout(null, true);

1 0

r4396 - in trunk: . src/main/java/fr/ifremer/isisfish/logging src/main/java/fr/ifremer/isisfish/simulator src/test/java/fr/ifremer/isisfish/vcs
by echatellier＠users.forge.codelutin.com March 8, 2017

March 8, 2017

Author: echatellier Date: 2017-03-08 11:27:30 +0100 (Wed, 08 Mar 2017) New Revision: 4396 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4396 Log: Update libs. Fix build and tests. Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/logging/RegionChangeLogger.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2017-02-23 08:32:39 UTC (rev 4395) +++ trunk/pom.xml 2017-03-08 10:27:30 UTC (rev 4396) @@ -20,7 +20,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>3.0-rc-16</version> + <version>3.0-rc-18</version> <scope>compile</scope> </dependency> @@ -27,7 +27,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.1.1</version> + <version>3.2</version> <scope>compile</scope> </dependency> @@ -34,7 +34,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>3.0.1</version> + <version>3.1</version> <scope>compile</scope> </dependency> @@ -111,25 +111,25 @@ <dependency> <groupId>com.fifesoft</groupId> <artifactId>rsyntaxtextarea</artifactId> - <version>2.6.0</version> + <version>2.6.1</version> </dependency> <dependency> <groupId>com.fifesoft</groupId> <artifactId>rstaui</artifactId> - <version>2.6.0</version> + <version>2.6.1</version> </dependency>  <dependency> @@ -229,7 +229,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.22</version> + <version>1.7.24</version> <scope>runtime</scope> </dependency> @@ -242,7 +242,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>2.7</version> + <version>2.8.1</version> <scope>compile</scope> </dependency> @@ -249,7 +249,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> - <version>2.7</version> + <version>2.8.1</version> <scope>compile</scope> </dependency> @@ -256,7 +256,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> - <version>2.7</version> + <version>2.8.1</version> <scope>runtime</scope> </dependency> @@ -263,7 +263,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> - <version>2.7</version> + <version>2.8.1</version> <scope>runtime</scope> </dependency> @@ -396,19 +396,19 @@ <dependency> <groupId>com.opencsv</groupId> <artifactId>opencsv</artifactId> - <version>3.8</version> + <version>3.9</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.8.5</version> + <version>2.8.7</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.8.5</version> + <version>2.8.7</version> </dependency>  @@ -564,11 +564,11 @@ <signatureVersion>1.0</signatureVersion>  - <jaxxVersion>2.37</jaxxVersion> + <jaxxVersion>2.41</jaxxVersion> <eugeneVersion>2.14</eugeneVersion> <topiaVersion>2.12-SNAPSHOT</topiaVersion> - <hibernateVersion>5.1.3.Final</hibernateVersion> - <nuitonI18nVersion>3.6.2</nuitonI18nVersion> + <hibernateVersion>5.1.4.Final</hibernateVersion> + <nuitonI18nVersion>3.6.3</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> <redmine.releaseFiles>target/isis-fish-${project.version}-bin.zip</redmine.releaseFiles> @@ -575,21 +575,17 @@ <skipPostRelease>false</skipPostRelease> <releaseEmailDomain>forge.codelutin.com</releaseEmailDomain> <releaseEmail>noreply(a)forge.codelutin.com</releaseEmail> + <redmine.url>https://forge.${platform}</redmine.url>  - <javadocPluginVersion>2.10.3</javadocPluginVersion> + <javadocPluginVersion>2.10.4</javadocPluginVersion> + <assemblyPluginVersion>3.0.0</assemblyPluginVersion> + <jarPluginVersion>3.0.2</jarPluginVersion> + <surefirePluginVersion>2.19.1</surefirePluginVersion> + <sitePluginVersion>3.6</sitePluginVersion> + <jrstPluginVersion>2.3-SNAPSHOT</jrstPluginVersion> <maven.javadoc.skip>false</maven.javadoc.skip> - <animalSnifferPluginVersion>1.14</animalSnifferPluginVersion> - <redmine.url>https://forge.${platform}</redmine.url> - <maven.javadoc.skip>false</maven.javadoc.skip> - -  + <animalSnifferPluginVersion>1.15</animalSnifferPluginVersion> </properties> <distributionManagement> Modified: trunk/src/main/java/fr/ifremer/isisfish/logging/RegionChangeLogger.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/logging/RegionChangeLogger.java 2017-02-23 08:32:39 UTC (rev 4395) +++ trunk/src/main/java/fr/ifremer/isisfish/logging/RegionChangeLogger.java 2017-03-08 10:27:30 UTC (rev 4396) @@ -28,7 +28,7 @@ import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.RegionStorage; import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.lang.time.DateFormatUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.hibernate.SessionFactory; Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2017-02-23 08:32:39 UTC (rev 4395) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2017-03-08 10:27:30 UTC (rev 4396) @@ -40,6 +40,7 @@ import java.util.Properties; import fr.ifremer.isisfish.types.Month; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -327,11 +328,11 @@ List groups = pop.getPopulationGroup(); List zones = pop.getPopulationZone(); - if (groups.isEmpty()) { - groups.add("No group"); + if (CollectionUtils.isEmpty(groups)) { + groups = Collections.singletonList("No group"); } - if (zones.isEmpty()) { - zones.add("No zone"); + if (CollectionUtils.isEmpty(zones)) { + zones = Collections.singletonList("No zone"); } List[] semantics = new List[] { groups, zones }; result = MatrixFactory.getInstance().create( Modified: trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2017-02-23 08:32:39 UTC (rev 4395) +++ trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2017-03-08 10:27:30 UTC (rev 4396) @@ -75,7 +75,7 @@ private static Log log = LogFactory.getLog(VCSSVNTest.class); /** Run test out of target directory for SVN to not find parent .svn with not supported svn format. */ - public static final File TMPDIR = new File("target"); + public static final File TMPDIR = new File("target").getAbsoluteFile(); public static final String FILECONTENTTAG = "Version 3.1.0"; public static final String FILECONTENTTRUNK = "Version 3.2.0"; @@ -479,7 +479,7 @@ Map<File, String> result = vcs.getChanglog(files); - Map<File, String> expResult = new HashMap<File, String>(); + Map<File, String> expResult = new HashMap<>(); expResult.put(firstFile, "mise a jour de la version"); expResult.put(secondFile, "mise a jour de la version"); Assert.assertEquals(expResult, result);

1 0