Finish fix MPI + cleanup hecras

gama-platform · Feb 22, 2024 · 9ef7008 · 9ef7008
1 parent b2d7616
commit 9ef7008
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 274 deletions.
diff --git a/femto_st.gama.mpi/META-INF/MANIFEST.MF b/femto_st.gama.mpi/META-INF/MANIFEST.MF
@@ -12,4 +12,3 @@ Require-Bundle: msi.gama.core,
  ummisco.gama.network
 Bundle-ClassPath: ext/mpi.jar,
  .
-Import-Package: ummisco.gama.serializer.factory
diff --git a/ummisco.gama.extension.hecras/src/ummisco/gama/extension/hecras/skill/Program.java b/ummisco.gama.extension.hecras/src/ummisco/gama/extension/hecras/skill/Program.java
diff --git a/ummisco.gama.extension.hecras/src/ummisco/gama/extension/hecras/skill/ReadDLL.java b/ummisco.gama.extension.hecras/src/ummisco/gama/extension/hecras/skill/ReadDLL.java
diff --git a/.../extension/hecras/skill/HecRasEngine.java → ...extensions/hecras/skill/HecRasEngine.java b/.../extension/hecras/skill/HecRasEngine.java → ...extensions/hecras/skill/HecRasEngine.java
@@ -1,4 +1,4 @@
-package ummisco.gama.extension.hecras.skill;
+package ummisco.gaml.extensions.hecras.skill;
 /*
  * The contents of this file is dual-licensed under 2
  * alternative Open Source/Free licenses: LGPL 2.1 or later and
@@ -24,10 +24,8 @@
 
 import java.io.File;
 import java.io.FileWriter;
-import java.io.IOException;
 import java.lang.reflect.Array;
 
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
@@ -38,26 +36,20 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
 
 import com.sun.jna.Pointer;
 import com.sun.jna.platform.win32.OaIdl.SAFEARRAY;
 import com.sun.jna.platform.win32.Ole32;
-import com.sun.jna.platform.win32.User32;
 import com.sun.jna.platform.win32.Variant;
-import com.sun.jna.platform.win32.WinUser;
 import com.sun.jna.platform.win32.Variant.VARIANT;
 import com.sun.jna.platform.win32.Variant.VARIANT.ByReference;
 import com.sun.jna.platform.win32.WTypes.VARTYPE;
-import com.sun.jna.platform.win32.WinDef.HWND;
 import com.sun.jna.platform.win32.WinDef.LONG;
-
-import msi.gama.precompiler.doc.utils.XMLElements;
-import msi.gama.precompiler.doc.utils.XMLUtils;
-
 import com.sun.jna.platform.win32.COM.COMException;
 import com.sun.jna.platform.win32.COM.COMLateBindingObject;
 
+import msi.gama.precompiler.doc.utils.XMLUtils;
+
 public class HecRasEngine extends COMLateBindingObject {
 	public static void main(String args[]) {
 		Ole32.INSTANCE.CoInitializeEx(Pointer.NULL, Ole32.COINIT_MULTITHREADED);

diff --git a/...a/extension/hecras/skill/HecRasSkill.java → .../extensions/hecras/skill/HecRasSkill.java b/...a/extension/hecras/skill/HecRasSkill.java → .../extensions/hecras/skill/HecRasSkill.java
@@ -1,34 +1,26 @@
-package ummisco.gama.extension.hecras.skill;
-
-import msi.gama.precompiler.GamlAnnotations.doc;
-import msi.gama.precompiler.GamlAnnotations.skill;
+package ummisco.gaml.extensions.hecras.skill;
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.PrintWriter;
 
 import org.apache.commons.lang3.ArrayUtils;
 
 import com.sun.jna.Pointer;
 import com.sun.jna.platform.win32.Ole32;
-import com.sun.jna.platform.win32.User32;
-import com.sun.jna.platform.win32.WinDef.HWND;
 
 import io.jhdf.HdfFile;
 import io.jhdf.api.Dataset;
-
-import com.sun.jna.platform.win32.WinUser;
-
 import msi.gama.precompiler.GamlAnnotations.action;
 import msi.gama.precompiler.GamlAnnotations.arg;
+import msi.gama.precompiler.GamlAnnotations.doc;
 import msi.gama.precompiler.GamlAnnotations.example;
-import msi.gaml.types.IType;
+import msi.gama.precompiler.GamlAnnotations.skill;
 import msi.gama.precompiler.IConcept;
 import msi.gama.runtime.IScope;
 import msi.gama.runtime.exceptions.GamaRuntimeException;
-import msi.gama.util.IList;
 import msi.gaml.skills.Skill;
+import msi.gaml.types.IType;
 
 @skill(name = "hecrasSkill", concept = { IConcept.STATISTIC, IConcept.SKILL })
 @doc("read hecras data")