Author: jm
Date: 2011-04-04 13:56:29 -0700 (Mon, 04 Apr 2011)
New Revision: 24657
Added:
core3/biopax-impl/trunk/src/main/java/org/cytoscape/biopax/internal/view/BioPaxCytoPanelComponent.java
Modified:
core3/biopax-impl/trunk/src/main/java/org/cytoscape/biopax/BioPaxContainer.java
core3/biopax-impl/trunk/src/main/java/org/cytoscape/biopax/internal/util/CytoscapeWrapper.java
core3/biopax-impl/trunk/src/main/java/org/cytoscape/biopax/internal/view/BioPaxContainerImpl.java
core3/biopax-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/biopax-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Ported Node Details CytoPanelComponent
Modified:
core3/biopax-impl/trunk/src/main/java/org/cytoscape/biopax/BioPaxContainer.java
===================================================================
---
core3/biopax-impl/trunk/src/main/java/org/cytoscape/biopax/BioPaxContainer.java
2011-04-04 20:55:49 UTC (rev 24656)
+++
core3/biopax-impl/trunk/src/main/java/org/cytoscape/biopax/BioPaxContainer.java
2011-04-04 20:56:29 UTC (rev 24657)
@@ -1,5 +1,6 @@
package org.cytoscape.biopax;
+import java.awt.Component;
/**
* This API is provisional and is subject to change at any time.
@@ -8,4 +9,5 @@
void showDetails();
void showLegend();
NetworkListener getNetworkListener();
+ Component getComponent();
}
Modified:
core3/biopax-impl/trunk/src/main/java/org/cytoscape/biopax/internal/util/CytoscapeWrapper.java
===================================================================
---
core3/biopax-impl/trunk/src/main/java/org/cytoscape/biopax/internal/util/CytoscapeWrapper.java
2011-04-04 20:55:49 UTC (rev 24656)
+++
core3/biopax-impl/trunk/src/main/java/org/cytoscape/biopax/internal/util/CytoscapeWrapper.java
2011-04-04 20:56:29 UTC (rev 24657)
@@ -42,8 +42,6 @@
* @author Ethan Cerami.
*/
public class CytoscapeWrapper {
- private static boolean bioPaxUIInitialized = false;
-
/**
* Sets the Status Bar Message.
* Feature only available in Cytoscape 2.2.
@@ -88,30 +86,4 @@
int index = cytoPanel.indexOfComponent(bpContainer);
cytoPanel.setSelectedIndex(index);
}
-
- // TODO: Wire this via OSGi
-// /**
-// * Initializes the BioPax PlugIn UI.
-// */
-// public static void initBioPaxPlugInUI() {
-// if (!bioPaxUIInitialized) {
-// // cytoscape 2.1 code
-// // BioPaxDetailsWindow bpWindow =
-// // BioPaxDetailsWindow.getInstance();
-//
-// // cytoscape 2.2 code
-// final BioPaxContainer bpContainer =
BioPaxContainer.getInstance();
-// final CytoscapeDesktop desktop = Cytoscape.getDesktop();
-// SwingUtilities.invokeLater(new Runnable() {
-// public void run() {
-// CytoPanel cytoPanel =
desktop.getCytoPanel(BioPaxContainer.CYTO_PANEL_LOCATION);
-// URL url =
BioPaxDetailsPanel.class.getResource("read_obj.gif");
-// Icon icon = new ImageIcon(url);
-// cytoPanel.add("Node Details", icon, bpContainer, "Node
Details");
-// cytoPanel.setState(CytoPanelState.DOCK);
-// bioPaxUIInitialized = true;
-// }
-// });
-// }
-// }
}
Modified:
core3/biopax-impl/trunk/src/main/java/org/cytoscape/biopax/internal/view/BioPaxContainerImpl.java
===================================================================
---
core3/biopax-impl/trunk/src/main/java/org/cytoscape/biopax/internal/view/BioPaxContainerImpl.java
2011-04-04 20:55:49 UTC (rev 24656)
+++
core3/biopax-impl/trunk/src/main/java/org/cytoscape/biopax/internal/view/BioPaxContainerImpl.java
2011-04-04 20:56:29 UTC (rev 24657)
@@ -174,4 +174,9 @@
public NetworkListener getNetworkListener() {
return networkListener;
}
+
+ @Override
+ public Component getComponent() {
+ return this;
+ }
}
Added:
core3/biopax-impl/trunk/src/main/java/org/cytoscape/biopax/internal/view/BioPaxCytoPanelComponent.java
===================================================================
---
core3/biopax-impl/trunk/src/main/java/org/cytoscape/biopax/internal/view/BioPaxCytoPanelComponent.java
(rev 0)
+++
core3/biopax-impl/trunk/src/main/java/org/cytoscape/biopax/internal/view/BioPaxCytoPanelComponent.java
2011-04-04 20:56:29 UTC (rev 24657)
@@ -0,0 +1,44 @@
+package org.cytoscape.biopax.internal.view;
+
+import java.awt.Component;
+import java.net.URL;
+
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+
+import org.cytoscape.application.swing.CytoPanelComponent;
+import org.cytoscape.application.swing.CytoPanelName;
+import org.cytoscape.biopax.BioPaxContainer;
+
+public class BioPaxCytoPanelComponent implements CytoPanelComponent {
+
+ private final BioPaxContainer bpContainer;
+ private final Icon icon;
+
+ public BioPaxCytoPanelComponent(BioPaxContainer bpContainer) {
+ this.bpContainer = bpContainer;
+ URL url = getClass().getResource("read_obj.gif");
+ icon = new ImageIcon(url);
+ }
+
+ @Override
+ public Component getComponent() {
+ return bpContainer.getComponent();
+ }
+
+ @Override
+ public CytoPanelName getCytoPanelName() {
+ return CytoPanelName.EAST;
+ }
+
+ @Override
+ public String getTitle() {
+ return "Node Details";
+ }
+
+ @Override
+ public Icon getIcon() {
+ return icon;
+ }
+
+}
Property changes on:
core3/biopax-impl/trunk/src/main/java/org/cytoscape/biopax/internal/view/BioPaxCytoPanelComponent.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified:
core3/biopax-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/biopax-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-04-04 20:55:49 UTC (rev 24656)
+++
core3/biopax-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-04-04 20:56:29 UTC (rev 24657)
@@ -45,4 +45,7 @@
<osgi:service ref="bioPaxContainer"
interface="org.cytoscape.biopax.BioPaxContainer" />
+
+ <osgi:service ref="bioPaxCytoPanelComponent"
+ interface="org.cytoscape.application.swing.CytoPanelComponent"
/>
</beans>
Modified:
core3/biopax-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/biopax-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-04-04 20:55:49 UTC (rev 24656)
+++
core3/biopax-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-04-04 20:56:29 UTC (rev 24657)
@@ -42,6 +42,10 @@
<constructor-arg ref="cyNetworkViewManagerRef" />
</bean>
+ <bean id="bioPaxCytoPanelComponent"
class="org.cytoscape.biopax.internal.view.BioPaxCytoPanelComponent">
+ <constructor-arg ref="bioPaxContainer" />
+ </bean>
+
<bean id="bioPaxNetworkViewTaskFactory"
class="org.cytoscape.biopax.internal.BioPaxNetworkViewTaskFactory">
<constructor-arg ref="bioPaxFilter"/>
<constructor-arg ref="cyNetworkFactoryRef"/>
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
