Author: echatellier Date: 2014-09-26 15:57:59 +0200 (Fri, 26 Sep 2014) New Revision: 4116 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4116 Log: Fix deprecated Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListModel.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnGuava.java Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java 2014-09-26 13:57:09 UTC (rev 4115) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java 2014-09-26 13:57:59 UTC (rev 4116) @@ -53,7 +53,7 @@ * Mise a jour: $Date$ * par : $Author$ * - * @deprecated ResultStorageCSV now support no storage and in memory usage + * @deprecated ResultStorageCSV now support no storage and in memory usage, will be removed in version 4.4 */ public class ResultStorageInMemory extends ResultStorageAbstract { Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2014-09-26 13:57:09 UTC (rev 4115) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2014-09-26 13:57:59 UTC (rev 4116) @@ -41,12 +41,11 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.logging.log4j.ThreadContext; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.util.FileUtil; -import org.nuiton.util.Version; import org.nuiton.util.ZipUtil; +import org.nuiton.util.version.Versions; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishDAOHelper; @@ -525,11 +524,9 @@ // mais il faut pouvoir relire les anciennes simulations SimulationParameter param = getParameter(); String isisFishVersion = param.getIsisFishVersion(); - Version simuVersion = new Version(isisFishVersion); - Version version4200 = new Version(4, 2, 0, 0); // instancier un ResultStorage ou un ResultMappedStorage - if (simuVersion.before(version4200)) { + if (Versions.smallerThan(isisFishVersion, "4.2.0.0")) { resultStorage = new ResultDatabaseStorage(this); } else { // if user ask for ResultStorageInMemory, used it Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2014-09-26 13:57:09 UTC (rev 4115) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2014-09-26 13:57:59 UTC (rev 4116) @@ -77,7 +77,7 @@ return getContextValue(SimulAction.class); } - public ComboBoxModel getSensitivityAnalysisModel() { + public ComboBoxModel<String> getSensitivityAnalysisModel() { List<String> sensitivityNames = getSimulAction().getSensitivityAnalysisNames(); SensitivityAnalysisComboModel model = new SensitivityAnalysisComboModel(sensitivityNames); return model; Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListModel.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListModel.java 2014-09-26 13:57:09 UTC (rev 4115) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListModel.java 2014-09-26 13:57:59 UTC (rev 4116) @@ -42,7 +42,7 @@ * Last update : $Date$ * By : $Author$ */ -public class FactorListModel extends DefaultListModel { +public class FactorListModel extends DefaultListModel<Factor> { /** serialVersionUID. */ private static final long serialVersionUID = 2281927104735245489L; @@ -73,7 +73,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public Factor getElementAt(int index) { return factors.get(index); } Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2014-09-26 13:57:09 UTC (rev 4115) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2014-09-26 13:57:59 UTC (rev 4116) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2014 Ifremer, CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2014-09-26 13:57:09 UTC (rev 4115) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2014-09-26 13:57:59 UTC (rev 4116) @@ -306,7 +306,7 @@ } } -protected ComboBoxModel getSimulParamsSelectModel() { +protected ComboBoxModel<String> getSimulParamsSelectModel() { return getSimulParamsSelectModel(false); } Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnGuava.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnGuava.java 2014-09-26 13:57:09 UTC (rev 4115) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnGuava.java 2014-09-26 13:57:59 UTC (rev 4116) @@ -94,7 +94,7 @@ // elle meme qu'elle soit dans le backend ou non est // certainement utilisee ailleur, donc seul la taille // des pointeurs dans la collection est prise ici - result += ((Collection)value).size() * POINTER_SIZE; + result += ((Collection<?>)value).size() * POINTER_SIZE; } else if (value instanceof Number) { // int| double // seulement une valeur, on ajoute 1 @@ -228,7 +228,7 @@ // to keep more memory for JVM sizeCache = Math.min(this.maxCache, amount); - CacheBuilder builder = CacheBuilder.newBuilder(); + CacheBuilder<Object, Object> builder = CacheBuilder.newBuilder(); builder.maximumWeight(sizeCache); builder.weigher(isisWeigher); if (initialCapacity > 0) {