Author: mes
Date: 2010-09-09 09:47:26 -0700 (Thu, 09 Sep 2010)
New Revision: 21757
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/LabelPositionChooser.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
Log:
Changed CyDataTable name to CyTable
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/LabelPositionChooser.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/LabelPositionChooser.java
2010-09-09 16:47:20 UTC (rev 21756)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/LabelPositionChooser.java
2010-09-09 16:47:26 UTC (rev 21757)
@@ -47,7 +47,7 @@
import javax.swing.JDialog;
import javax.swing.JPanel;
-import org.cytoscape.model.GraphObject;
+import org.cytoscape.model.CyTableEntry;
/**
*
*/
@@ -146,7 +146,7 @@
// horrible, horrible hack
//FIXME: where is BypassHack?
- //GraphObject go = BypassHack.getCurrentObject();
+ //CyTableEntry go = BypassHack.getCurrentObject();
// if (go != null) {
// //TODO: make this work with new model.
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2010-09-09 16:47:20 UTC (rev 21756)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2010-09-09 16:47:26 UTC (rev 21757)
@@ -34,7 +34,7 @@
*/
package org.cytoscape.ding.impl;
-import static org.cytoscape.model.GraphObject.NODE;
+import static org.cytoscape.model.CyTableEntry.NODE;
import java.awt.Color;
import java.awt.Component;
@@ -74,8 +74,8 @@
import org.cytoscape.graph.render.immed.GraphGraphics;
import org.cytoscape.graph.render.stateful.GraphLOD;
import org.cytoscape.graph.render.stateful.GraphRenderer;
-import org.cytoscape.model.CyDataTable;
-import org.cytoscape.model.CyDataTableFactory;
+import org.cytoscape.model.CyTable;
+import org.cytoscape.model.CyTableFactory;
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
@@ -364,7 +364,7 @@
* @param perspective
* The graph model that we'll be creating a view for.
*/
- public DGraphView(final CyNetworkView view, CyDataTableFactory
dataFactory,
+ public DGraphView(final CyNetworkView view, CyTableFactory dataFactory,
CyRootNetworkFactory cyRoot, UndoSupport undo,
SpacialIndex2DFactory spacialFactory, RootVisualLexicon
vpc,
VisualLexicon dingLexicon,
@@ -401,11 +401,11 @@
this.interceptor = interceptor;
this.manager = manager;
- final CyDataTable nodeCAM = dataFactory.createTable("node
view", "SUID", Long.class, false);
+ final CyTable nodeCAM = dataFactory.createTable("node view",
"SUID", Long.class, false);
nodeCAM.createColumn("hidden", Boolean.class, false);
tableMgr.getTableMap("NODE", networkModel).put("VIEW", nodeCAM);
- final CyDataTable edgeCAM = dataFactory.createTable("edge
view", "SUID", Long.class, false);
+ final CyTable edgeCAM = dataFactory.createTable("edge view",
"SUID", Long.class, false);
edgeCAM.createColumn("hidden", Boolean.class, false);
tableMgr.getTableMap("EDGE", networkModel).put("VIEW", edgeCAM);
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
2010-09-09 16:47:20 UTC (rev 21756)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
2010-09-09 16:47:26 UTC (rev 21757)
@@ -34,9 +34,9 @@
*/
package org.cytoscape.ding.impl;
-import static org.cytoscape.model.GraphObject.EDGE;
-import static org.cytoscape.model.GraphObject.NETWORK;
-import static org.cytoscape.model.GraphObject.NODE;
+import static org.cytoscape.model.CyTableEntry.EDGE;
+import static org.cytoscape.model.CyTableEntry.NETWORK;
+import static org.cytoscape.model.CyTableEntry.NODE;
import java.awt.BasicStroke;
import java.awt.Color;
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
2010-09-09 16:47:20 UTC (rev 21756)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
2010-09-09 16:47:26 UTC (rev 21757)
@@ -7,7 +7,7 @@
import javax.swing.JComponent;
import javax.swing.JPanel;
-import org.cytoscape.model.CyDataTableFactory;
+import org.cytoscape.model.CyTableFactory;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
@@ -41,7 +41,7 @@
private static final Logger logger =
LoggerFactory.getLogger(DingNavigationRenderingEngineFactory.class);
- private CyDataTableFactory dataTableFactory;
+ private CyTableFactory dataTableFactory;
private CyRootNetworkFactory rootNetworkFactory;
private SpacialIndex2DFactory spacialFactory;
private UndoSupport undo;
@@ -60,7 +60,7 @@
private CyTableManager tableMgr;
public DingNavigationRenderingEngineFactory(
- CyDataTableFactory dataTableFactory,
+ CyTableFactory dataTableFactory,
CyRootNetworkFactory rootNetworkFactory, UndoSupport
undo,
SpacialIndex2DFactory spacialFactory, RootVisualLexicon
vpc,
VisualLexicon dingLexicon, TunableInterceptor ti,
TaskManager tm,
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
2010-09-09 16:47:20 UTC (rev 21756)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
2010-09-09 16:47:26 UTC (rev 21757)
@@ -10,7 +10,7 @@
import javax.swing.JInternalFrame;
import org.cytoscape.event.CyEventHelper;
-import org.cytoscape.model.CyDataTableFactory;
+import org.cytoscape.model.CyTableFactory;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
@@ -37,7 +37,7 @@
private static final Logger logger =
LoggerFactory.getLogger(DingRenderingEngineFactory.class);
- private CyDataTableFactory dataTableFactory;
+ private CyTableFactory dataTableFactory;
private CyRootNetworkFactory rootNetworkFactory;
private SpacialIndex2DFactory spacialFactory;
private UndoSupport undo;
@@ -57,7 +57,7 @@
private final CyEventHelper eventHelper;
- public DingRenderingEngineFactory(CyDataTableFactory dataTableFactory,
+ public DingRenderingEngineFactory(CyTableFactory dataTableFactory,
CyRootNetworkFactory rootNetworkFactory,
UndoSupport
undo, SpacialIndex2DFactory spacialFactory,
RootVisualLexicon vpc, VisualLexicon dingLexicon,
Modified:
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-09-09 16:47:20 UTC (rev 21756)
+++
core3/ding-presentation-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-09-09 16:47:26 UTC (rev 21757)
@@ -13,7 +13,7 @@
</osgi:reference>
<osgi:reference id="cyDataTableFactoryServiceRef"
- interface="org.cytoscape.model.CyDataTableFactory">
+ interface="org.cytoscape.model.CyTableFactory">
</osgi:reference>
<osgi:reference id="spacialIndex2DFactoryServiceRef"
--
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.
