Author: mes
Date: 2010-09-09 09:48:22 -0700 (Thu, 09 Sep 2010)
New Revision: 21765
Modified:
core3/plugin-impl/trunk/src/main/java/org/cytoscape/plugin/internal/CyPluginAdapterImpl.java
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
Log:
Changed CyDataTable name to CyTable
Modified:
core3/plugin-impl/trunk/src/main/java/org/cytoscape/plugin/internal/CyPluginAdapterImpl.java
===================================================================
---
core3/plugin-impl/trunk/src/main/java/org/cytoscape/plugin/internal/CyPluginAdapterImpl.java
2010-09-09 16:48:17 UTC (rev 21764)
+++
core3/plugin-impl/trunk/src/main/java/org/cytoscape/plugin/internal/CyPluginAdapterImpl.java
2010-09-09 16:48:22 UTC (rev 21765)
@@ -6,7 +6,7 @@
//
// Keep these alphabetical by class name
//
-import org.cytoscape.model.CyDataTableFactory;
+import org.cytoscape.model.CyTableFactory;
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.view.layout.CyLayouts;
import org.cytoscape.model.CyNetworkFactory;
@@ -30,7 +30,7 @@
// Always make the field name same as the class
// name, but with a lower case first letter.
//
- private final CyDataTableFactory cyDataTableFactory;
+ private final CyTableFactory cyTableFactory;
private final CyEventHelper cyEventHelper;
private final CyLayouts cyLayouts;
private final CyNetworkFactory cyNetworkFactory;
@@ -48,7 +48,7 @@
// maintain sanity, keep the arguments in alphabetical order.
//
CyPluginAdapterImpl(
- CyDataTableFactory cyDataTableFactory,
+ CyTableFactory cyTableFactory,
CyEventHelper cyEventHelper,
CyLayouts cyLayouts,
CyNetworkFactory cyNetworkFactory,
@@ -60,7 +60,7 @@
TaskManager taskManager,
VisualMappingManager visualMappingManager
) {
- this.cyDataTableFactory = cyDataTableFactory;
+ this.cyTableFactory = cyTableFactory;
this.cyEventHelper = cyEventHelper;
this.cyLayouts = cyLayouts;
this.cyNetworkFactory = cyNetworkFactory;
@@ -78,7 +78,7 @@
// May as well keep the methods alphabetical too!
//
- public CyDataTableFactory getCyDataTableFactory() { return
cyDataTableFactory; }
+ public CyTableFactory getCyDataTableFactory() { return cyTableFactory;
}
public CyEventHelper getCyEventHelper() { return cyEventHelper; }
Modified:
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-09-09 16:48:17 UTC (rev 21764)
+++
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-09-09 16:48:22 UTC (rev 21765)
@@ -13,7 +13,7 @@
-->
<osgi:reference id="cyDataTableFactoryRef"
- interface="org.cytoscape.model.CyDataTableFactory">
+ interface="org.cytoscape.model.CyTableFactory">
</osgi:reference>
<osgi:reference id="cyEventHelperRef"
--
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.
