Author: kono
Date: 2012-03-23 17:08:03 -0700 (Fri, 23 Mar 2012)
New Revision: 28641
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/task/CopyVisualStyleTask.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CopyVisualStyleTaskFactory.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
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CreateNewVisualStyleTask.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CreateNewVisualStyleTaskFactory.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/DeleteVisualStyleTask.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/RenameVisualStyleTask.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/RenameVisualStyleTaskFactory.java
Log:
fixes #808 GUI related method calls had been removed form tasks.
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-03-23 22:59:24 UTC (rev 28640)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
2012-03-24 00:08:03 UTC (rev 28641)
@@ -58,6 +58,7 @@
import org.cytoscape.work.TaskFactory;
import org.cytoscape.work.swing.DialogTaskManager;
import org.osgi.framework.BundleContext;
+import org.cytoscape.application.swing.CySwingApplication;
import com.l2fprod.common.propertysheet.PropertySheetPanel;
@@ -71,6 +72,7 @@
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);
@@ -114,7 +116,7 @@
VizMapperUtil vizMapperUtil = new VizMapperUtil(vmmServiceRef);
VisualPropertyDependencyManagerImpl vpDependencyManager = new
VisualPropertyDependencyManagerImpl();
DefaultViewEditorImpl defViewEditor = new
DefaultViewEditorImpl(defaultViewPanel,editorManager,cyApplicationManagerServiceRef,vmmServiceRef,selectedVisualStyleManager,vizMapperUtil,vpDependencyManager,cyEventHelperServiceRef);
- CreateNewVisualStyleTaskFactory createNewVisualStyleTaskFactory
= new CreateNewVisualStyleTaskFactory(vizMapperUtil,
visualStyleFactoryServiceRef,vmmServiceRef);
+ CreateNewVisualStyleTaskFactory createNewVisualStyleTaskFactory
= new
CreateNewVisualStyleTaskFactory(visualStyleFactoryServiceRef,vmmServiceRef);
DeleteVisualStyleTaskFactory removeVisualStyleTaskFactory = new
DeleteVisualStyleTaskFactory(vmmServiceRef,selectedVisualStyleManager);
ImportDefaultVizmapTaskFactory importDefaultVizmapTaskFactory =
new
ImportDefaultVizmapTaskFactory(vizmapReaderManagerServiceRef,vmmServiceRef,cyApplicationConfigurationServiceRef,
cyEventHelperServiceRef);
VizMapPropertySheetBuilder vizMapPropertySheetBuilder = new
VizMapPropertySheetBuilder(menuManager,cyNetworkManagerServiceRef,propertySheetPanel,editorManager,defaultViewPanel,cyTableManagerServiceRef,vizMapperUtil,vmmServiceRef);
@@ -122,9 +124,9 @@
SetViewModeAction viewModeAction = new SetViewModeAction();
VizMapperMainPanel vizMapperMainPanel = new
VizMapperMainPanel(visualStyleFactoryServiceRef,defViewEditor,iconManager,colorMgr,vmmServiceRef,menuManager,editorManager,propertySheetPanel,vizMapPropertySheetBuilder,editorWindowManager,cyApplicationManagerServiceRef,cyEventHelperServiceRef,selectedVisualStyleManager,importDefaultVizmapTaskFactory,dialogTaskManagerServiceRef,viewModeAction
);
- RenameVisualStyleTaskFactory renameVisualStyleTaskFactory = new
RenameVisualStyleTaskFactory(vmmServiceRef,selectedVisualStyleManager,vizMapperUtil,vizMapperMainPanel);
- CopyVisualStyleTaskFactory copyVisualStyleTaskFactory = new
CopyVisualStyleTaskFactory(vmmServiceRef,visualStyleFactoryServiceRef,selectedVisualStyleManager,vizMapperUtil,vizMapperMainPanel);
- CreateLegendTaskFactory createLegendTaskFactory = new
CreateLegendTaskFactory(selectedVisualStyleManager,cyApplicationManagerServiceRef,
vmmServiceRef, vizMapperMainPanel);
+ RenameVisualStyleTaskFactory renameVisualStyleTaskFactory = new
RenameVisualStyleTaskFactory(selectedVisualStyleManager);
+ CopyVisualStyleTaskFactory copyVisualStyleTaskFactory = new
CopyVisualStyleTaskFactory(vmmServiceRef,visualStyleFactoryServiceRef,selectedVisualStyleManager);
+ CreateLegendTaskFactory createLegendTaskFactory = new
CreateLegendTaskFactory(cySwingApplicationServiceRef,
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/CopyVisualStyleTask.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CopyVisualStyleTask.java
2012-03-23 22:59:24 UTC (rev 28640)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CopyVisualStyleTask.java
2012-03-24 00:08:03 UTC (rev 28641)
@@ -1,48 +1,47 @@
package org.cytoscape.view.vizmap.gui.internal.task;
-import java.awt.Component;
-
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.view.vizmap.VisualStyleFactory;
import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
-import org.cytoscape.view.vizmap.gui.internal.util.VizMapperUtil;
import org.cytoscape.work.AbstractTask;
+import org.cytoscape.work.ProvidesTitle;
import org.cytoscape.work.TaskMonitor;
+import org.cytoscape.work.Tunable;
public class CopyVisualStyleTask extends AbstractTask {
+ @ProvidesTitle
+ public String getTitle() {
+ return "Copy Visual Style";
+ }
+
+ @Tunable(description = "Name of copied Visual Style:")
+ public String vsName;
+
private final SelectedVisualStyleManager manager;
- private final VizMapperUtil util;
- private final Component parent;
private final VisualMappingManager vmm;
private final VisualStyleFactory factory;
- public CopyVisualStyleTask(final VisualMappingManager vmm,
- final VisualStyleFactory factory,
- final SelectedVisualStyleManager manager, final
VizMapperUtil util,
- final Component parent) {
+ public CopyVisualStyleTask(final VisualMappingManager vmm, final
VisualStyleFactory factory,
+ final SelectedVisualStyleManager manager) {
this.manager = manager;
- this.util = util;
- this.parent = parent;
this.factory = factory;
this.vmm = vmm;
}
@Override
public void run(TaskMonitor monitor) throws Exception {
-
final VisualStyle originalStyle =
manager.getCurrentVisualStyle();
- final String name = util.getStyleName(parent, originalStyle);
// Ignore if user does not enter new name.
- if (name == null)
+ if (vsName == null)
return;
final VisualStyle copiedStyle =
factory.createVisualStyle(originalStyle);
+ copiedStyle.setTitle(vsName);
vmm.addVisualStyle(copiedStyle);
}
-
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CopyVisualStyleTaskFactory.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CopyVisualStyleTaskFactory.java
2012-03-23 22:59:24 UTC (rev 28640)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CopyVisualStyleTaskFactory.java
2012-03-24 00:08:03 UTC (rev 28641)
@@ -1,38 +1,27 @@
package org.cytoscape.view.vizmap.gui.internal.task;
-import java.awt.Component;
-
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyleFactory;
import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
-import org.cytoscape.view.vizmap.gui.internal.util.VizMapperUtil;
import org.cytoscape.work.AbstractTaskFactory;
import org.cytoscape.work.TaskIterator;
public class CopyVisualStyleTaskFactory extends AbstractTaskFactory {
private final SelectedVisualStyleManager manager;
- private final VizMapperUtil util;
- private final Component parent;
private final VisualMappingManager vmm;
-
private final VisualStyleFactory factory;
- public CopyVisualStyleTaskFactory(final VisualMappingManager vmm,
- final VisualStyleFactory factory,
- final SelectedVisualStyleManager manager, final
VizMapperUtil util,
- final Component parent) {
+ public CopyVisualStyleTaskFactory(final VisualMappingManager vmm, final
VisualStyleFactory factory,
+ final SelectedVisualStyleManager manager) {
this.manager = manager;
this.vmm = vmm;
- this.util = util;
this.factory = factory;
- this.parent = parent;
}
@Override
public TaskIterator createTaskIterator() {
- return new TaskIterator(new CopyVisualStyleTask(vmm, factory,
manager,
- util, parent));
+ return new TaskIterator(new CopyVisualStyleTask(vmm, factory,
manager));
}
}
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-03-23 22:59:24 UTC (rev 28640)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CreateLegendTask.java
2012-03-24 00:08:03 UTC (rev 28641)
@@ -1,8 +1,9 @@
package org.cytoscape.view.vizmap.gui.internal.task;
-import java.awt.Component;
+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;
@@ -15,22 +16,26 @@
private final SelectedVisualStyleManager manager;
private final CyApplicationManager appManager;
private final VisualMappingManager vmm;
+ private final CySwingApplication desktop;
- private final Component parent;
-
- public CreateLegendTask(final SelectedVisualStyleManager manager, final
CyApplicationManager appManager,
- final VisualMappingManager vmm, final Component parent)
{
+ public CreateLegendTask(final CySwingApplication desktop, final
SelectedVisualStyleManager manager, final CyApplicationManager appManager,
+ final VisualMappingManager vmm) {
this.manager = manager;
- this.parent = parent;
this.appManager = appManager;
this.vmm = vmm;
+ this.desktop = desktop;
}
@Override
public void run(TaskMonitor monitor) throws Exception {
- final VisualStyle selectedStyle =
manager.getCurrentVisualStyle();
- final LegendDialog ld = new LegendDialog(selectedStyle,
appManager, vmm);
- ld.showDialog(parent);
+ // Should be executed in EDT!
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ final VisualStyle selectedStyle =
manager.getCurrentVisualStyle();
+ final LegendDialog ld = new
LegendDialog(selectedStyle, appManager, vmm);
+ ld.showDialog(desktop.getJFrame());
+ }
+ });
}
-
}
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-03-23 22:59:24 UTC (rev 28640)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CreateLegendTaskFactory.java
2012-03-24 00:08:03 UTC (rev 28641)
@@ -1,8 +1,7 @@
package org.cytoscape.view.vizmap.gui.internal.task;
-import java.awt.Component;
-
import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.application.swing.CySwingApplication;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
import org.cytoscape.work.AbstractTaskFactory;
@@ -13,21 +12,20 @@
private final SelectedVisualStyleManager manager;
private final CyApplicationManager appManager;
private final VisualMappingManager vmm;
-
- private final Component parent;
- public CreateLegendTaskFactory(final SelectedVisualStyleManager
manager, final CyApplicationManager appManager,
- final VisualMappingManager vmm, final Component parent)
{
+ private final CySwingApplication desktop;
+
+ public CreateLegendTaskFactory(final CySwingApplication desktop, final
SelectedVisualStyleManager manager,
+ final CyApplicationManager appManager, final
VisualMappingManager vmm) {
this.manager = manager;
- this.parent = parent;
-
this.appManager = appManager;
this.vmm = vmm;
+ this.desktop = desktop;
}
@Override
public TaskIterator createTaskIterator() {
- return new TaskIterator(new CreateLegendTask(manager,
appManager, vmm, parent));
+ return new TaskIterator(new CreateLegendTask(desktop, manager,
appManager, vmm));
}
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CreateNewVisualStyleTask.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CreateNewVisualStyleTask.java
2012-03-23 22:59:24 UTC (rev 28640)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CreateNewVisualStyleTask.java
2012-03-24 00:08:03 UTC (rev 28641)
@@ -3,9 +3,10 @@
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.view.vizmap.VisualStyleFactory;
-import org.cytoscape.view.vizmap.gui.internal.util.VizMapperUtil;
import org.cytoscape.work.AbstractTask;
+import org.cytoscape.work.ProvidesTitle;
import org.cytoscape.work.TaskMonitor;
+import org.cytoscape.work.Tunable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -13,28 +14,30 @@
private static final Logger logger =
LoggerFactory.getLogger(CreateNewVisualStyleTask.class);
+ @ProvidesTitle
+ public String getTitle() {
+ return "Create New Visual Style";
+ }
+
+ @Tunable(description = "Name of new Visual Style:")
+ public String vsName;
+
private final VisualStyleFactory vsFactory;
- private final VizMapperUtil vizMapperUtil;
-
private final VisualMappingManager vmm;
- public CreateNewVisualStyleTask(final VizMapperUtil vizMapperUtil,
- final VisualStyleFactory vsFactory, final
VisualMappingManager vmm) {
+ public CreateNewVisualStyleTask(final VisualStyleFactory vsFactory,
final VisualMappingManager vmm) {
super();
- this.vizMapperUtil = vizMapperUtil;
this.vsFactory = vsFactory;
this.vmm = vmm;
}
public void run(TaskMonitor tm) {
- final String title = vizMapperUtil.getStyleName(null, null);
-
- if (title == null)
+ if (vsName == null)
return;
// Create new style. This method call automatically fire event.
- final VisualStyle newStyle = vsFactory.createVisualStyle(title);
+ final VisualStyle newStyle =
vsFactory.createVisualStyle(vsName);
vmm.addVisualStyle(newStyle);
logger.info("CreateNewVisualStyleTask created new Visual Style:
" + newStyle.getTitle());
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CreateNewVisualStyleTaskFactory.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CreateNewVisualStyleTaskFactory.java
2012-03-23 22:59:24 UTC (rev 28640)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CreateNewVisualStyleTaskFactory.java
2012-03-24 00:08:03 UTC (rev 28641)
@@ -2,26 +2,21 @@
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyleFactory;
-import org.cytoscape.view.vizmap.gui.internal.util.VizMapperUtil;
import org.cytoscape.work.AbstractTaskFactory;
import org.cytoscape.work.TaskIterator;
-public class CreateNewVisualStyleTaskFactory extends AbstractTaskFactory {
-
- private final VizMapperUtil vizMapperUtil;
+public final class CreateNewVisualStyleTaskFactory extends AbstractTaskFactory
{
+
private final VisualStyleFactory vsFactory;
private final VisualMappingManager vmm;
-
- public CreateNewVisualStyleTaskFactory(final VizMapperUtil
vizMapperUtil,
- final VisualStyleFactory vsFactory, final VisualMappingManager vmm) {
- this.vizMapperUtil = vizMapperUtil;
+
+ public CreateNewVisualStyleTaskFactory(final VisualStyleFactory
vsFactory, final VisualMappingManager vmm) {
this.vsFactory = vsFactory;
this.vmm = vmm;
}
@Override
public TaskIterator createTaskIterator() {
- return new TaskIterator(new
CreateNewVisualStyleTask(vizMapperUtil, vsFactory, vmm));
+ return new TaskIterator(new CreateNewVisualStyleTask(vsFactory,
vmm));
}
-
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/DeleteVisualStyleTask.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/DeleteVisualStyleTask.java
2012-03-23 22:59:24 UTC (rev 28640)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/DeleteVisualStyleTask.java
2012-03-24 00:08:03 UTC (rev 28641)
@@ -1,7 +1,5 @@
package org.cytoscape.view.vizmap.gui.internal.task;
-import javax.swing.JOptionPane;
-
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
@@ -27,21 +25,9 @@
final VisualStyle currentStyle =
manager.getCurrentVisualStyle();
- if (currentStyle.equals(manager.getDefaultStyle())) {
- JOptionPane.showMessageDialog(null,
- "You cannot delete default style.",
- "Cannot remove defalut style!",
JOptionPane.ERROR_MESSAGE);
- return;
- }
+ if (currentStyle.equals(manager.getDefaultStyle()))
+ throw new IllegalArgumentException("You cannot delete
the default style.");
- // make sure the user really wants to do this
- final String styleName = currentStyle.getTitle();
- final String checkString = "Are you sure you want to
permanently delete"
- + " the visual style '" + styleName + "'?";
- int ich = JOptionPane.showConfirmDialog(null, checkString,
- "Confirm Delete Style",
JOptionPane.YES_NO_OPTION);
-
- if (ich == JOptionPane.YES_OPTION)
- vmm.removeVisualStyle(currentStyle);
+ vmm.removeVisualStyle(currentStyle);
}
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/RenameVisualStyleTask.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/RenameVisualStyleTask.java
2012-03-23 22:59:24 UTC (rev 28640)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/RenameVisualStyleTask.java
2012-03-24 00:08:03 UTC (rev 28641)
@@ -1,53 +1,41 @@
package org.cytoscape.view.vizmap.gui.internal.task;
-import java.awt.Component;
-
-import javax.swing.JOptionPane;
-
-import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
-import org.cytoscape.view.vizmap.gui.internal.util.VizMapperUtil;
import org.cytoscape.work.AbstractTask;
+import org.cytoscape.work.ProvidesTitle;
import org.cytoscape.work.TaskMonitor;
+import org.cytoscape.work.Tunable;
public class RenameVisualStyleTask extends AbstractTask {
+ @ProvidesTitle
+ public String getTitle() {
+ return "Rename Visual Style";
+ }
+
+ @Tunable(description = "Enter new Visual Style name:")
+ public String vsName;
+
private final SelectedVisualStyleManager manager;
- private final VizMapperUtil util;
- private final Component parent;
- public RenameVisualStyleTask(final SelectedVisualStyleManager manager,
- final VisualMappingManager vmm, final VizMapperUtil
util, final Component parent) {
-
+ public RenameVisualStyleTask(final SelectedVisualStyleManager manager) {
this.manager = manager;
- this.util = util;
- this.parent = parent;
-
}
@Override
public void run(TaskMonitor monitor) throws Exception {
-
+
final VisualStyle currentStyle =
manager.getCurrentVisualStyle();
- if (currentStyle.equals(manager.getDefaultStyle())) {
- JOptionPane.showMessageDialog(null,
- "You cannot rename the default style.",
- "Cannot rename defalut style!",
JOptionPane.ERROR_MESSAGE);
- return;
- }
-
- final String name = util.getStyleName(parent,
- currentStyle);
+ if (currentStyle.equals(manager.getDefaultStyle()))
+ throw new IllegalArgumentException("You cannot rename
the default style.");
// Ignore if user does not enter new name.
- if (name == null)
+ if (vsName == null)
return;
-
- currentStyle.setTitle(name);
-
- //TODO: fire event here.
+
+ currentStyle.setTitle(vsName);
}
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/RenameVisualStyleTaskFactory.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/RenameVisualStyleTaskFactory.java
2012-03-23 22:59:24 UTC (rev 28640)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/RenameVisualStyleTaskFactory.java
2012-03-24 00:08:03 UTC (rev 28641)
@@ -1,33 +1,19 @@
package org.cytoscape.view.vizmap.gui.internal.task;
-import java.awt.Component;
-
-import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
-import org.cytoscape.view.vizmap.gui.internal.util.VizMapperUtil;
import org.cytoscape.work.AbstractTaskFactory;
import org.cytoscape.work.TaskIterator;
public class RenameVisualStyleTaskFactory extends AbstractTaskFactory {
- private final VisualMappingManager vmm;
private final SelectedVisualStyleManager manager;
- private final VizMapperUtil util;
- private final Component parent;
- public RenameVisualStyleTaskFactory(final VisualMappingManager vmm,
- final SelectedVisualStyleManager manager, final
VizMapperUtil util,
- final Component parent) {
+ public RenameVisualStyleTaskFactory(final SelectedVisualStyleManager
manager) {
this.manager = manager;
- this.vmm = vmm;
- this.util = util;
- this.parent = parent;
}
@Override
public TaskIterator createTaskIterator() {
- return new TaskIterator(new RenameVisualStyleTask(manager, vmm,
util,
- parent));
+ return new TaskIterator(new RenameVisualStyleTask(manager));
}
-
}
--
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.
