Author: mes
Date: 2012-04-06 17:08:25 -0700 (Fri, 06 Apr 2012)
New Revision: 28765
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/graph/
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/spacial/
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/util/
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/customgraphics/
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/graph/
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/spacial/
core3/impl/trunk/ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/util/
Removed:
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/test/java/org/cytoscape/ding/customgraphics/
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/CyActivator.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/spacial/CyActivator.java
core3/impl/trunk/ding-impl/graph-render/src/main/java/org/cytoscape/graph/
core3/impl/trunk/ding-impl/graph-render/src/test/java/org/cytoscape/graph/
core3/impl/trunk/ding-impl/spacial/src/main/java/org/cytoscape/spacial/
core3/impl/trunk/ding-impl/spacial/src/test/java/org/cytoscape/spacial/
core3/impl/trunk/ding-impl/util-intr/src/main/java/org/cytoscape/util/
core3/impl/trunk/ding-impl/util-intr/src/test/java/org/cytoscape/util/
Modified:
core3/gui-distribution/trunk/features/src/main/resources/features.xml
core3/impl/trunk/ding-impl/ding-presentation-impl/pom.xml
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/CyActivator.java
core3/impl/trunk/ding-impl/pom.xml
Log:
Combined all ding code into single bundle so that it doesn't expose any
interfaces.
Modified: core3/gui-distribution/trunk/features/src/main/resources/features.xml
===================================================================
--- core3/gui-distribution/trunk/features/src/main/resources/features.xml
2012-04-06 22:58:53 UTC (rev 28764)
+++ core3/gui-distribution/trunk/features/src/main/resources/features.xml
2012-04-07 00:08:25 UTC (rev 28765)
@@ -82,9 +82,6 @@
<bundle
start-level="115">mvn:org.cytoscape.distribution/cmdline-impl/${project.version}</bundle>
<bundle
start-level="115">mvn:org.cytoscape/property-impl/${cytoscape.impl.version}</bundle>
- <bundle
start-level="115">mvn:org.cytoscape/graph-render/${cytoscape.impl.version}</bundle>
- <bundle
start-level="115">mvn:org.cytoscape/util-intr/${cytoscape.impl.version}</bundle>
- <bundle
start-level="115">mvn:org.cytoscape/spacial/${cytoscape.impl.version}</bundle>
<bundle
start-level="120">mvn:org.cytoscape/datasource-impl/${cytoscape.impl.version}</bundle>
<bundle
start-level="120">mvn:org.cytoscape/equations-impl/${cytoscape.impl.version}</bundle>
@@ -106,7 +103,6 @@
<bundle
start-level="140">mvn:org.cytoscape/datasource-biogrid-impl/${cytoscape.impl.version}</bundle>
<bundle
start-level="140">mvn:org.cytoscape/command-executor-impl/${cytoscape.impl.version}</bundle>
<bundle
start-level="140">mvn:org.cytoscape/session-impl/${cytoscape.impl.version}</bundle>
- <bundle
start-level="140">mvn:org.cytoscape/ding-customgraphics-manager-impl/${cytoscape.impl.version}</bundle>
<bundle
start-level="145">mvn:org.cytoscape/ding-presentation-impl/${cytoscape.impl.version}</bundle>
Modified: core3/impl/trunk/ding-impl/ding-presentation-impl/pom.xml
===================================================================
--- core3/impl/trunk/ding-impl/ding-presentation-impl/pom.xml 2012-04-06
22:58:53 UTC (rev 28764)
+++ core3/impl/trunk/ding-impl/ding-presentation-impl/pom.xml 2012-04-07
00:08:25 UTC (rev 28765)
@@ -67,8 +67,8 @@
<instructions>
<Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
<Bundle-Version>${project.version}</Bundle-Version>
-
<Export-Package>!${bundle.namespace}.impl.*,${bundle.namespace}.*;version="${project.version};-noimport:=true"</Export-Package>
-
<Private-Package>${bundle.namespace}.impl.*</Private-Package>
+
<Export-Package>!${bundle.namespace}.*,!org.cytoscape.graph.*,!org.cytoscape.util.intr.*,!org.cytoscape.spacial.*</Export-Package>
+
<Private-Package>${bundle.namespace}.*,org.cytoscape.graph.*,org.cytoscape.util.intr.*,org.cytoscape.spacial.*</Private-Package>
<Bundle-Activator>${bundle.namespace}.CyActivator</Bundle-Activator>
</instructions>
</configuration>
@@ -83,11 +83,6 @@
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>graph-render</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
<artifactId>presentation-api</artifactId>
</dependency>
<dependency>
@@ -177,6 +172,12 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math</artifactId>
+ <version>2.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/CyActivator.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/CyActivator.java
2012-04-06 22:58:53 UTC (rev 28764)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/CyActivator.java
2012-04-07 00:08:25 UTC (rev 28765)
@@ -6,6 +6,8 @@
import java.util.Properties;
import java.util.Set;
+import org.cytoscape.spacial.internal.rtree.RTreeFactory;
+import org.cytoscape.spacial.SpacialIndex2DFactory;
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.application.swing.CyEdgeViewContextMenuFactory;
import org.cytoscape.application.swing.CyNodeViewContextMenuFactory;
@@ -62,6 +64,25 @@
import org.cytoscape.work.undo.UndoSupport;
import org.osgi.framework.BundleContext;
+import org.cytoscape.property.CyProperty;
+import org.cytoscape.view.vizmap.VisualMappingManager;
+import org.cytoscape.work.swing.DialogTaskManager;
+import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.application.CyApplicationConfiguration;
+
+import org.cytoscape.ding.customgraphicsmgr.internal.CustomGraphicsManagerImpl;
+import
org.cytoscape.ding.customgraphicsmgr.internal.action.CustomGraphicsManagerAction;
+import org.cytoscape.ding.customgraphicsmgr.internal.ui.CustomGraphicsBrowser;
+import org.cytoscape.event.CyEventHelper;
+
+import org.cytoscape.application.swing.CyAction;
+
+import org.osgi.framework.BundleContext;
+
+import org.cytoscape.service.util.AbstractCyActivator;
+
+import java.util.Properties;
+
public class CyActivator extends AbstractCyActivator {
public CyActivator() {
super();
@@ -69,6 +90,14 @@
public void start(BundleContext bc) {
+ startSpacial(bc);
+ startCustomGraphicsMgr(bc);
+ startPresentationImpl(bc);
+ }
+
+
+ private void startPresentationImpl(BundleContext bc) {
+
CyServiceRegistrar cyServiceRegistrarServiceRef =
getService(bc, CyServiceRegistrar.class);
CyApplicationManager applicationManagerManagerServiceRef =
getService(bc, CyApplicationManager.class);
CustomGraphicsManager customGraphicsManagerServiceRef =
getService(bc, CustomGraphicsManager.class);
@@ -218,4 +247,31 @@
final CustomGraphicsSizeDependencyFactory
customGraphicsSizeDependencyFactory = new
CustomGraphicsSizeDependencyFactory(dVisualLexicon);
registerService(bc, customGraphicsSizeDependencyFactory,
VisualPropertyDependencyFactory.class, new Properties());
}
-}
\ No newline at end of file
+
+ private void startCustomGraphicsMgr(BundleContext bc) {
+
+ DialogTaskManager dialogTaskManagerServiceRef = getService(bc,
DialogTaskManager.class);
+ CyProperty coreCyPropertyServiceRef = getService(bc,
CyProperty.class, "(cyPropertyName=cytoscape3.props)");
+ CyApplicationManager cyApplicationManagerServiceRef =
getService(bc, CyApplicationManager.class);
+ CyApplicationConfiguration cyApplicationConfigurationServiceRef
= getService(bc,
+ CyApplicationConfiguration.class);
+ CyEventHelper eventHelperServiceRef = getService(bc,
CyEventHelper.class);
+ VisualMappingManager vmmServiceRef = getService(bc,
VisualMappingManager.class);
+
+ CustomGraphicsManagerImpl customGraphicsManager = new
CustomGraphicsManagerImpl(coreCyPropertyServiceRef,
+ dialogTaskManagerServiceRef,
cyApplicationConfigurationServiceRef, eventHelperServiceRef, vmmServiceRef,
cyApplicationManagerServiceRef);
+ CustomGraphicsBrowser browser = new
CustomGraphicsBrowser(customGraphicsManager);
+ registerAllServices(bc, browser, new Properties());
+
+ CustomGraphicsManagerAction customGraphicsManagerAction = new
CustomGraphicsManagerAction(
+ customGraphicsManager,
cyApplicationManagerServiceRef, browser);
+
+ registerAllServices(bc, customGraphicsManager, new
Properties());
+ registerService(bc, customGraphicsManagerAction,
CyAction.class, new Properties());
+ }
+
+ private void startSpacial(BundleContext bc) {
+ RTreeFactory rtreeFactory = new RTreeFactory();
+ registerService(bc,rtreeFactory,SpacialIndex2DFactory.class,
new Properties());
+ }
+}
Deleted:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/CyActivator.java
2012-04-06 22:58:53 UTC (rev 28764)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/CyActivator.java
2012-04-07 00:08:25 UTC (rev 28765)
@@ -1,48 +0,0 @@
-package org.cytoscape.ding.customgraphicsmgr.internal;
-
-import org.cytoscape.property.CyProperty;
-import org.cytoscape.view.vizmap.VisualMappingManager;
-import org.cytoscape.work.swing.DialogTaskManager;
-import org.cytoscape.application.CyApplicationManager;
-import org.cytoscape.application.CyApplicationConfiguration;
-
-import org.cytoscape.ding.customgraphicsmgr.internal.CustomGraphicsManagerImpl;
-import
org.cytoscape.ding.customgraphicsmgr.internal.action.CustomGraphicsManagerAction;
-import org.cytoscape.ding.customgraphicsmgr.internal.ui.CustomGraphicsBrowser;
-import org.cytoscape.event.CyEventHelper;
-
-import org.cytoscape.application.swing.CyAction;
-
-import org.osgi.framework.BundleContext;
-
-import org.cytoscape.service.util.AbstractCyActivator;
-
-import java.util.Properties;
-
-public class CyActivator extends AbstractCyActivator {
- public CyActivator() {
- super();
- }
-
- public void start(BundleContext bc) {
-
- DialogTaskManager dialogTaskManagerServiceRef = getService(bc,
DialogTaskManager.class);
- CyProperty coreCyPropertyServiceRef = getService(bc,
CyProperty.class, "(cyPropertyName=cytoscape3.props)");
- CyApplicationManager cyApplicationManagerServiceRef =
getService(bc, CyApplicationManager.class);
- CyApplicationConfiguration cyApplicationConfigurationServiceRef
= getService(bc,
- CyApplicationConfiguration.class);
- CyEventHelper eventHelperServiceRef = getService(bc,
CyEventHelper.class);
- VisualMappingManager vmmServiceRef = getService(bc,
VisualMappingManager.class);
-
- CustomGraphicsManagerImpl customGraphicsManager = new
CustomGraphicsManagerImpl(coreCyPropertyServiceRef,
- dialogTaskManagerServiceRef,
cyApplicationConfigurationServiceRef, eventHelperServiceRef, vmmServiceRef,
cyApplicationManagerServiceRef);
- CustomGraphicsBrowser browser = new
CustomGraphicsBrowser(customGraphicsManager);
- registerAllServices(bc, browser, new Properties());
-
- CustomGraphicsManagerAction customGraphicsManagerAction = new
CustomGraphicsManagerAction(
- customGraphicsManager,
cyApplicationManagerServiceRef, browser);
-
- registerAllServices(bc, customGraphicsManager, new
Properties());
- registerService(bc, customGraphicsManagerAction,
CyAction.class, new Properties());
- }
-}
Deleted:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/spacial/CyActivator.java
===================================================================
---
core3/impl/trunk/ding-impl/spacial/src/main/java/org/cytoscape/spacial/CyActivator.java
2012-04-06 22:58:53 UTC (rev 28764)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/spacial/CyActivator.java
2012-04-07 00:08:25 UTC (rev 28765)
@@ -1,34 +0,0 @@
-
-
-
-
-package org.cytoscape.spacial;
-
-
-import org.cytoscape.spacial.internal.rtree.RTreeFactory;
-
-import org.cytoscape.spacial.SpacialIndex2DFactory;
-
-
-import org.osgi.framework.BundleContext;
-
-import org.cytoscape.service.util.AbstractCyActivator;
-
-import java.util.Properties;
-
-
-
-public class CyActivator extends AbstractCyActivator {
- public CyActivator() {
- super();
- }
-
-
- public void start(BundleContext bc) {
-
- RTreeFactory rtreeFactory = new RTreeFactory();
-
- registerService(bc,rtreeFactory,SpacialIndex2DFactory.class,
new Properties());
- }
-}
-
Modified: core3/impl/trunk/ding-impl/pom.xml
===================================================================
--- core3/impl/trunk/ding-impl/pom.xml 2012-04-06 22:58:53 UTC (rev 28764)
+++ core3/impl/trunk/ding-impl/pom.xml 2012-04-07 00:08:25 UTC (rev 28765)
@@ -14,11 +14,7 @@
<name>Ding Implementation Parent Pom</name>
<modules>
- <module>util-intr</module>
- <module>spacial</module>
- <module>graph-render</module>
<module>ding-presentation-impl</module>
- <module>ding-customgraphics-manager-impl</module>
<module>performance-debug</module>
</modules>
--
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.
