Author: mes
Date: 2010-10-28 15:59:51 -0700 (Thu, 28 Oct 2010)
New Revision: 22602
Modified:
core3/plugin-impl/trunk/pom.xml
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
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
core3/plugin-impl/trunk/src/test/java/org/cytoscape/plugin/internal/CyPluginAdapterImplTest.java
Log:
updated for removed snapshot dependencies
Modified: core3/plugin-impl/trunk/pom.xml
===================================================================
--- core3/plugin-impl/trunk/pom.xml 2010-10-28 22:59:39 UTC (rev 22601)
+++ core3/plugin-impl/trunk/pom.xml 2010-10-28 22:59:51 UTC (rev 22602)
@@ -153,11 +153,6 @@
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>layout-api</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.cytoscape</groupId>
<artifactId>plugin-api</artifactId>
<version>1.0-SNAPSHOT</version>
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-10-28 22:59:39 UTC (rev 22601)
+++
core3/plugin-impl/trunk/src/main/java/org/cytoscape/plugin/internal/CyPluginAdapterImpl.java
2010-10-28 22:59:51 UTC (rev 22602)
@@ -8,7 +8,7 @@
//
import org.cytoscape.model.CyTableFactory;
import org.cytoscape.event.CyEventHelper;
-import org.cytoscape.view.layout.CyLayouts;
+//import org.cytoscape.view.layout.CyLayouts;
import org.cytoscape.model.CyNetworkFactory;
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
@@ -34,7 +34,7 @@
//
private final CyTableFactory cyTableFactory;
private final CyEventHelper cyEventHelper;
- private final CyLayouts cyLayouts;
+// private final CyLayouts cyLayouts;
private final CyNetworkFactory cyNetworkFactory;
private final CyNetworkManager cyNetworkManager;
private final CyNetworkViewFactory cyNetworkViewFactory;
@@ -54,7 +54,7 @@
CyPluginAdapterImpl(
CyTableFactory cyTableFactory,
CyEventHelper cyEventHelper,
- CyLayouts cyLayouts,
+// CyLayouts cyLayouts,
CyNetworkFactory cyNetworkFactory,
CyNetworkManager cyNetworkManager,
CyNetworkViewFactory cyNetworkViewFactory,
@@ -69,7 +69,7 @@
{
this.cyTableFactory = cyTableFactory;
this.cyEventHelper = cyEventHelper;
- this.cyLayouts = cyLayouts;
+// this.cyLayouts = cyLayouts;
this.cyNetworkFactory = cyNetworkFactory;
this.cyNetworkManager = cyNetworkManager;
this.cyNetworkViewFactory = cyNetworkViewFactory;
@@ -91,7 +91,7 @@
public CyEventHelper getCyEventHelper() { return cyEventHelper; }
- public CyLayouts getCyLayouts() { return cyLayouts; }
+// public CyLayouts getCyLayouts() { return cyLayouts; }
public CyNetworkFactory getCyNetworkFactory() { return
cyNetworkFactory; }
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-10-28 22:59:39 UTC (rev 22601)
+++
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-10-28 22:59:51 UTC (rev 22602)
@@ -19,11 +19,11 @@
<osgi:reference id="cyEventHelperRef"
interface="org.cytoscape.event.CyEventHelper">
</osgi:reference>
-
+<!--
<osgi:reference id="cyLayoutsRef"
interface="org.cytoscape.view.layout.CyLayouts">
</osgi:reference>
-
+-->
<osgi:reference id="cyNetworkFactoryRef"
interface="org.cytoscape.model.CyNetworkFactory">
</osgi:reference>
Modified:
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-10-28 22:59:39 UTC (rev 22601)
+++
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-10-28 22:59:51 UTC (rev 22602)
@@ -20,7 +20,9 @@
<bean id="cyPluginAdapter"
class="org.cytoscape.plugin.internal.CyPluginAdapterImpl">
<constructor-arg ref="cyDataTableFactoryRef" />
<constructor-arg ref="cyEventHelperRef" />
+ <!--
<constructor-arg ref="cyLayoutsRef" />
+ -->
<constructor-arg ref="cyNetworkFactoryRef" />
<constructor-arg ref="cyNetworkManagerRef" />
<constructor-arg ref="cyNetworkViewFactoryRef" />
Modified:
core3/plugin-impl/trunk/src/test/java/org/cytoscape/plugin/internal/CyPluginAdapterImplTest.java
===================================================================
---
core3/plugin-impl/trunk/src/test/java/org/cytoscape/plugin/internal/CyPluginAdapterImplTest.java
2010-10-28 22:59:39 UTC (rev 22601)
+++
core3/plugin-impl/trunk/src/test/java/org/cytoscape/plugin/internal/CyPluginAdapterImplTest.java
2010-10-28 22:59:51 UTC (rev 22602)
@@ -7,7 +7,7 @@
import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.session.CySessionManager;
-import org.cytoscape.view.layout.CyLayouts;
+//import org.cytoscape.view.layout.CyLayouts;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.view.presentation.RenderingEngineFactory;
@@ -25,7 +25,7 @@
CyTableFactory cyTableFactory = mock(CyTableFactory.class);
CyEventHelper cyEventHelper = mock(CyEventHelper.class);
- CyLayouts cyLayouts = mock(CyLayouts.class);
+// CyLayouts cyLayouts = mock(CyLayouts.class);
CyNetworkFactory cyNetworkFactory =
mock(CyNetworkFactory.class);
CyNetworkManager cyNetworkManager =
mock(CyNetworkManager.class);
CyNetworkViewFactory cyNetworkViewFactory =
mock(CyNetworkViewFactory.class);
@@ -40,7 +40,7 @@
adapter = new CyPluginAdapterImpl(
cyTableFactory,
cyEventHelper,
- cyLayouts,
+// cyLayouts,
cyNetworkFactory,
cyNetworkManager,
cyNetworkViewFactory,
--
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.
