Author: mes
Date: 2011-01-28 15:14:28 -0800 (Fri, 28 Jan 2011)
New Revision: 23819
Modified:
core3/plugin-api/trunk/pom.xml
core3/plugin-api/trunk/src/main/java/org/cytoscape/plugin/CyPluginAdapter.java
core3/plugin-api/trunk/src/test/java/org/cytoscape/plugin/CyPluginAdapterTest.java
Log:
updated plugin adapter to include a bunch more fields
Modified: core3/plugin-api/trunk/pom.xml
===================================================================
--- core3/plugin-api/trunk/pom.xml 2011-01-28 22:59:16 UTC (rev 23818)
+++ core3/plugin-api/trunk/pom.xml 2011-01-28 23:14:28 UTC (rev 23819)
@@ -127,8 +127,33 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>swing-application-api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>3.0.0-alpha1</version>
</dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>io-api</artifactId>
+ <version>3.0.0-alpha2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>service-util</artifactId>
+ <version>3.0.0-alpha1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>work-swing-api</artifactId>
+ <version>3.0.0-alpha1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>layout-api</artifactId>
+ <version>3.0.0-alpha1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>property-api</artifactId>
+ <version>3.0.0-alpha3</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
Modified:
core3/plugin-api/trunk/src/main/java/org/cytoscape/plugin/CyPluginAdapter.java
===================================================================
---
core3/plugin-api/trunk/src/main/java/org/cytoscape/plugin/CyPluginAdapter.java
2011-01-28 22:59:16 UTC (rev 23818)
+++
core3/plugin-api/trunk/src/main/java/org/cytoscape/plugin/CyPluginAdapter.java
2011-01-28 23:14:28 UTC (rev 23819)
@@ -4,18 +4,33 @@
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyNetworkFactory;
import org.cytoscape.model.CyNetworkManager;
+import org.cytoscape.model.CyTableManager;
+import org.cytoscape.model.CyTableFactory;
import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
-import org.cytoscape.model.CyTableFactory;
import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.session.CySessionManager;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
-// TODO once the layout api has stabilized
-//import org.cytoscape.view.layout.CyLayouts;
-import org.cytoscape.view.presentation.RenderingEngineFactory;
+import org.cytoscape.view.layout.CyLayouts;
+import org.cytoscape.view.presentation.RenderingEngineManager;
import org.cytoscape.view.vizmap.VisualMappingManager;
+import org.cytoscape.view.vizmap.VisualStyleFactory;
import org.cytoscape.work.TaskManager;
+import org.cytoscape.work.undo.UndoSupport;
+import org.cytoscape.work.swing.GUITaskManager;
+import org.cytoscape.io.write.CyNetworkViewWriterManager;
+import org.cytoscape.io.write.CySessionWriterManager;
+//import org.cytoscape.io.write.CyTableWriterManager;
+import org.cytoscape.io.write.CyPropertyWriterManager;
+import org.cytoscape.io.write.PresentationWriterManager;
+import org.cytoscape.io.read.CyNetworkViewReaderManager;
+import org.cytoscape.io.read.CySessionReaderManager;
+import org.cytoscape.io.read.CyTableReaderManager;
+import org.cytoscape.io.read.CyPropertyReaderManager;
+import org.cytoscape.property.CyProperty;
+import org.cytoscape.service.util.CyServiceRegistrar;
+import java.util.Properties;
/**
* A Java-only api providing access to Cytoscape functionality.
@@ -46,6 +61,12 @@
CyTableFactory getCyTableFactory();
/**
+ * Returns an instance of {@link CyTableManager}.
+ * @return an instance of {@link CyTableManager}.
+ */
+ CyTableManager getCyTableManager();
+
+ /**
* Returns an instance of {@link CyRootNetworkFactory}.
* @return an instance of {@link CyRootNetworkFactory}.
*/
@@ -105,15 +126,31 @@
*/
TaskManager getTaskManager();
+ /**
+ * Returns an instance of {@link UndoSupport}.
+ * @return an instance of {@link UndoSupport}.
+ */
+ UndoSupport getUndoSupport();
+
//
+ // work swing api
+ //
+
+ /**
+ * Returns an instance of {@link GUITaskManager}.
+ * @return an instance of {@link GUITaskManager}.
+ */
+ GUITaskManager getGUITaskManager();
+
+ //
// presentation api
//
/**
- * Returns an instance of {@link RenderingEngineFactory}.
- * @return an instance of {@link RenderingEngineFactory}.
+ * Returns an instance of {@link RenderingEngineManager}.
+ * @return an instance of {@link RenderingEngineManager}.
*/
- RenderingEngineFactory getPresentationFactory();
+ RenderingEngineManager getRenderingEngineManager();
//
// vizmap api
@@ -124,25 +161,104 @@
* @return an instance of {@link VisualMappingManager}.
*/
VisualMappingManager getVisualMappingManager();
+
+ /**
+ * Returns an instance of {@link VisualStyleFactory}.
+ * @return an instance of {@link VisualStyleFactory}.
+ */
+ VisualStyleFactory getVisualStyleFactory();
-
//
// layout api
//
-
-// TODO once the layout api has stabilized
/**
* Returns an instance of {@link CyLayouts}.
* @return an instance of {@link CyLayouts}.
+ */
CyLayouts getCyLayouts();
- */
//
// swing application api
//
+
/**
* Returns an instance of {@link CySwingApplication}.
* @return an instance of {@link CySwingApplication}.
*/
CySwingApplication getCySwingApplication();
+
+ //
+ // property api
+ //
+ /**
+ * Returns an instance of {@link CyProperty<Properties>}.
+ * @return an instance of {@link CyProperty<Properties>}.
+ */
+ CyProperty<Properties> getCoreProperties();
+
+ //
+ // io api
+ //
+ /**
+ * Returns an instance of {@link CyNetworkViewReaderManager}.
+ * @return an instance of {@link CyNetworkViewReaderManager}.
+ */
+ CyNetworkViewReaderManager getCyNetworkViewReaderManager();
+
+ /**
+ * Returns an instance of {@link CyPropertyReaderManager}.
+ * @return an instance of {@link CyPropertyReaderManager}.
+ */
+ CyPropertyReaderManager getCyPropertyReaderManager();
+
+ /**
+ * Returns an instance of {@link CySessionReaderManager}.
+ * @return an instance of {@link CySessionReaderManager}.
+ */
+ CySessionReaderManager getCySessionReaderManager();
+
+ /**
+ * Returns an instance of {@link CyTableReaderManager}.
+ * @return an instance of {@link CyTableReaderManager}.
+ */
+ CyTableReaderManager getCyTableReaderManager();
+
+ /**
+ * Returns an instance of {@link CyNetworkViewWriterManager}.
+ * @return an instance of {@link CyNetworkViewWriterManager}.
+ */
+ CyNetworkViewWriterManager getCyNetworkViewWriterManager();
+
+ /**
+ * Returns an instance of {@link CyPropertyWriterManager}.
+ * @return an instance of {@link CyPropertyWriterManager}.
+ */
+ CyPropertyWriterManager getCyPropertyWriterManager();
+
+ /**
+ * Returns an instance of {@link CySessionWriterManager}.
+ * @return an instance of {@link CySessionWriterManager}.
+ */
+ CySessionWriterManager getCySessionWriterManager();
+
+ /**
+ * Returns an instance of {@link CyTableWriterManager}.
+ * @return an instance of {@link CyTableWriterManager}.
+ CyTableWriterManager getCyTableWriterManager();
+ */
+
+ /**
+ * Returns an instance of {@link PresentationWriterManager}.
+ * @return an instance of {@link PresentationWriterManager}.
+ */
+ PresentationWriterManager getPresentationWriterManager();
+
+ //
+ // service util
+ //
+ /**
+ * Returns an instance of {@link CyServiceRegistrar}.
+ * @return an instance of {@link CyServiceRegistrar}.
+ */
+ CyServiceRegistrar getCyServiceRegistrar();
}
Modified:
core3/plugin-api/trunk/src/test/java/org/cytoscape/plugin/CyPluginAdapterTest.java
===================================================================
---
core3/plugin-api/trunk/src/test/java/org/cytoscape/plugin/CyPluginAdapterTest.java
2011-01-28 22:59:16 UTC (rev 23818)
+++
core3/plugin-api/trunk/src/test/java/org/cytoscape/plugin/CyPluginAdapterTest.java
2011-01-28 23:14:28 UTC (rev 23819)
@@ -18,11 +18,10 @@
assertNotNull("dataTable exists", adapter.getCyEventHelper());
}
-// TODO once layout api has stabilized
-// @Test
-// public void testGetCyLayouts() {
-// assertNotNull("CyLayouts exists", adapter.getCyLayouts());
-// }
+ @Test
+ public void testGetCyLayouts() {
+ assertNotNull("CyLayouts exists", adapter.getCyLayouts());
+ }
@Test
public void testGetCyNetworkFactory() {
@@ -50,11 +49,6 @@
}
@Test
- public void testGetPresentationFactory() {
- assertNotNull("PresentationFactory exists",
adapter.getPresentationFactory());
- }
-
- @Test
public void testGetTaskManager() {
assertNotNull("TaskManager exists", adapter.getTaskManager());
}
@@ -78,4 +72,87 @@
public void testGetCySwingApplication() {
assertNotNull("CySwingApplication exists",
adapter.getCySwingApplication());
}
+
+ @Test
+ public void testCyTableManager() {
+ assertNotNull("CyTableManager exists",
adapter.getCyTableManager());
+ }
+
+ @Test
+ public void testUndoSupport() {
+ assertNotNull("UndoSupport exists", adapter.getUndoSupport());
+ }
+
+ @Test
+ public void testGUITaskManager() {
+ assertNotNull("GUITaskManager exists",
adapter.getGUITaskManager());
+ }
+
+ @Test
+ public void testGetRenderingEngineManager() {
+ assertNotNull("RenderingEngineManager exists",
adapter.getRenderingEngineManager());
+ }
+
+ @Test
+ public void testVisualStyleFactory() {
+ assertNotNull("VisualStyleFactory exists",
adapter.getVisualStyleFactory());
+ }
+
+ @Test
+ public void testCyPropertyProperties() {
+ assertNotNull("CyProperty<Properties> exists",
adapter.getCoreProperties());
+ }
+
+ @Test
+ public void testCyNetworkViewReaderManager() {
+ assertNotNull("CyNetworkViewReaderManager exists",
adapter.getCyNetworkViewReaderManager());
+ }
+
+ @Test
+ public void testCyPropertyReaderManager() {
+ assertNotNull("CyPropertyReaderManager exists",
adapter.getCyPropertyReaderManager());
+ }
+
+ @Test
+ public void testCySessionReaderManager() {
+ assertNotNull("CySessionReaderManager exists",
adapter.getCySessionReaderManager());
+ }
+
+ @Test
+ public void testCyTableReaderManager() {
+ assertNotNull("CyTableReaderManager exists",
adapter.getCyTableReaderManager());
+ }
+
+ @Test
+ public void testCyNetworkViewWriterManager() {
+ assertNotNull("CyNetworkViewWriterManager exists",
adapter.getCyNetworkViewWriterManager());
+ }
+
+ @Test
+ public void testCyPropertyWriterManager() {
+ assertNotNull("CyPropertyWriterManager exists",
adapter.getCyPropertyWriterManager());
+ }
+
+ @Test
+ public void testCySessionWriterManager() {
+ assertNotNull("CySessionWriterManager exists",
adapter.getCySessionWriterManager());
+ }
+
+/*
+ @Test
+ public void testCyTableWriterManager() {
+ assertNotNull("CyTableWriterManager exists",
adapter.getCyTableWriterManager());
+ }
+ */
+
+ @Test
+ public void testPresentationWriterManager() {
+ assertNotNull("PresentationWriterManager exists",
adapter.getPresentationWriterManager());
+ }
+
+ @Test
+ public void testCyServiceRegistrar() {
+ assertNotNull("CyServiceRegistrar exists",
adapter.getCyServiceRegistrar());
+ }
+
}
--
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.
