[Isis-fish-commits] r4120 - in branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish: aspect datastore entities mexico mexico/export simulator simulator/sensitivity ui/config ui/input ui/input/tree/loadors ui/result ui/script ui/vcs util

26 Sep 2014

Author: echatellier
Date: 2014-09-26 17:27:17 +0200 (Fri, 26 Sep 2014)
New Revision: 4120

Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4120

Log:
Misc fixes

Modified:
   branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/aspect/AspectJUrlClassLoader.java
   branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java
   branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java
   branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java
   branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java
   branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java
   branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java
   branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorHelper.java
   branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java
   branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java
   branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/ObservationsNodeLoador.java
   branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java
   branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java
   branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java
   branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx
   branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnReferenceMap.java

Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/aspect/AspectJUrlClassLoader.java
===================================================================

--- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/aspect/AspectJUrlClassLoader.java	2014-09-26 14:50:24 UTC (rev 4119)
+++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/aspect/AspectJUrlClassLoader.java	2014-09-26 15:27:17 UTC (rev 4120)
@@ -71,13 +71,13 @@
         adaptor = new AspectJWeavingAdaptor(getParent(), this);
     }
 
-    private static String getAspectPath() {
+    /*private static String getAspectPath() {
         return System.getProperty(WEAVING_ASPECT_PATH, "");
     }
 
     private static String getClassPath() {
         return System.getProperty(WEAVING_CLASS_PATH, "");
-    }
+    }*/
 
     protected void addURL(URL url) {
         adaptor.addURL(url);

Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java
===================================================================
--- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java	2014-09-26 14:50:24 UTC (rev 4119)
+++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java	2014-09-26 15:27:17 UTC (rev 4120)
@@ -32,7 +32,6 @@
 import org.apache.commons.collections4.map.ReferenceMap;
 
 import fr.ifremer.isisfish.IsisFish;
-import fr.ifremer.isisfish.IsisFishException;
 import fr.ifremer.isisfish.export.SensitivityExport;
 import fr.ifremer.isisfish.vcs.VCSException;
 

Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java
===================================================================
--- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java	2014-09-26 14:50:24 UTC (rev 4119)
+++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java	2014-09-26 15:27:17 UTC (rev 4120)
@@ -36,7 +36,6 @@
 import org.apache.commons.logging.LogFactory;
 
 import fr.ifremer.isisfish.IsisFish;
-import fr.ifremer.isisfish.IsisFishException;
 import fr.ifremer.isisfish.simulator.SimulationPlan;
 import fr.ifremer.isisfish.util.Doc;
 import fr.ifremer.isisfish.vcs.VCSException;

Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java
===================================================================
--- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java	2014-09-26 14:50:24 UTC (rev 4119)
+++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java	2014-09-26 15:27:17 UTC (rev 4120)
@@ -25,8 +25,6 @@
 
 package fr.ifremer.isisfish.entities;
 
-import static org.nuiton.i18n.I18n.t;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java
===================================================================
--- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java	2014-09-26 14:50:24 UTC (rev 4119)
+++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java	2014-09-26 15:27:17 UTC (rev 4120)
@@ -415,7 +415,7 @@
                 ruleAsString.append("<param key=\"");
                 ruleAsString.append(propName);
                 ruleAsString.append("\">");
-                ruleAsString.append(StringEscapeUtils.escapeXml(props.getProperty(propName)));
+                ruleAsString.append(StringEscapeUtils.escapeXml11(props.getProperty(propName)));
                 ruleAsString.append("</param>");
             }
             ruleAsString.append("</rule>");

Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java
===================================================================
--- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java	2014-09-26 14:50:24 UTC (rev 4119)
+++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java	2014-09-26 15:27:17 UTC (rev 4120)
@@ -272,7 +272,7 @@
             // not initialized equation can be null :(
             if (value != null) {
                 result = String.valueOf(((Equation)value).getContent());
-                result = StringEscapeUtils.escapeXml(result);
+                result = StringEscapeUtils.escapeXml11(result);
             }
         }
         // default case, just toString() on value

Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java
===================================================================
--- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java	2014-09-26 14:50:24 UTC (rev 4119)
+++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java	2014-09-26 15:27:17 UTC (rev 4120)
@@ -43,7 +43,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.math.matrix.MatrixFactory;
-import org.nuiton.math.matrix.MatrixHelper;
 import org.nuiton.math.matrix.MatrixND;
 import org.nuiton.topia.TopiaContext;
 import org.nuiton.topia.TopiaException;

Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorHelper.java
===================================================================
--- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorHelper.java	2014-09-26 14:50:24 UTC (rev 4119)
+++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorHelper.java	2014-09-26 15:27:17 UTC (rev 4120)
@@ -36,7 +36,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.math.matrix.MatrixND;
-import org.nuiton.topia.persistence.TopiaEntity;
 
 import fr.ifremer.isisfish.rule.Rule;
 import fr.ifremer.isisfish.rule.RuleHelper;

Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java
===================================================================
--- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java	2014-09-26 14:50:24 UTC (rev 4119)
+++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java	2014-09-26 15:27:17 UTC (rev 4120)
@@ -352,6 +352,7 @@
      * 
      * @param session opened session
      * @return 'pwd' result
+     * @throws SSHException 
      */
     protected String getUserHomeDirectory(Session session) throws SSHException {
 
@@ -372,7 +373,9 @@
      * Get user home directory with an opened session.
      * 
      * @param session opened session
-     * @return 'pwd' result
+     * @param path path to get size
+     * @return dir size
+     * @throws SSHException 
      */
     protected String getFolderSize(Session session, String path) throws SSHException {
 

Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java
===================================================================
--- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java	2014-09-26 14:50:24 UTC (rev 4119)
+++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java	2014-09-26 15:27:17 UTC (rev 4120)
@@ -33,7 +33,6 @@
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import javax.swing.JComponent;
@@ -59,7 +58,6 @@
 import fr.ifremer.isisfish.IsisFishDAOHelper;
 import fr.ifremer.isisfish.IsisFishRuntimeException;
 import fr.ifremer.isisfish.datastore.RegionStorage;
-import fr.ifremer.isisfish.datastore.SimulationStorage;
 import fr.ifremer.isisfish.datastore.StorageException;
 import fr.ifremer.isisfish.entities.Cell;
 import fr.ifremer.isisfish.entities.FisheryRegion;

Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/ObservationsNodeLoador.java
===================================================================
--- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/ObservationsNodeLoador.java	2014-09-26 14:50:24 UTC (rev 4119)
+++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/ObservationsNodeLoador.java	2014-09-26 15:27:17 UTC (rev 4120)
@@ -26,7 +26,6 @@
 
 import jaxx.runtime.swing.nav.NavDataProvider;
 import fr.ifremer.isisfish.entities.FisheryRegion;
-import fr.ifremer.isisfish.entities.Gear;
 import fr.ifremer.isisfish.entities.Observation;
 import fr.ifremer.isisfish.ui.input.tree.FisheryDataProvider;
 import fr.ifremer.isisfish.ui.input.tree.FisheryTreeNode;

Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java
===================================================================
--- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java	2014-09-26 14:50:24 UTC (rev 4119)
+++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java	2014-09-26 15:27:17 UTC (rev 4120)
@@ -32,9 +32,6 @@
 import org.nuiton.math.matrix.MatrixND;
 import org.nuiton.math.matrix.viewer.MatrixRenderer;
 
-import com.bbn.openmap.gui.OMToolSet;
-import com.bbn.openmap.gui.Tool;
-
 import fr.ifremer.isisfish.entities.FisheryRegion;
 import fr.ifremer.isisfish.map.ResultatLayer;
 

Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java
===================================================================
--- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java	2014-09-26 14:50:24 UTC (rev 4119)
+++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java	2014-09-26 15:27:17 UTC (rev 4120)
@@ -37,13 +37,11 @@
 import java.io.Writer;
 import java.util.List;
 
-import javax.swing.JFrame;
 import javax.swing.JMenuItem;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 import org.nuiton.math.matrix.MatrixND;
 import org.nuiton.math.matrix.viewer.MatrixViewerPanel;
 import org.nuiton.math.matrix.viewer.renderer.MatrixChartRenderer;
@@ -95,7 +93,7 @@
             }
             @Override
             public void simulationStop(SimulationService simService, SimulationJob job) {
-                GenericComboModel<String> model = (GenericComboModel)resultUI.getSimulationComboBox().getModel();
+                GenericComboModel<String> model = (GenericComboModel<String>)resultUI.getSimulationComboBox().getModel();
                 model.addElement(job.getId());
             }
             @Override
@@ -203,7 +201,7 @@
             matrixViewerPanel.addMatrixFilter(new SumByYearMatrixFilter());
 
             // init available results list
-            GenericComboModel model = new GenericComboModel(resultStorage.getResultName());
+            GenericComboModel<String> model = new GenericComboModel<String>(resultStorage.getResultName());
             resultSimulationFrame.getResultsComboBox().setModel(model);
             resultSimulationFrame.getResultsComboBox().addItemListener(new ItemListener() {
                 @Override

Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java
===================================================================
--- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java	2014-09-26 14:50:24 UTC (rev 4119)
+++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java	2014-09-26 15:27:17 UTC (rev 4120)
@@ -68,7 +68,6 @@
 import org.nuiton.util.FileUtil;
 import org.nuiton.util.ZipUtil;
 import org.nuiton.widget.SwingUtil;
-import org.nuiton.widget.editor.RSyntaxEditor;
 
 import fr.ifremer.isisfish.IsisFish;
 import fr.ifremer.isisfish.IsisFishRuntimeException;

Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx
===================================================================
--- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx	2014-09-26 14:50:24 UTC (rev 4119)
+++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx	2014-09-26 15:27:17 UTC (rev 4120)
@@ -89,9 +89,12 @@
             JSch jsch=new JSch();
             KeyPair kpair=KeyPair.genKeyPair(jsch, KeyPair.RSA, 2048);
             if (password.length > 0) {
-                kpair.setPassphrase(Arrays.toString(password));
+                String strPassphase = Arrays.toString(password);
+                byte[] bytPassphrase = strPassphase.getBytes(StandardCharsets.UTF_8);
+                kpair.writePrivateKey(privateKeyFile.getAbsolutePath(), bytPassphrase);
+            } else {
+                kpair.writePrivateKey(privateKeyFile.getAbsolutePath());
             }
-            kpair.writePrivateKey(privateKeyFile.getAbsolutePath());
             kpair.writePublicKey(publicKeyFile.getAbsolutePath(), vcsLogin + "@forIsisFish");
             if (log.isInfoEnabled()) {
                 log.info("Finger print: "+kpair.getFingerPrint());

Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnReferenceMap.java
===================================================================
--- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnReferenceMap.java	2014-09-26 14:50:24 UTC (rev 4119)
+++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnReferenceMap.java	2014-09-26 15:27:17 UTC (rev 4120)
@@ -32,7 +32,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import fr.ifremer.isisfish.simulator.SimulationContext;
 import fr.ifremer.isisfish.types.TimeStep;
 
 /**

    

[Isis-fish-commits] r4120 - in branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish: aspect datastore entities mexico mexico/export simulator simulator/sensitivity ui/config ui/input ui/input/tree/loadors ui/result ui/script ui/vcs util

echatellier＠users.forge.codelutin.com