Author: pwang
Date: 2011-08-29 15:13:51 -0700 (Mon, 29 Aug 2011)
New Revision: 26648
Modified:
core3/impl/trunk/viewmodel-impl/impl/src/main/java/org/cytoscape/view/model/internal/NetworkViewFactoryImpl.java
core3/impl/trunk/viewmodel-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/impl/trunk/viewmodel-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml
core3/impl/trunk/viewmodel-impl/impl/src/test/java/org/cytoscape/view/model/NetworkViewTestSupport.java
Log:
Removed a reference to coreProperties which is not used at all
Modified:
core3/impl/trunk/viewmodel-impl/impl/src/main/java/org/cytoscape/view/model/internal/NetworkViewFactoryImpl.java
===================================================================
---
core3/impl/trunk/viewmodel-impl/impl/src/main/java/org/cytoscape/view/model/internal/NetworkViewFactoryImpl.java
2011-08-29 19:28:42 UTC (rev 26647)
+++
core3/impl/trunk/viewmodel-impl/impl/src/main/java/org/cytoscape/view/model/internal/NetworkViewFactoryImpl.java
2011-08-29 22:13:51 UTC (rev 26648)
@@ -13,15 +13,13 @@
private final CyEventHelper eventHelper;
private final CyServiceRegistrar registrar;
- private final Properties props;
/**
* For injection, use this constructor.
*
* @param eventHelper
*/
- public NetworkViewFactoryImpl(final CyEventHelper eventHelper, final
CyServiceRegistrar registrar,
- final CyProperty<Properties> prop) {
+ public NetworkViewFactoryImpl(final CyEventHelper eventHelper, final
CyServiceRegistrar registrar) {
if (eventHelper == null)
throw new NullPointerException("CyEventHelper is null");
@@ -31,8 +29,6 @@
throw new NullPointerException("CyServiceRegistrar is
null");
this.registrar = registrar;
-
- this.props = prop.getProperties();
}
@Override
Modified:
core3/impl/trunk/viewmodel-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/impl/trunk/viewmodel-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-08-29 19:28:42 UTC (rev 26647)
+++
core3/impl/trunk/viewmodel-impl/impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-08-29 22:13:51 UTC (rev 26648)
@@ -10,9 +10,6 @@
<osgi:reference id="cyServiceRegistrarRef"
interface="org.cytoscape.service.util.CyServiceRegistrar" />
- <osgi:reference id="cyPropertyServiceRef"
interface="org.cytoscape.property.CyProperty"
- filter="(cyPropertyName=coreSettings)" />
-
<!-- Export Beans as Services -->
<osgi:service id="cyNetworkViewFactoryService"
ref="cyNetworkViewFactory"
interface="org.cytoscape.view.model.CyNetworkViewFactory">
Modified:
core3/impl/trunk/viewmodel-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/impl/trunk/viewmodel-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-08-29 19:28:42 UTC (rev 26647)
+++
core3/impl/trunk/viewmodel-impl/impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-08-29 22:13:51 UTC (rev 26648)
@@ -16,7 +16,6 @@
class="org.cytoscape.view.model.internal.NetworkViewFactoryImpl">
<constructor-arg ref="cyEventHelperServiceRef" />
<constructor-arg ref="cyServiceRegistrarRef" />
- <constructor-arg ref="cyPropertyServiceRef" />
</bean>
<bean id="cyNetworkViewManager"
Modified:
core3/impl/trunk/viewmodel-impl/impl/src/test/java/org/cytoscape/view/model/NetworkViewTestSupport.java
===================================================================
---
core3/impl/trunk/viewmodel-impl/impl/src/test/java/org/cytoscape/view/model/NetworkViewTestSupport.java
2011-08-29 19:28:42 UTC (rev 26647)
+++
core3/impl/trunk/viewmodel-impl/impl/src/test/java/org/cytoscape/view/model/NetworkViewTestSupport.java
2011-08-29 22:13:51 UTC (rev 26648)
@@ -23,7 +23,7 @@
}
public NetworkViewTestSupport(CyProperty<Properties> properties) {
- viewFactory = new NetworkViewFactoryImpl( eventHelper,
mock(CyServiceRegistrar.class), properties );
+ viewFactory = new NetworkViewFactoryImpl( eventHelper,
mock(CyServiceRegistrar.class));
}
public CyNetworkView getNetworkView() {
--
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.
