diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/CyActivator.java b/src/main/java/de/hhu/ba/yoshikoWrapper/CyActivator.java
index 7cabdf8b74f8508349346356cfbb2c980e0cb32d..f559e883c1e663b8f770b0e98b1d674d1b8ff4c3 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/CyActivator.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/CyActivator.java
@@ -20,7 +20,7 @@ public class CyActivator extends AbstractCyActivator {
@Override
public void start(BundleContext context) throws Exception {
-
+ //TODO: Load shared library if installed on startup
CySwingApplication cytoscapeDesktopService = getService(context,CySwingApplication.class);
MainPanel mainPanel = new MainPanel();
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/core/YoshikoLoader.java b/src/main/java/de/hhu/ba/yoshikoWrapper/core/YoshikoLoader.java
index e718bac5632df2c30e4f12b81aeb76adb3b1c3e7..e35435a77214d138dbe014310c7ae65f66634bb1 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/core/YoshikoLoader.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/core/YoshikoLoader.java
@@ -20,6 +20,7 @@ public class YoshikoLoader {
public void loadLibrary(String libPath) {
+ //TODO: IF ALREADY LOADED DON'T LOAD AGAIN!!!!
try {
System.load(libPath);
libraryLoaded = true;
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/gui/MainPanel.java b/src/main/java/de/hhu/ba/yoshikoWrapper/gui/MainPanel.java
index 6473b62dbe6e4166e1cdf687b7a0c38fb51b4006..639a7bc3efe72ce474ab57b5c1b9b954d3c42f1b 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/gui/MainPanel.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/gui/MainPanel.java
@@ -8,7 +8,6 @@ import javax.swing.Icon;
import javax.swing.JButton;
import javax.swing.JFileChooser;
import javax.swing.JLabel;
-import javax.swing.JOptionPane;
import javax.swing.JPanel;
import org.cytoscape.application.swing.CytoPanelComponent;
import org.cytoscape.application.swing.CytoPanelName;
@@ -16,7 +15,6 @@ import org.cytoscape.application.swing.CytoPanelName;
import de.hhu.ba.yoshikoWrapper.core.YoshikoLoader;
import de.hhu.ba.yoshikoWrapper.swig.LibraryInterface;
import de.hhu.ba.yoshikoWrapper.swig.SWIGTYPE_p_yskInput__LibraryInput;
-import de.hhu.ba.yoshikoWrapper.swig.SWIGTYPE_p_ysk__ClusterEditingInstance;
/**This class describes the Swing Panel that the user interacts with in cytoscape
* @author Philipp Spohr, Aug 6, 2017
@@ -39,7 +37,7 @@ public class MainPanel extends JPanel implements CytoPanelComponent {
private JLabel yoshikoVersionLabel;
/**
- * Main constructor, creates a new Panel and intializes subcomponents
+ * Main constructor, creates a new Panel and initializes subcomponents
*/
public MainPanel() {
@@ -79,6 +77,9 @@ public class MainPanel extends JPanel implements CytoPanelComponent {
SWIGTYPE_p_yskInput__LibraryInput instance;
instance = LibraryInterface.new_LibraryInput();
LibraryInterface.LibraryInput_setSize(instance, 4);
+ LibraryInterface.LibraryInput_addEdge(instance, 0, 1, 2);
+ LibraryInterface.LibraryInput_addEdge(instance, 1, 3, 5);
+ LibraryInterface.LibraryInput_parseInput(instance);
}
}
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterface.java b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterface.java
index c6474638bdbc2252e77879824a70ce3480b150db..41063ddee07f9898ec87cd079485cc2aa849b663 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterface.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterface.java
@@ -42,15 +42,11 @@ public class LibraryInterface {
LibraryInterfaceJNI.delete_edge(SWIGTYPE_p_yskInput__edge.getCPtr(self));
}
- public static SWIGTYPE_p_ysk__ClusterEditingInstance LibraryInput_parseInput(SWIGTYPE_p_yskInput__LibraryInput self, SWIGTYPE_p_std__istream is) {
- long cPtr = LibraryInterfaceJNI.LibraryInput_parseInput(SWIGTYPE_p_yskInput__LibraryInput.getCPtr(self), SWIGTYPE_p_std__istream.getCPtr(is));
+ public static SWIGTYPE_p_ysk__ClusterEditingInstance LibraryInput_parseInput(SWIGTYPE_p_yskInput__LibraryInput self) {
+ long cPtr = LibraryInterfaceJNI.LibraryInput_parseInput(SWIGTYPE_p_yskInput__LibraryInput.getCPtr(self));
return (cPtr == 0) ? null : new SWIGTYPE_p_ysk__ClusterEditingInstance(cPtr, false);
}
- public static boolean LibraryInput_validateInput(SWIGTYPE_p_yskInput__LibraryInput self, SWIGTYPE_p_std__istream is) {
- return LibraryInterfaceJNI.LibraryInput_validateInput(SWIGTYPE_p_yskInput__LibraryInput.getCPtr(self), SWIGTYPE_p_std__istream.getCPtr(is));
- }
-
public static SWIGTYPE_p_yskInput__LibraryInput new_LibraryInput() {
long cPtr = LibraryInterfaceJNI.new_LibraryInput();
return (cPtr == 0) ? null : new SWIGTYPE_p_yskInput__LibraryInput(cPtr, true);
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceJNI.java b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceJNI.java
index 4c55ee7af9d18c59530d3fb5de91fe9f7429c37e..c60fa9d1c08f66a9ecc49f62d845052dcf393c92 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceJNI.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceJNI.java
@@ -17,8 +17,7 @@ public class LibraryInterfaceJNI {
public final static native double edge_cost_get(long jarg1);
public final static native long new_edge();
public final static native void delete_edge(long jarg1);
- public final static native long LibraryInput_parseInput(long jarg1, long jarg2);
- public final static native boolean LibraryInput_validateInput(long jarg1, long jarg2);
+ public final static native long LibraryInput_parseInput(long jarg1);
public final static native long new_LibraryInput();
public final static native void LibraryInput_setSize(long jarg1, int jarg2);
public final static native void LibraryInput_addEdge(long jarg1, int jarg2, int jarg3, double jarg4);
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_std__istream.java b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_std__istream.java
deleted file mode 100644
index bea945adc45785bfa2b999978ace6d7767f4eb6c..0000000000000000000000000000000000000000
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/SWIGTYPE_p_std__istream.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 3.0.8
- *
- * Do not make changes to this file unless you know what you are doing--modify
- * the SWIG interface file instead.
- * ----------------------------------------------------------------------------- */
-
-package de.hhu.ba.yoshikoWrapper.swig;
-
-public class SWIGTYPE_p_std__istream {
- private transient long swigCPtr;
-
- protected SWIGTYPE_p_std__istream(long cPtr, @SuppressWarnings("unused") boolean futureUse) {
- swigCPtr = cPtr;
- }
-
- protected SWIGTYPE_p_std__istream() {
- swigCPtr = 0;
- }
-
- protected static long getCPtr(SWIGTYPE_p_std__istream obj) {
- return (obj == null) ? 0 : obj.swigCPtr;
- }
-}
-