panel will not launch with cytoscape

cytoscape · Mar 19, 2024 · 506889d · 506889d
1 parent f72f2d1
commit 506889d
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 5 deletions.
diff --git a/src/main/java/org/nrnb/gsoc/enrichment/CyActivator.java b/src/main/java/org/nrnb/gsoc/enrichment/CyActivator.java
@@ -70,7 +70,6 @@ public void start(BundleContext context) throws Exception {
 		CySwingApplication swingApplication = registrar.getService(CySwingApplication.class);
 		CytoPanel cytoPanel = swingApplication.getCytoPanel(CytoPanelName.SOUTH);
 		CytoPanelComponent2 enrichmentPanel =  new EnrichmentCytoPanel(registrar,false,null);
-		registrar.registerService(enrichmentPanel, CytoPanelComponent.class,new Properties());
 		registrar.registerService(enrichmentPanel, SelectedNodesAndEdgesListener.class, new Properties());
 		registrar.registerService(enrichmentPanel, NetworkAboutToBeDestroyedListener.class, new Properties());
 		registrar.registerService(enrichmentPanel, SessionLoadedListener.class, new Properties());

diff --git a/src/main/java/org/nrnb/gsoc/enrichment/actions/ShowAppTableAction.java b/src/main/java/org/nrnb/gsoc/enrichment/actions/ShowAppTableAction.java
@@ -4,19 +4,32 @@
 import static org.nrnb.gsoc.enrichment.utils.IconUtil.APP_ICON_LAYERS;
 
 import java.awt.event.ActionEvent;
+import java.util.Properties;
 
+import org.cytoscape.application.events.SetCurrentNetworkListener;
 import org.cytoscape.application.swing.AbstractCyAction;
+import org.cytoscape.application.swing.CyAction;
 import org.cytoscape.application.swing.CySwingApplication;
+import org.cytoscape.application.swing.CytoPanel;
+import org.cytoscape.application.swing.CytoPanelComponent;
+import org.cytoscape.application.swing.CytoPanelComponent2;
 import org.cytoscape.application.swing.CytoPanelName;
 import org.cytoscape.application.swing.CytoPanelState;
+import org.cytoscape.model.events.NetworkAboutToBeDestroyedListener;
+import org.cytoscape.model.events.SelectedNodesAndEdgesListener;
 import org.cytoscape.service.util.CyServiceRegistrar;
+import org.cytoscape.session.events.SessionLoadedListener;
 import org.cytoscape.util.swing.TextIcon;
+import org.cytoscape.work.TaskFactory;
+import org.nrnb.gsoc.enrichment.tasks.EnrichmentTaskFactory;
+import org.nrnb.gsoc.enrichment.ui.EnrichmentCytoPanel;
 import org.nrnb.gsoc.enrichment.utils.IconUtil;
 
 @SuppressWarnings("serial")
 public class ShowAppTableAction extends AbstractCyAction {
 
 	private final CyServiceRegistrar serviceRegistrar;
+	CytoPanelComponent2 enrichmentPanel;
 
 	public ShowAppTableAction(CyServiceRegistrar serviceRegistrar) {
 		super("Enrichment Table");
@@ -35,12 +48,28 @@ public ShowAppTableAction(CyServiceRegistrar serviceRegistrar) {
 
 	@Override
 	public void actionPerformed(ActionEvent e) {
-		var swingApp = serviceRegistrar.getService(CySwingApplication.class);
-		var cytoPanel = swingApp.getCytoPanel(CytoPanelName.SOUTH);
-
+		CySwingApplication swingApplication = serviceRegistrar.getService(CySwingApplication.class);
+		CytoPanel cytoPanel = swingApplication.getCytoPanel(CytoPanelName.SOUTH);
+		if (enrichmentPanel == null){
+		enrichmentPanel =  new EnrichmentCytoPanel(serviceRegistrar,false,null);
+		serviceRegistrar.registerService(enrichmentPanel, CytoPanelComponent.class,new Properties());
+		serviceRegistrar.registerService(enrichmentPanel, SelectedNodesAndEdgesListener.class, new Properties());
+		serviceRegistrar.registerService(enrichmentPanel, NetworkAboutToBeDestroyedListener.class, new Properties());
+		serviceRegistrar.registerService(enrichmentPanel, SessionLoadedListener.class, new Properties());
+		serviceRegistrar.registerService(enrichmentPanel, SetCurrentNetworkListener.class, new Properties());
+		//registrar.registerService(enrichmentPanel, SetCurrentNetworkListener.class, new Properties());
+		//registrar.registerService(enrichmentPanel, NetworkAddedListener.class, new Properties());
 		if (cytoPanel.getState() == CytoPanelState.HIDE)
+		cytoPanel.setState(CytoPanelState.DOCK);
+	cytoPanel.setSelectedIndex(
+			cytoPanel.indexOfComponent("org.nrnb.gsoc.enrichment"));
+
+		} else {
+			if (cytoPanel.getState() == CytoPanelState.HIDE)
 			cytoPanel.setState(CytoPanelState.DOCK);
+		cytoPanel.setSelectedIndex(
+				cytoPanel.indexOfComponent("org.nrnb.gsoc.enrichment"));
 
-		cytoPanel.setSelectedIndex(cytoPanel.indexOfComponent("org.nrnb.gsoc.enrichment"));
+		}	
 	}
 }