diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/CyActivator.java b/src/main/java/de/hhu/ba/yoshikoWrapper/CyActivator.java index b48e4112826df75319ab9a35c8faa1e0db9d7900..b79892ee08f50af56220b59916d69d6ba2beb93d 100644 --- a/src/main/java/de/hhu/ba/yoshikoWrapper/CyActivator.java +++ b/src/main/java/de/hhu/ba/yoshikoWrapper/CyActivator.java @@ -32,7 +32,6 @@ import org.cytoscape.model.CyNetworkManager; import org.cytoscape.model.subnetwork.CyRootNetworkManager; import org.cytoscape.service.util.AbstractCyActivator; import org.cytoscape.service.util.CyServiceRegistrar; -import org.cytoscape.task.create.CloneNetworkTaskFactory; import org.cytoscape.view.model.CyNetworkViewFactory; import org.cytoscape.view.layout.CyLayoutAlgorithmManager; import org.cytoscape.view.model.CyNetworkViewManager; diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/core/CyCore.java b/src/main/java/de/hhu/ba/yoshikoWrapper/core/CyCore.java index a7daab2b2db0bd4924af493749ea57244518bf61..aee7b04da8bb48932c1368dc1539d9965c2167f0 100644 --- a/src/main/java/de/hhu/ba/yoshikoWrapper/core/CyCore.java +++ b/src/main/java/de/hhu/ba/yoshikoWrapper/core/CyCore.java @@ -31,7 +31,6 @@ import org.cytoscape.model.CyNetworkFactory; import org.cytoscape.model.CyNetworkManager; import org.cytoscape.model.subnetwork.CyRootNetworkManager; import org.cytoscape.service.util.CyServiceRegistrar; -import org.cytoscape.task.create.CloneNetworkTaskFactory; import org.cytoscape.view.layout.CyLayoutAlgorithmManager; import org.cytoscape.view.model.CyNetworkViewFactory; import org.cytoscape.view.model.CyNetworkViewManager; @@ -44,7 +43,6 @@ import org.cytoscape.work.ObservableTask; import org.cytoscape.work.TaskIterator; import org.cytoscape.work.TaskObserver; import org.cytoscape.work.swing.DialogTaskManager; -import org.osgi.framework.BundleContext; /**Simple link collection to enable access to Cytoscape instances @@ -73,9 +71,9 @@ public class CyCore { // //Convenience - public static String getConfig(String key) { - return cm.getProperties().getProperty(key); - } +// public static String getConfig(String key) { +// return cm.getProperties().getProperty(key); +// } /** * Convenience function that runs all tasks in a task iterator but blocks until all tasks are finished diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/ResultPanel.java b/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/ResultPanel.java index 327b6b428c35154de18c53029801d0711892f4c1..eab819be1f5b29b128c855e53f36b9b328fc19e9 100644 --- a/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/ResultPanel.java +++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/ResultPanel.java @@ -178,28 +178,20 @@ NetworkAboutToBeDestroyedListener layout.setVerticalGroup(verticalGroup); horizontalGroup - .addComponent(marker,DEFAULT_SIZE,DEFAULT_SIZE,DEFAULT_SIZE) - .addComponent(invalidLabel,DEFAULT_SIZE, PREFERRED_SIZE,Short.MAX_VALUE) - .addComponent(tabbedPane,DEFAULT_SIZE, PREFERRED_SIZE,Short.MAX_VALUE) - .addComponent(destroyButton,DEFAULT_SIZE, DEFAULT_SIZE,DEFAULT_SIZE); + .addComponent(marker,DEFAULT_SIZE,DEFAULT_SIZE,PREFERRED_SIZE) + .addComponent(invalidLabel,DEFAULT_SIZE, PREFERRED_SIZE,PREFERRED_SIZE) + .addComponent(tabbedPane,PREFERRED_SIZE, PREFERRED_SIZE,Short.MAX_VALUE) + .addComponent(destroyButton,DEFAULT_SIZE, DEFAULT_SIZE,PREFERRED_SIZE); verticalGroup .addComponent(marker,DEFAULT_SIZE,DEFAULT_SIZE,PREFERRED_SIZE) .addComponent(invalidLabel,DEFAULT_SIZE, DEFAULT_SIZE,DEFAULT_SIZE) - .addComponent(tabbedPane,DEFAULT_SIZE, DEFAULT_SIZE,PREFERRED_SIZE) + .addComponent(tabbedPane,PREFERRED_SIZE, DEFAULT_SIZE,Short.MAX_VALUE) .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(destroyButton,DEFAULT_SIZE, DEFAULT_SIZE,PREFERRED_SIZE); layout.setAutoCreateGaps(true); layout.setAutoCreateContainerGaps(true); - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - revalidate(); - } - - }); this.setLayout(layout); registerAllListeners(); diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/SolutionTab.java b/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/SolutionTab.java index de0ebdcd3f79c8843963b2301bee32c437967b80..104d39ae14275af3f91d1aad40f72f308e7af8b1 100644 --- a/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/SolutionTab.java +++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/SolutionTab.java @@ -208,8 +208,8 @@ public class SolutionTab extends JPanel { .addComponent(hideSingles,DEFAULT_SIZE,DEFAULT_SIZE,Short.MAX_VALUE) .addGap(8) .addComponent(scrollPane,PREFERRED_SIZE,PREFERRED_SIZE,Short.MAX_VALUE) - .addComponent(createClusterView,DEFAULT_SIZE,DEFAULT_SIZE,Short.MAX_VALUE) - .addComponent(createMetaGraph,DEFAULT_SIZE,DEFAULT_SIZE,Short.MAX_VALUE) + .addComponent(createClusterView,DEFAULT_SIZE,DEFAULT_SIZE,PREFERRED_SIZE) + .addComponent(createMetaGraph,DEFAULT_SIZE,DEFAULT_SIZE,PREFERRED_SIZE) ); layout.setVerticalGroup(layout.createSequentialGroup() .addGap(8)