Author: mes
Date: 2011-11-23 15:48:17 -0800 (Wed, 23 Nov 2011)
New Revision: 27587
Removed:
core3/api/trunk/di-util-api/
Modified:
core3/api/trunk/pom.xml
core3/gui-distribution/trunk/features/src/main/resources/features.xml
core3/impl/trunk/command-executor-impl/pom.xml
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/tunables/CommandTunableInterceptorImpl.java
core3/impl/trunk/core-task-impl/pom.xml
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/pom.xml
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/CustomGraphicsManagerImpl.java
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/action/CustomGraphicsManagerAction.java
core3/impl/trunk/ding-impl/ding-presentation-impl/pom.xml
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/AddEdgeNodeViewTaskFactoryImpl.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingViewModelFactory.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/SwitchGraphicsDetailTaskFactory.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/ObjectPositionEditor.java
core3/impl/trunk/io-impl/pom.xml
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/ArraySubGraph.java
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyTableImpl.java
core3/impl/trunk/model-impl/pom.xml
core3/impl/trunk/plugin-impl/pom.xml
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/CyPluginAdapterImpl.java
core3/impl/trunk/pom.xml
core3/impl/trunk/psi-mi-impl/pom.xml
core3/impl/trunk/sbml-impl/pom.xml
core3/impl/trunk/table-import-impl/pom.xml
core3/impl/trunk/viewmodel-impl/impl/src/main/java/org/cytoscape/view/model/internal/CyNetworkViewManagerImpl.java
core3/impl/trunk/viewmodel-impl/pom.xml
core3/impl/trunk/vizmap-impl/pom.xml
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTunableMutator.java
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/JDialogTunableMutator.java
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/JPanelTunableMutator.java
core3/impl/trunk/work-swing-impl/pom.xml
Log:
removed DIUtil since we're no longer using spring
Modified: core3/api/trunk/pom.xml
===================================================================
--- core3/api/trunk/pom.xml 2011-11-23 23:43:31 UTC (rev 27586)
+++ core3/api/trunk/pom.xml 2011-11-23 23:48:17 UTC (rev 27587)
@@ -37,7 +37,6 @@
<module>service-api</module>
<module>swing-util-api</module>
<module>application-api</module>
- <module>di-util-api</module>
</modules>
<dependencyManagement>
Modified: core3/gui-distribution/trunk/features/src/main/resources/features.xml
===================================================================
--- core3/gui-distribution/trunk/features/src/main/resources/features.xml
2011-11-23 23:43:31 UTC (rev 27586)
+++ core3/gui-distribution/trunk/features/src/main/resources/features.xml
2011-11-23 23:48:17 UTC (rev 27587)
@@ -50,7 +50,6 @@
<bundle
start-level="110">mvn:org.cytoscape/cmdline/${cytoscape.support.version}</bundle>
<bundle
start-level="110">mvn:org.cytoscape/equations-api/${cytoscape.api.version}</bundle>
- <bundle
start-level="110">mvn:org.cytoscape/di-util-api/${cytoscape.api.version}</bundle>
<bundle
start-level="110">mvn:org.cytoscape/model-api/${cytoscape.api.version}</bundle>
<bundle
start-level="110">mvn:org.cytoscape/viewmodel-api/${cytoscape.api.version}</bundle>
<bundle
start-level="110">mvn:org.cytoscape/vizmap-api/${cytoscape.api.version}</bundle>
Modified: core3/impl/trunk/command-executor-impl/pom.xml
===================================================================
--- core3/impl/trunk/command-executor-impl/pom.xml 2011-11-23 23:43:31 UTC
(rev 27586)
+++ core3/impl/trunk/command-executor-impl/pom.xml 2011-11-23 23:48:17 UTC
(rev 27587)
@@ -66,11 +66,6 @@
</build>
<dependencies>
- <dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>di-util-api</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
Modified:
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/tunables/CommandTunableInterceptorImpl.java
===================================================================
---
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/tunables/CommandTunableInterceptorImpl.java
2011-11-23 23:43:31 UTC (rev 27586)
+++
core3/impl/trunk/command-executor-impl/src/main/java/org/cytoscape/command/internal/tunables/CommandTunableInterceptorImpl.java
2011-11-23 23:48:17 UTC (rev 27587)
@@ -3,7 +3,6 @@
import java.util.Map;
-import org.cytoscape.di.util.DIUtil;
import org.cytoscape.work.AbstractTunableInterceptor;
import org.slf4j.Logger;
@@ -29,7 +28,7 @@
* @param obj The Spring proxy object from which we'd like the raw
object.
*/
public void loadTunables(final Object obj) {
- super.loadTunables(DIUtil.stripProxy(obj));
+ super.loadTunables(obj);
}
public boolean validateAndWriteBackTunables(Object... objs) {
Modified: core3/impl/trunk/core-task-impl/pom.xml
===================================================================
--- core3/impl/trunk/core-task-impl/pom.xml 2011-11-23 23:43:31 UTC (rev
27586)
+++ core3/impl/trunk/core-task-impl/pom.xml 2011-11-23 23:48:17 UTC (rev
27587)
@@ -67,11 +67,6 @@
<dependencies>
<dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>di-util-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
Modified: core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/pom.xml
===================================================================
--- core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/pom.xml
2011-11-23 23:43:31 UTC (rev 27586)
+++ core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/pom.xml
2011-11-23 23:48:17 UTC (rev 27587)
@@ -70,10 +70,6 @@
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>di-util-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
<artifactId>swing-application-api</artifactId>
</dependency>
<dependency>
Modified:
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/CustomGraphicsManagerImpl.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/CustomGraphicsManagerImpl.java
2011-11-23 23:43:31 UTC (rev 27586)
+++
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/CustomGraphicsManagerImpl.java
2011-11-23 23:48:17 UTC (rev 27587)
@@ -14,7 +14,6 @@
import org.cytoscape.application.CyApplicationConfiguration;
import org.cytoscape.application.events.CytoscapeShutdownEvent;
import org.cytoscape.application.events.CytoscapeShutdownListener;
-import org.cytoscape.di.util.DIUtil;
import org.cytoscape.ding.customgraphics.CustomGraphicsManager;
import org.cytoscape.ding.customgraphics.CyCustomGraphics;
import org.cytoscape.ding.customgraphics.NullCustomGraphics;
Modified:
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/action/CustomGraphicsManagerAction.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/action/CustomGraphicsManagerAction.java
2011-11-23 23:43:31 UTC (rev 27586)
+++
core3/impl/trunk/ding-impl/ding-customgraphics-manager-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/action/CustomGraphicsManagerAction.java
2011-11-23 23:48:17 UTC (rev 27587)
@@ -5,7 +5,6 @@
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.application.swing.AbstractCyAction;
-import org.cytoscape.di.util.DIUtil;
import org.cytoscape.ding.customgraphics.CustomGraphicsManager;
import org.cytoscape.ding.impl.customgraphics.ui.CustomGraphicsManagerDialog;
@@ -17,7 +16,7 @@
public CustomGraphicsManagerAction(final CustomGraphicsManager manager,
final CyApplicationManager
applicationManager)
{
- super("Open Custom Graphics Manager",
DIUtil.stripProxy(applicationManager));
+ super("Open Custom Graphics Manager", applicationManager);
setPreferredMenu("View");
this.dialog = new CustomGraphicsManagerDialog(manager,
applicationManager);
Modified: core3/impl/trunk/ding-impl/ding-presentation-impl/pom.xml
===================================================================
--- core3/impl/trunk/ding-impl/ding-presentation-impl/pom.xml 2011-11-23
23:43:31 UTC (rev 27586)
+++ core3/impl/trunk/ding-impl/ding-presentation-impl/pom.xml 2011-11-23
23:48:17 UTC (rev 27587)
@@ -79,16 +79,6 @@
<dependencies>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>di-util-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
<artifactId>model-api</artifactId>
</dependency>
<dependency>
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/AddEdgeNodeViewTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/AddEdgeNodeViewTaskFactoryImpl.java
2011-11-23 23:43:31 UTC (rev 27586)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/AddEdgeNodeViewTaskFactoryImpl.java
2011-11-23 23:48:17 UTC (rev 27587)
@@ -4,7 +4,6 @@
import java.awt.datatransfer.Transferable;
import java.awt.geom.Point2D;
-import org.cytoscape.di.util.DIUtil;
import org.cytoscape.dnd.DropNodeViewTaskFactory;
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyNode;
@@ -21,7 +20,7 @@
private final CyNetworkManager netMgr;
public AddEdgeNodeViewTaskFactoryImpl(CyNetworkManager netMgr) {
- this.netMgr = DIUtil.stripProxy(netMgr);
+ this.netMgr = netMgr;
}
public void setNodeView(View<CyNode> nv, CyNetworkView view) {
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
2011-11-23 23:43:31 UTC (rev 27586)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DVisualLexicon.java
2011-11-23 23:48:17 UTC (rev 27587)
@@ -35,7 +35,6 @@
import java.util.Map;
import java.util.Set;
-import org.cytoscape.di.util.DIUtil;
import org.cytoscape.ding.DNodeShape;
import org.cytoscape.ding.ObjectPosition;
import org.cytoscape.ding.customgraphics.CustomGraphicsManager;
@@ -336,7 +335,7 @@
((DiscreteRange<LineType>)
EDGE_LINE_TYPE.getRange()).addRangeValue(SINEWAVE);
((DiscreteRange<LineType>)
EDGE_LINE_TYPE.getRange()).addRangeValue(VERTICAL_SLASH);
- CG_RANGE.setManager(DIUtil.stripProxy(manager));
+ CG_RANGE.setManager(manager);
addVisualProperty(NETWORK_NODE_SELECTION, NETWORK);
addVisualProperty(NETWORK_EDGE_SELECTION, NETWORK);
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
2011-11-23 23:43:31 UTC (rev 27586)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingNavigationRenderingEngineFactory.java
2011-11-23 23:48:17 UTC (rev 27587)
@@ -8,7 +8,6 @@
import javax.swing.JComponent;
import org.cytoscape.application.CyApplicationManager;
-import org.cytoscape.di.util.DIUtil;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
@@ -38,9 +37,9 @@
final
RenderingEngineManager renderingEngineManager,
final CyApplicationManager
appManager)
{
- this.dingLexicon = DIUtil.stripProxy(dingLexicon);
- this.renderingEngineManager =
DIUtil.stripProxy(renderingEngineManager);
- this.appManager = DIUtil.stripProxy(appManager);
+ this.dingLexicon = dingLexicon;
+ this.renderingEngineManager = renderingEngineManager;
+ this.appManager = appManager;
viewMap = new HashMap<CyNetworkView, DGraphView>();
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
2011-11-23 23:43:31 UTC (rev 27586)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
2011-11-23 23:48:17 UTC (rev 27587)
@@ -7,7 +7,6 @@
import javax.swing.JComponent;
import javax.swing.JInternalFrame;
-import org.cytoscape.di.util.DIUtil;
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkTableManager;
@@ -67,17 +66,17 @@
ViewTaskFactoryListener vtfListener,
AnnotationFactoryManager annMgr) {
- this.dataTableFactory = DIUtil.stripProxy(dataTableFactory);
- this.rootNetworkFactory = DIUtil.stripProxy(rootNetworkFactory);
- this.spacialFactory = DIUtil.stripProxy(spacialFactory);
- this.undo = DIUtil.stripProxy(undo);
- this.dingLexicon = DIUtil.stripProxy(dingLexicon);
- this.dialogTaskManager = DIUtil.stripProxy(dialogTaskManager);
- this.menuTaskManager = DIUtil.stripProxy(menuTaskManager);
- this.registrar = DIUtil.stripProxy(registrar);
- this.tableMgr = DIUtil.stripProxy(tableMgr);
- this.eventHelper = DIUtil.stripProxy(eventHelper);
- this.renderingEngineManager =
DIUtil.stripProxy(renderingEngineManager);
+ this.dataTableFactory = dataTableFactory;
+ this.rootNetworkFactory = rootNetworkFactory;
+ this.spacialFactory = spacialFactory;
+ this.undo = undo;
+ this.dingLexicon = dingLexicon;
+ this.dialogTaskManager = dialogTaskManager;
+ this.menuTaskManager = menuTaskManager;
+ this.registrar = registrar;
+ this.tableMgr = tableMgr;
+ this.eventHelper = eventHelper;
+ this.renderingEngineManager = renderingEngineManager;
this.annMgr = annMgr;
this.vtfListener = vtfListener;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingViewModelFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingViewModelFactory.java
2011-11-23 23:43:31 UTC (rev 27586)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingViewModelFactory.java
2011-11-23 23:48:17 UTC (rev 27587)
@@ -4,7 +4,6 @@
import org.cytoscape.ding.impl.cyannotator.create.AnnotationFactoryManager;
-import org.cytoscape.di.util.DIUtil;
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkTableManager;
@@ -46,15 +45,15 @@
ViewTaskFactoryListener vtfListener,
AnnotationFactoryManager annMgr) {
- this.dataTableFactory = DIUtil.stripProxy(dataTableFactory);
- this.rootNetworkFactory = DIUtil.stripProxy(rootNetworkFactory);
- this.spacialFactory = DIUtil.stripProxy(spacialFactory);
- this.undo = DIUtil.stripProxy(undo);
- this.dingLexicon = DIUtil.stripProxy(dingLexicon);
- this.dialogTaskManager = DIUtil.stripProxy(dialogTaskManager);
- this.registrar = DIUtil.stripProxy(registrar);
- this.tableMgr = DIUtil.stripProxy(tableMgr);
- this.eventHelper = DIUtil.stripProxy(eventHelper);
+ this.dataTableFactory = dataTableFactory;
+ this.rootNetworkFactory = rootNetworkFactory;
+ this.spacialFactory = spacialFactory;
+ this.undo = undo;
+ this.dingLexicon = dingLexicon;
+ this.dialogTaskManager = dialogTaskManager;
+ this.registrar = registrar;
+ this.tableMgr = tableMgr;
+ this.eventHelper = eventHelper;
this.vtfListener = vtfListener;
this.annMgr = annMgr;
this.menuTaskManager = menuTaskManager;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/SwitchGraphicsDetailTaskFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/SwitchGraphicsDetailTaskFactory.java
2011-11-23 23:43:31 UTC (rev 27586)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/SwitchGraphicsDetailTaskFactory.java
2011-11-23 23:48:17 UTC (rev 27587)
@@ -4,7 +4,6 @@
import java.util.Properties;
import org.cytoscape.application.CyApplicationManager;
-import org.cytoscape.di.util.DIUtil;
import org.cytoscape.property.CyProperty;
import org.cytoscape.work.TaskFactory;
import org.cytoscape.work.TaskIterator;
@@ -15,8 +14,8 @@
private final CyProperty<Properties> defaultProps;
public SwitchGraphicsDetailTaskFactory(final CyApplicationManager
appManager, final CyProperty<Properties> defaultProps) {
- this.appManager = DIUtil.stripProxy(appManager);
- this.defaultProps = DIUtil.stripProxy(defaultProps);
+ this.appManager = appManager;
+ this.defaultProps = defaultProps;
}
@Override
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/ObjectPositionEditor.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/ObjectPositionEditor.java
2011-11-23 23:43:31 UTC (rev 27586)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/editor/ObjectPositionEditor.java
2011-11-23 23:48:17 UTC (rev 27587)
@@ -1,7 +1,6 @@
package org.cytoscape.ding.impl.editor;
-import org.cytoscape.di.util.DIUtil;
import org.cytoscape.ding.CyObjectPositionPropertyEditor;
import org.cytoscape.ding.ObjectPosition;
import org.cytoscape.ding.ObjectPositionCellRenderer;
@@ -17,7 +16,7 @@
*/
public ObjectPositionEditor(final ValueEditor<ObjectPosition>
valueEditor) {
super(ObjectPosition.class,
- new
CyObjectPositionPropertyEditor(DIUtil.stripProxy(valueEditor)));
+ new CyObjectPositionPropertyEditor(valueEditor));
discreteTableCellRenderer = new ObjectPositionCellRenderer();
// continuousTableCellRenderer = new
ColorContinuousMappingCellRenderer();
Modified: core3/impl/trunk/io-impl/pom.xml
===================================================================
--- core3/impl/trunk/io-impl/pom.xml 2011-11-23 23:43:31 UTC (rev 27586)
+++ core3/impl/trunk/io-impl/pom.xml 2011-11-23 23:48:17 UTC (rev 27587)
@@ -67,15 +67,6 @@
<dependencies>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>di-util-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
<artifactId>equations-api</artifactId>
</dependency>
<dependency>
Modified:
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/ArraySubGraph.java
===================================================================
---
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/ArraySubGraph.java
2011-11-23 23:43:31 UTC (rev 27586)
+++
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/ArraySubGraph.java
2011-11-23 23:48:17 UTC (rev 27587)
@@ -35,7 +35,6 @@
//import org.cytoscape.model.builder.CyNodeBuilder;
//import org.cytoscape.model.builder.CyEdgeBuilder;
-import org.cytoscape.di.util.DIUtil;
import org.cytoscape.model.Identifiable;
import org.cytoscape.model.CyColumn;
import org.cytoscape.model.CyNetwork;
@@ -89,7 +88,7 @@
assert(par != null);
parent = par;
internalId = inId;
- this.eventHelper = DIUtil.stripProxy(eventHelper);
+ this.eventHelper = eventHelper;
internalSUID = inSUID;
this.netTables = netTables;
Modified:
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyTableImpl.java
===================================================================
---
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyTableImpl.java
2011-11-23 23:43:31 UTC (rev 27586)
+++
core3/impl/trunk/model-impl/impl/src/main/java/org/cytoscape/model/internal/CyTableImpl.java
2011-11-23 23:48:17 UTC (rev 27587)
@@ -36,7 +36,6 @@
import java.util.Map;
import java.util.Set;
-import org.cytoscape.di.util.DIUtil;
import org.cytoscape.equations.Equation;
import org.cytoscape.equations.Interpreter;
import org.cytoscape.event.CyEventHelper;
@@ -109,7 +108,7 @@
this.pub = pub;
this.isImmutable = !isMutable;
this.suid = SUIDFactory.getNextSUID();
- this.eventHelper = DIUtil.stripProxy(eventHelper);
+ this.eventHelper = eventHelper;
this.interpreter = interpreter;
this.savePolicy = savePolicy;
this.fireEvents = !pub;
Modified: core3/impl/trunk/model-impl/pom.xml
===================================================================
--- core3/impl/trunk/model-impl/pom.xml 2011-11-23 23:43:31 UTC (rev 27586)
+++ core3/impl/trunk/model-impl/pom.xml 2011-11-23 23:48:17 UTC (rev 27587)
@@ -80,22 +80,8 @@
should be kept in the it/pom.xml
-->
<dependencies>
- <dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>di-util-api</artifactId>
- </dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>di-util-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
<artifactId>model-api</artifactId>
</dependency>
<dependency>
Modified: core3/impl/trunk/plugin-impl/pom.xml
===================================================================
--- core3/impl/trunk/plugin-impl/pom.xml 2011-11-23 23:43:31 UTC (rev
27586)
+++ core3/impl/trunk/plugin-impl/pom.xml 2011-11-23 23:48:17 UTC (rev
27587)
@@ -113,10 +113,6 @@
<!-- dependencies needed for plugin manager -->
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>di-util-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
<artifactId>io-api</artifactId>
</dependency>
Modified:
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/CyPluginAdapterImpl.java
===================================================================
---
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/CyPluginAdapterImpl.java
2011-11-23 23:43:31 UTC (rev 27586)
+++
core3/impl/trunk/plugin-impl/src/main/java/org/cytoscape/plugin/internal/CyPluginAdapterImpl.java
2011-11-23 23:48:17 UTC (rev 27587)
@@ -7,7 +7,6 @@
import org.cytoscape.application.swing.CyAction;
import org.cytoscape.application.swing.CySwingApplication;
import org.cytoscape.application.swing.events.CytoPanelComponentSelectedEvent;
-import org.cytoscape.di.util.DIUtil;
import org.cytoscape.dnd.DropNetworkViewTaskFactory;
import org.cytoscape.equations.AbstractFunction;
import org.cytoscape.event.CyEventHelper;
@@ -121,7 +120,6 @@
// thus making it available to any plugin. All packages in the
// Cytoscape API should have at least one object in this class!!!
//
- private DIUtil dIUtil;
private SessionAboutToBeSavedEvent sessionAboutToBeSavedEvent;
private VisualStyleAboutToBeRemovedEvent
visualStyleAboutToBeRemovedEvent;
private AboutToRemoveEdgeViewsListener aboutToRemoveEdgeViewsListener;
Modified: core3/impl/trunk/pom.xml
===================================================================
--- core3/impl/trunk/pom.xml 2011-11-23 23:43:31 UTC (rev 27586)
+++ core3/impl/trunk/pom.xml 2011-11-23 23:48:17 UTC (rev 27587)
@@ -178,21 +178,11 @@
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>work-spring-api</artifactId>
- <version>${cytoscape.api.version}</version>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
<artifactId>work-swing-api</artifactId>
<version>${cytoscape.api.version}</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>di-util-api</artifactId>
- <version>${cytoscape.api.version}</version>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
<artifactId>core-task-api</artifactId>
<version>${cytoscape.api.version}</version>
<type>test-jar</type>
Modified: core3/impl/trunk/psi-mi-impl/pom.xml
===================================================================
--- core3/impl/trunk/psi-mi-impl/pom.xml 2011-11-23 23:43:31 UTC (rev
27586)
+++ core3/impl/trunk/psi-mi-impl/pom.xml 2011-11-23 23:48:17 UTC (rev
27587)
@@ -42,17 +42,6 @@
<dependencies>
<dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>di-util-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: core3/impl/trunk/sbml-impl/pom.xml
===================================================================
--- core3/impl/trunk/sbml-impl/pom.xml 2011-11-23 23:43:31 UTC (rev 27586)
+++ core3/impl/trunk/sbml-impl/pom.xml 2011-11-23 23:48:17 UTC (rev 27587)
@@ -17,17 +17,6 @@
<dependencies>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>di-util-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
<artifactId>io-api</artifactId>
</dependency>
<dependency>
Modified: core3/impl/trunk/table-import-impl/pom.xml
===================================================================
--- core3/impl/trunk/table-import-impl/pom.xml 2011-11-23 23:43:31 UTC (rev
27586)
+++ core3/impl/trunk/table-import-impl/pom.xml 2011-11-23 23:48:17 UTC (rev
27587)
@@ -89,17 +89,6 @@
<dependencies>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>di-util-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
<artifactId>model-api</artifactId>
</dependency>
<dependency>
Modified:
core3/impl/trunk/viewmodel-impl/impl/src/main/java/org/cytoscape/view/model/internal/CyNetworkViewManagerImpl.java
===================================================================
---
core3/impl/trunk/viewmodel-impl/impl/src/main/java/org/cytoscape/view/model/internal/CyNetworkViewManagerImpl.java
2011-11-23 23:43:31 UTC (rev 27586)
+++
core3/impl/trunk/viewmodel-impl/impl/src/main/java/org/cytoscape/view/model/internal/CyNetworkViewManagerImpl.java
2011-11-23 23:48:17 UTC (rev 27587)
@@ -35,7 +35,6 @@
import java.util.Map;
import java.util.Set;
-import org.cytoscape.di.util.DIUtil;
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.events.NetworkAboutToBeDestroyedEvent;
@@ -64,7 +63,7 @@
*/
public CyNetworkViewManagerImpl(final CyEventHelper cyEventHelper) {
networkViewMap = new HashMap<Long, CyNetworkView>();
- this.cyEventHelper = DIUtil.stripProxy(cyEventHelper);
+ this.cyEventHelper = cyEventHelper;
}
@Override
Modified: core3/impl/trunk/viewmodel-impl/pom.xml
===================================================================
--- core3/impl/trunk/viewmodel-impl/pom.xml 2011-11-23 23:43:31 UTC (rev
27586)
+++ core3/impl/trunk/viewmodel-impl/pom.xml 2011-11-23 23:48:17 UTC (rev
27587)
@@ -65,11 +65,6 @@
additional dependencies necessary for the integration tests
(it) should be
kept in the it/pom.xml -->
<dependencies>
- <dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>di-util-api</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>viewmodel-api</artifactId>
Modified: core3/impl/trunk/vizmap-impl/pom.xml
===================================================================
--- core3/impl/trunk/vizmap-impl/pom.xml 2011-11-23 23:43:31 UTC (rev
27586)
+++ core3/impl/trunk/vizmap-impl/pom.xml 2011-11-23 23:48:17 UTC (rev
27587)
@@ -91,17 +91,6 @@
<!-- for testing -->
<dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>di-util-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTunableMutator.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTunableMutator.java
2011-11-23 23:43:31 UTC (rev 27586)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTunableMutator.java
2011-11-23 23:48:17 UTC (rev 27587)
@@ -6,7 +6,6 @@
import org.cytoscape.work.TaskFactory;
import org.cytoscape.work.swing.DialogTaskManager;
import org.cytoscape.work.swing.SubmenuTunableHandler;
-import org.cytoscape.di.util.DIUtil;
import java.util.List;
import java.util.Map;
@@ -25,8 +24,7 @@
// no-op
}
- public JMenuItem buildConfiguration(Object o) {
- final Object objectWithTunables = DIUtil.stripProxy(o);
+ public JMenuItem buildConfiguration(Object objectWithTunables) {
TaskFactory tf;
if ( objectWithTunables instanceof TaskFactory )
tf = (TaskFactory)objectWithTunables;
Modified:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/JDialogTunableMutator.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/JDialogTunableMutator.java
2011-11-23 23:43:31 UTC (rev 27586)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/JDialogTunableMutator.java
2011-11-23 23:48:17 UTC (rev 27587)
@@ -16,7 +16,6 @@
import javax.swing.JPanel;
import javax.swing.border.TitledBorder;
-import org.cytoscape.di.util.DIUtil;
import org.cytoscape.work.AbstractTunableInterceptor;
import org.cytoscape.work.TaskFactory;
import org.cytoscape.work.TunableValidator;
@@ -76,8 +75,7 @@
}
/** {@inheritDoc} */
- public boolean validateAndWriteBack(Object proxyObj) {
- Object objectWithTunables = DIUtil.stripProxy(proxyObj);
+ public boolean validateAndWriteBack(Object objectWithTunables) {
final JPanel panel = buildConfiguration(objectWithTunables);
if (panel == null)
return true;
Modified:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/JPanelTunableMutator.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/JPanelTunableMutator.java
2011-11-23 23:43:31 UTC (rev 27586)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/JPanelTunableMutator.java
2011-11-23 23:48:17 UTC (rev 27587)
@@ -16,7 +16,6 @@
import javax.swing.JPanel;
import javax.swing.border.TitledBorder;
-import org.cytoscape.di.util.DIUtil;
import org.cytoscape.work.AbstractTunableInterceptor;
import org.cytoscape.work.TaskFactory;
import org.cytoscape.work.TunableMutator;
@@ -79,12 +78,11 @@
/** {@inheritDoc} */
public boolean hasTunables(final Object o) {
- return super.hasTunables(DIUtil.stripProxy(o));
+ return super.hasTunables(o);
}
/** {@inheritDoc} */
- public boolean validateAndWriteBack(Object proxyObj) {
- final Object objectWithTunables = DIUtil.stripProxy(proxyObj);
+ public boolean validateAndWriteBack(Object objectWithTunables) {
List<GUITunableHandler> handlers =
findHandlers(objectWithTunables);
@@ -95,8 +93,7 @@
}
/** {@inheritDoc} */
- public JPanel buildConfiguration(final Object proxyObj) {
- final Object objectWithTunables = DIUtil.stripProxy(proxyObj);
+ public JPanel buildConfiguration(final Object objectWithTunables) {
int factoryCount = 0; // # of descendents of TaskFactory...
int otherCount = 0; // ...everything else. (Presumeably
descendents of Task.)
Modified: core3/impl/trunk/work-swing-impl/pom.xml
===================================================================
--- core3/impl/trunk/work-swing-impl/pom.xml 2011-11-23 23:43:31 UTC (rev
27586)
+++ core3/impl/trunk/work-swing-impl/pom.xml 2011-11-23 23:48:17 UTC (rev
27587)
@@ -68,17 +68,6 @@
<dependencies>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>di-util-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
<artifactId>swing-util-api</artifactId>
<scope>provided</scope>
</dependency>
--
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.
