Author: kono
Date: 2012-05-18 16:57:24 -0700 (Fri, 18 May 2012)
New Revision: 29299
Modified:
core3/impl/trunk/vizmap-gui-impl/pom.xml
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CreateLegendTask.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CreateLegendTaskFactory.java
Log:
Unnecessary dependency had been removed.
Modified: core3/impl/trunk/vizmap-gui-impl/pom.xml
===================================================================
--- core3/impl/trunk/vizmap-gui-impl/pom.xml 2012-05-18 22:41:55 UTC (rev
29298)
+++ core3/impl/trunk/vizmap-gui-impl/pom.xml 2012-05-18 23:57:24 UTC (rev
29299)
@@ -119,6 +119,7 @@
<groupId>cytoscape-temp</groupId>
<artifactId>org.swinglabs.swingx</artifactId>
<version>1.6.1</version>
+ <scope>provided</scope>
</dependency>
<!-- freehep fopr exporting Visual Legend -->
@@ -126,26 +127,31 @@
<groupId>cytoscape-temp</groupId>
<artifactId>freehep-graphicsio</artifactId>
<version>2.1.3</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>cytoscape-temp</groupId>
<artifactId>freehep-graphicsio-svg</artifactId>
<version>2.1.3</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>cytoscape-temp</groupId>
<artifactId>freehep-graphics2d</artifactId>
<version>2.1.3</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>cytoscape-temp</groupId>
<artifactId>freehep-graphicsio-ps</artifactId>
<version>2.1.3</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>cytoscape-temp</groupId>
<artifactId>freehep-export</artifactId>
<version>2.1.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>cytoscape-temp</groupId>
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
2012-05-18 22:41:55 UTC (rev 29298)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
2012-05-18 23:57:24 UTC (rev 29299)
@@ -10,7 +10,6 @@
import org.cytoscape.application.CyApplicationConfiguration;
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.application.swing.CyAction;
-import org.cytoscape.application.swing.CySwingApplication;
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.io.read.VizmapReaderManager;
import org.cytoscape.model.CyNetworkFactory;
@@ -77,7 +76,6 @@
public void start(BundleContext bc) {
- CySwingApplication cySwingApplicationServiceRef =
getService(bc,CySwingApplication.class);
CyApplicationConfiguration cyApplicationConfigurationServiceRef
= getService(bc,CyApplicationConfiguration.class);
DialogTaskManager dialogTaskManagerServiceRef =
getService(bc,DialogTaskManager.class);
VisualStyleFactory visualStyleFactoryServiceRef =
getService(bc,VisualStyleFactory.class);
@@ -134,7 +132,7 @@
VizMapperMainPanel vizMapperMainPanel = new
VizMapperMainPanel(visualStyleFactoryServiceRef,defViewEditor,iconManager,colorMgr,vmmServiceRef,menuManager,editorManager,propertySheetPanel,vizMapPropertySheetBuilder,editorWindowManager,cyApplicationManagerServiceRef,cyEventHelperServiceRef,selectedVisualStyleManager,importDefaultVizmapTaskFactory,dialogTaskManagerServiceRef,viewModeAction
);
RenameVisualStyleTaskFactory renameVisualStyleTaskFactory = new
RenameVisualStyleTaskFactory(selectedVisualStyleManager);
CopyVisualStyleTaskFactory copyVisualStyleTaskFactory = new
CopyVisualStyleTaskFactory(vmmServiceRef,visualStyleFactoryServiceRef,selectedVisualStyleManager);
- CreateLegendTaskFactory createLegendTaskFactory = new
CreateLegendTaskFactory(cySwingApplicationServiceRef,
selectedVisualStyleManager,cyApplicationManagerServiceRef, vmmServiceRef);
+ CreateLegendTaskFactory createLegendTaskFactory = new
CreateLegendTaskFactory(selectedVisualStyleManager,cyApplicationManagerServiceRef,
vmmServiceRef);
DeleteMappingFunctionTaskFactory
deleteMappingFunctionTaskFactory = new
DeleteMappingFunctionTaskFactory(propertySheetPanel,selectedVisualStyleManager,cyApplicationManagerServiceRef);
RainbowColorMappingGenerator rainbowGenerator = new
RainbowColorMappingGenerator(Color.class);
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CreateLegendTask.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CreateLegendTask.java
2012-05-18 22:41:55 UTC (rev 29298)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CreateLegendTask.java
2012-05-18 23:57:24 UTC (rev 29299)
@@ -3,7 +3,6 @@
import javax.swing.SwingUtilities;
import org.cytoscape.application.CyApplicationManager;
-import org.cytoscape.application.swing.CySwingApplication;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
@@ -16,14 +15,12 @@
private final SelectedVisualStyleManager manager;
private final CyApplicationManager appManager;
private final VisualMappingManager vmm;
- private final CySwingApplication desktop;
- public CreateLegendTask(final CySwingApplication desktop, final
SelectedVisualStyleManager manager, final CyApplicationManager appManager,
+ public CreateLegendTask(final SelectedVisualStyleManager manager, final
CyApplicationManager appManager,
final VisualMappingManager vmm) {
this.manager = manager;
this.appManager = appManager;
this.vmm = vmm;
- this.desktop = desktop;
}
@Override
@@ -34,7 +31,7 @@
public void run() {
final VisualStyle selectedStyle =
manager.getCurrentVisualStyle();
final LegendDialog ld = new
LegendDialog(selectedStyle, appManager, vmm);
- ld.showDialog(desktop.getJFrame());
+ ld.showDialog(null);
}
});
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CreateLegendTaskFactory.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CreateLegendTaskFactory.java
2012-05-18 22:41:55 UTC (rev 29298)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CreateLegendTaskFactory.java
2012-05-18 23:57:24 UTC (rev 29299)
@@ -13,19 +13,16 @@
private final CyApplicationManager appManager;
private final VisualMappingManager vmm;
- private final CySwingApplication desktop;
-
- public CreateLegendTaskFactory(final CySwingApplication desktop, final
SelectedVisualStyleManager manager,
+ public CreateLegendTaskFactory(final SelectedVisualStyleManager manager,
final CyApplicationManager appManager, final
VisualMappingManager vmm) {
this.manager = manager;
this.appManager = appManager;
this.vmm = vmm;
- this.desktop = desktop;
}
@Override
public TaskIterator createTaskIterator() {
- return new TaskIterator(new CreateLegendTask(desktop, manager,
appManager, vmm));
+ return new TaskIterator(new CreateLegendTask(manager,
appManager, vmm));
}
}
--
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.
