Author: pwang
Date: 2009-11-24 11:21:14 -0800 (Tue, 24 Nov 2009)
New Revision: 18562
Modified:
coreplugins/branches/Peng_CytoscapeEditor2/src/cytoscape/editor/CytoscapeEditor.java
coreplugins/branches/Peng_CytoscapeEditor2/src/cytoscape/editor/CytoscapeEditorManager.java
coreplugins/branches/Peng_CytoscapeEditor2/src/cytoscape/editor/CytoscapeEditorPlugin.java
Log:
Add support for nested network
Modified:
coreplugins/branches/Peng_CytoscapeEditor2/src/cytoscape/editor/CytoscapeEditor.java
===================================================================
---
coreplugins/branches/Peng_CytoscapeEditor2/src/cytoscape/editor/CytoscapeEditor.java
2009-11-24 19:15:51 UTC (rev 18561)
+++
coreplugins/branches/Peng_CytoscapeEditor2/src/cytoscape/editor/CytoscapeEditor.java
2009-11-24 19:21:14 UTC (rev 18562)
@@ -350,6 +350,12 @@
*/
public void setControllingNodeAttribute(String
controllingNodeAttribute);
+
+ public String getControllingNetworkAttribute();
+
+ public void setControllingNetworkAttribute(String
controllingNetworkAttribute);
+
+
/**
*
* @return the network event handler that is associated with this editor
Modified:
coreplugins/branches/Peng_CytoscapeEditor2/src/cytoscape/editor/CytoscapeEditorManager.java
===================================================================
---
coreplugins/branches/Peng_CytoscapeEditor2/src/cytoscape/editor/CytoscapeEditorManager.java
2009-11-24 19:15:51 UTC (rev 18561)
+++
coreplugins/branches/Peng_CytoscapeEditor2/src/cytoscape/editor/CytoscapeEditorManager.java
2009-11-24 19:21:14 UTC (rev 18562)
@@ -215,6 +215,8 @@
*/
public static final String NODE_TYPE = "NODE_TYPE";
+ public static final String NETWORK_TYPE = "NETWORK_TYPE";
+
// MLC 08/06/06 TODO: This should not be here!:
/**
* attribute used for BioPAX-like editor
@@ -246,7 +248,7 @@
// AJK: 12/06/06: flag for "logging" diagnostic output
- private static boolean loggingEnabled = false;
+ private static boolean loggingEnabled = true;
private static CyLogger logger = null;
@@ -369,7 +371,7 @@
*/
public static void register(String editorName) {
register(editorName, "BasicNetworkEventHandler",
CytoscapeEditorManager.NODE_TYPE,
- CytoscapeEditorManager.EDGE_TYPE,
CytoscapeEditorManager.ANY_VISUAL_STYLE);
+ CytoscapeEditorManager.EDGE_TYPE,
CytoscapeEditorManager.NETWORK_TYPE, CytoscapeEditorManager.ANY_VISUAL_STYLE);
}
/**
@@ -385,7 +387,7 @@
*/
public static void register(String editorName, String
networkEditAdapterName) {
register(editorName, networkEditAdapterName,
CytoscapeEditorManager.NODE_TYPE,
- CytoscapeEditorManager.EDGE_TYPE,
CytoscapeEditorManager.ANY_VISUAL_STYLE);
+ CytoscapeEditorManager.EDGE_TYPE,
CytoscapeEditorManager.NETWORK_TYPE, CytoscapeEditorManager.ANY_VISUAL_STYLE);
}
/**
@@ -405,7 +407,7 @@
public static void register(String editorName, String
networkEditAdapterName,
String visualStyleName) {
register(editorName, networkEditAdapterName,
CytoscapeEditorManager.NODE_TYPE,
- CytoscapeEditorManager.EDGE_TYPE, visualStyleName);
+ CytoscapeEditorManager.EDGE_TYPE,
CytoscapeEditorManager.NETWORK_TYPE, visualStyleName);
}
/**
@@ -427,9 +429,9 @@
*
*/
public static void register(String editorName, String
networkEditAdapterName,
- String controllingNodeAttribute, String
controllingEdgeAttribute) {
+ String controllingNodeAttribute, String
controllingEdgeAttribute, String controllingNetworkAttribute) {
register(editorName, networkEditAdapterName,
controllingNodeAttribute,
- controllingEdgeAttribute,
CytoscapeEditorManager.ANY_VISUAL_STYLE);
+ controllingEdgeAttribute, controllingNetworkAttribute,
CytoscapeEditorManager.ANY_VISUAL_STYLE);
}
/**
@@ -454,7 +456,7 @@
*
*/
public static void register(String editorName, String
networkEditAdapterName,
- String controllingNodeAttribute, String
controllingEdgeAttribute,
+ String controllingNodeAttribute, String
controllingEdgeAttribute, String controllingNetworkAttribute,
String visualStyleName) {
// ASSUME: We have been initialized() before register() is ever
called.
logger.debug ("BEGIN CEM.register()");
@@ -471,6 +473,7 @@
+ controllingEdgeAttribute);
cyEditor.setControllingNodeAttribute(controllingNodeAttribute);
cyEditor.setControllingEdgeAttribute(controllingEdgeAttribute);
+
cyEditor.setControllingNetworkAttribute(controllingNetworkAttribute);
CytoscapeEditorManager.log("now controlling attributes
for editor " + cyEditor);
CytoscapeEditorManager.log("are " +
cyEditor.getControllingNodeAttribute() + " and "
+
cyEditor.getControllingEdgeAttribute());
Modified:
coreplugins/branches/Peng_CytoscapeEditor2/src/cytoscape/editor/CytoscapeEditorPlugin.java
===================================================================
---
coreplugins/branches/Peng_CytoscapeEditor2/src/cytoscape/editor/CytoscapeEditorPlugin.java
2009-11-24 19:15:51 UTC (rev 18561)
+++
coreplugins/branches/Peng_CytoscapeEditor2/src/cytoscape/editor/CytoscapeEditorPlugin.java
2009-11-24 19:21:14 UTC (rev 18562)
@@ -47,7 +47,6 @@
import cytoscape.CytoscapeInit;
import cytoscape.plugin.CytoscapePlugin;
-
/**
* core plugin for CytoscapeEditor.
*
@@ -123,7 +122,7 @@
"cytoscape.editor.event.PaletteNetworkEditEventHandler",
// AJK: 02/03/06 have Default
editor use current visual
// style
- CytoscapeEditorManager.NODE_TYPE,
CytoscapeEditorManager.EDGE_TYPE,
+ CytoscapeEditorManager.NODE_TYPE,
CytoscapeEditorManager.EDGE_TYPE, CytoscapeEditorManager.NETWORK_TYPE,
CytoscapeEditorManager.ANY_VISUAL_STYLE);
// AJK: 12/09/06 SimpleBioMoleculeEditor deleted
--
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.
