Author: kono
Date: 2010-10-28 14:09:41 -0700 (Thu, 28 Oct 2010)
New Revision: 22586
Added:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/DeleteVisualStyleTask.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/DeleteVisualStyleTaskFactory.java
Removed:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/RemoveVisualStyleTask.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/RemoveVisualStyleTaskFactory.java
Modified:
core3/vizmap-gui-api/trunk/src/main/java/org/cytoscape/view/vizmap/gui/editor/ValueEditor.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/VizMapBypass.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/CyColorPropertyEditor.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/AbstractValueEditor.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/CyColorChooser.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/NumericValueEditor.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/StringValueEditor.java
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
Log:
Value editor code is refactored to accept interfaces, instead of concrete class
(for example, Paint instead of Color).
Modified:
core3/vizmap-gui-api/trunk/src/main/java/org/cytoscape/view/vizmap/gui/editor/ValueEditor.java
===================================================================
---
core3/vizmap-gui-api/trunk/src/main/java/org/cytoscape/view/vizmap/gui/editor/ValueEditor.java
2010-10-28 20:47:25 UTC (rev 22585)
+++
core3/vizmap-gui-api/trunk/src/main/java/org/cytoscape/view/vizmap/gui/editor/ValueEditor.java
2010-10-28 21:09:41 UTC (rev 22586)
@@ -2,16 +2,21 @@
import java.awt.Component;
+/**
+ * Provides a GUI Editor for a data type.
+ *
+ * @param <V> target data type for this editor.
+ *
+ */
public interface ValueEditor<V> {
-
/**
* Display the editor and get a new value.
*
* @return
*/
- public V showEditor(Component parent, V initialValue);
+ public <S extends V> V showEditor(Component parent, S initialValue);
- public Class<? extends V> getType();
+ public Class<V> getType();
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
2010-10-28 20:47:25 UTC (rev 22585)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
2010-10-28 21:09:41 UTC (rev 22586)
@@ -464,9 +464,12 @@
if (SwingUtilities.isLeftMouseButton(e) && e.getClickCount() ==
2) {
+ final V defaultVal = selectedStyle.getDefaultValue(vp);
try {
- newValue =
editorFactory.showVisualPropertyValueEditor(this, vp, null);
-
+ if(defaultVal != null)
+ newValue =
editorFactory.showVisualPropertyValueEditor(this, vp, defaultVal);
+ else
+ newValue =
editorFactory.showVisualPropertyValueEditor(this, vp, vp.getDefault());
} catch (Exception e1) {
e1.printStackTrace();
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2010-10-28 20:47:25 UTC (rev 22585)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2010-10-28 21:09:41 UTC (rev 22586)
@@ -65,6 +65,8 @@
import org.cytoscape.view.vizmap.VisualStyleFactory;
import org.cytoscape.view.vizmap.events.VisualStyleCreatedEvent;
import org.cytoscape.view.vizmap.events.VisualStyleCreatedListener;
+import org.cytoscape.view.vizmap.events.VisualStyleRemovedEvent;
+import org.cytoscape.view.vizmap.events.VisualStyleRemovedListener;
import org.cytoscape.view.vizmap.gui.DefaultViewEditor;
import org.cytoscape.view.vizmap.gui.DefaultViewPanel;
import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
@@ -100,11 +102,10 @@
*
* @version 0.8
* @since Cytoscape 2.5
- * @author Keiichiro Ono
* @param <syncronized>
*/
public class VizMapperMainPanel extends AbstractVizMapperPanel implements
- VisualStyleCreatedListener, PopupMenuListener,
NetworkViewAddedListener, NetworkAddedListener {
+ VisualStyleCreatedListener, VisualStyleRemovedListener,
PopupMenuListener, NetworkViewAddedListener, NetworkAddedListener {
private final static long serialVersionUID = 1202339867854959L;
@@ -720,4 +721,24 @@
logger.debug("!!!!!!!!!! Network added. Need to update prop
sheet: " + e.getNetwork().getSUID());
vizMapPropertySheetBuilder.setPropertyTable(this.lastVS);
}
+
+
+ /**
+ * Update panel when removed
+ */
+ @Override
+ public void handleEvent(VisualStyleRemovedEvent e) {
+
+ // Update image
+ getDefaultImageManager().remove(e.getRemovedVisualStyle());
+
vizMapPropertySheetBuilder.getPropertyMap().remove(e.getRemovedVisualStyle());
+ // Switch to the default style
+ final VisualStyle defaultStyle = manager.getDefaultStyle();
+
+ switchVS(defaultStyle);
+ // Apply to the current view
+ final CyNetworkView view =
applicationManager.getCurrentNetworkView();
+ if (view != null)
+ vmm.setVisualStyle(defaultStyle, view);
+ }
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/VizMapBypass.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/VizMapBypass.java
2010-10-28 20:47:25 UTC (rev 22585)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/VizMapBypass.java
2010-10-28 21:09:41 UTC (rev 22586)
@@ -108,15 +108,17 @@
menu.add(jmi);
}
- protected void addMenuItem(final JMenu menu, final VisualProperty<?>
type) {
- final JMenuItem jmi = new JCheckBoxMenuItem(new
AbstractAction(type.getDisplayName()) {
+
+ //TODO: is this OK???
+ protected <T extends Object> void addMenuItem(final JMenu menu, final
VisualProperty<T> vp) {
+ final JMenuItem jmi = new JCheckBoxMenuItem(new
AbstractAction(vp.getDisplayName()) {
private final static long serialVersionUID =
1202339876717506L;
public void actionPerformed(ActionEvent e) {
Object obj = null;
try {
- obj =
editorFactory.showVisualPropertyValueEditor(menu, type, null);
+ obj =
editorFactory.showVisualPropertyValueEditor(menu, vp, vp.getDefault());
} catch (Exception ex) {
ex.printStackTrace();
obj = null;
@@ -140,13 +142,13 @@
menu.add(jmi);
- String attrString =
graphObj.getCyRow().get(type.getDisplayName(), String.class);
+ String attrString =
graphObj.getCyRow().get(vp.getDisplayName(), String.class);
if ((attrString == null) || (attrString.length() == 0))
jmi.setSelected(false);
else {
jmi.setSelected(true);
- addResetMenuItem(menu, type);
+ addResetMenuItem(menu, vp);
}
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
2010-10-28 20:47:25 UTC (rev 22585)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
2010-10-28 21:09:41 UTC (rev 22586)
@@ -148,17 +148,15 @@
* .awt.Component, org.cytoscape.viewmodel.VisualProperty)
*/
@SuppressWarnings("unchecked")
- public <V> V showVisualPropertyValueEditor(Component parentComponent,
- VisualProperty<V> type, V initial) throws Exception {
+ public <V> V showVisualPropertyValueEditor(Component parentComponent,
VisualProperty<V> type, V initialValue) throws Exception {
- ValueEditor<V> editor = (ValueEditor<V>) valueEditors.get(type
- .getType());
+ final ValueEditor<V> editor = (ValueEditor<V>)
valueEditors.get(type.getType());
if (editor == null)
throw new IllegalStateException("No value editor for "
- + type.getDisplayName() + "is
available.");
+ + type.getDisplayName() + " is
available.");
- return editor.showEditor(null, initial);
+ return editor.showEditor(null, initialValue);
}
/*
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/CyColorPropertyEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/CyColorPropertyEditor.java
2010-10-28 20:47:25 UTC (rev 22585)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/CyColorPropertyEditor.java
2010-10-28 21:09:41 UTC (rev 22586)
@@ -35,6 +35,7 @@
package org.cytoscape.view.vizmap.gui.internal.editor.propertyeditor;
import java.awt.Color;
+import java.awt.Paint;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -67,6 +68,7 @@
* Creates a new CyColorPropertyEditor object.
*/
public CyColorPropertyEditor() {
+ color = Color.white;
chooser = new CyColorChooser();
editor = new JPanel(new PercentLayout(PercentLayout.HORIZONTAL,
0));
((JPanel) editor).add("*", label = new CyColorCellRenderer());
@@ -109,11 +111,14 @@
protected void selectColor() {
ResourceManager rm =
ResourceManager.all(FilePropertyEditor.class);
String title = rm.getString("ColorPropertyEditor.title");
- Color selectedColor = chooser.showEditor(editor, color);
+ Paint selectedColor = chooser.showEditor(editor, color);
+
+ if(selectedColor instanceof Color == false)
+ return;
if (selectedColor != null) {
Color oldColor = color;
- Color newColor = selectedColor;
+ Color newColor = (Color) selectedColor;
label.setValue(newColor);
color = newColor;
firePropertyChange(oldColor, newColor);
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/AbstractValueEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/AbstractValueEditor.java
2010-10-28 20:47:25 UTC (rev 22585)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/AbstractValueEditor.java
2010-10-28 21:09:41 UTC (rev 22586)
@@ -9,22 +9,23 @@
public abstract class AbstractValueEditor<V> implements ValueEditor<V> {
- protected Class<? extends V> type;
+ protected Class<V> type;
protected final JOptionPane pane;
protected JDialog editorDialog;
- public AbstractValueEditor(Class<? extends V> type) {
+ public AbstractValueEditor(Class<V> type) {
this.type = type;
+
pane = new JOptionPane();
pane.setMessageType(JOptionPane.QUESTION_MESSAGE);
pane.setOptionType(JOptionPane.OK_CANCEL_OPTION);
}
- public Class<? extends V> getType() {
+ @Override public Class<V> getType() {
return type;
}
- public abstract V showEditor(Component parent, V initialValue);
+ @Override public abstract <S extends V> V showEditor(Component parent,
S initialValue);
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/CyColorChooser.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/CyColorChooser.java
2010-10-28 20:47:25 UTC (rev 22585)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/CyColorChooser.java
2010-10-28 21:09:41 UTC (rev 22586)
@@ -38,6 +38,7 @@
import java.awt.Color;
import java.awt.Component;
+import java.awt.Paint;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -50,29 +51,15 @@
* This is an annoying re-implementation of JColorChooser.showDialog() that
* remembers recently used colors between invocations of the chooser dialog.
*/
-public class CyColorChooser implements ValueEditor<Color> {
+public class CyColorChooser implements ValueEditor<Paint> {
+
protected JColorChooser chooser = new JColorChooser();
protected ColorListener listener = new ColorListener();
- protected Color color = Color.white;
+ protected Paint color = Color.white;
- /**
- * DOCUMENT ME!
- *
- * @param component
- * DOCUMENT ME!
- * @param title
- * DOCUMENT ME!
- * @param initialColor
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public CyColorChooser() {
- }
+ @Override public Paint showEditor(Component parent, Paint initialValue)
{
- public Color showEditor(Component parent, Color initialValue) {
-
color = initialValue;
JDialog dialog = JColorChooser.createDialog(parent,
"Please pick a color", true, chooser, listener,
null);
@@ -87,8 +74,7 @@
}
}
- public Class<Color> getType() {
- // TODO Auto-generated method stub
- return Color.class;
+ public Class<Paint> getType() {
+ return Paint.class;
}
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/NumericValueEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/NumericValueEditor.java
2010-10-28 20:47:25 UTC (rev 22585)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/NumericValueEditor.java
2010-10-28 21:09:41 UTC (rev 22586)
@@ -9,20 +9,25 @@
public class NumericValueEditor extends
AbstractValueEditor<Number> {
- private static final String TITLE = "Enter New Number";
private static final String MESSAGE = "Please enter new number";
private static final String ERR_MESSAGE = "Not a valid number.";
- public NumericValueEditor(Class<? extends Number> type) {
+ public NumericValueEditor(final Class<Number> type) {
super(type);
}
- public Number showEditor(Component parent, Number initialValue) {
+
+ /**
+ * Generic editor for all kinds of numbers.
+ */
+ @Override public <S extends Number> Number showEditor(Component parent,
S initialValue) {
+ if(initialValue == null)
+ throw new NullPointerException("Initial value is
null.");
Object value = null;
Number result = null;
while(result == null) {
- value = JOptionPane.showInputDialog(parent, MESSAGE,
TITLE, JOptionPane.OK_CANCEL_OPTION);
+ value = JOptionPane.showInputDialog(parent, MESSAGE,
initialValue);
// This means cancel.
if(value == null)
@@ -32,7 +37,7 @@
BigDecimal number;
try {
number = new BigDecimal(value.toString());
- result = validate(number);
+ result = convert(number,
initialValue.getClass());
} catch (NumberFormatException ne) {
JOptionPane.showMessageDialog(editorDialog,
ERR_MESSAGE, "Invalid Input!", JOptionPane.ERROR_MESSAGE);
}
@@ -42,35 +47,28 @@
}
/**
- * Check entered number is number or not.
+ * Convert number to correct type.
*
* @param value
* @return
*/
- @SuppressWarnings("unchecked")
- private <V extends Number> V validate (BigDecimal number) {
+ private Number convert (final BigDecimal number, Class<? extends
Number> dataType) {
// Check number type.
- if(type.equals(Double.class)) {
- Double d = number.doubleValue();
- return (V) d;
- } else if(type.equals(Float.class)) {
- Float f = number.floatValue();
- return (V) f;
- } else if(type.equals(Integer.class)) {
- Integer i = number.intValue();
- return (V) i;
- } else if(type.equals(Long.class)) {
- Long l = number.longValue();
- return (V) l;
- } else if(type.equals(Short.class)) {
- Short s = number.shortValue();
- return (V) s;
- } else if(type.equals(BigInteger.class)) {
- return (V) number.toBigInteger();
+ if(dataType.equals(Double.class)) {
+ return number.doubleValue();
+ } else if(dataType.equals(Float.class)) {
+ return number.floatValue();
+ } else if(dataType.equals(Integer.class)) {
+ return number.intValue();
+ } else if(dataType.equals(Long.class)) {
+ return number.longValue();
+ } else if(dataType.equals(Short.class)) {
+ return number.shortValue();
+ } else if(dataType.equals(BigInteger.class)) {
+ return number.toBigInteger();
} else {
- Double d = number.doubleValue();
- return (V) d;
+ return number.doubleValue();
}
}
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/StringValueEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/StringValueEditor.java
2010-10-28 20:47:25 UTC (rev 22585)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/StringValueEditor.java
2010-10-28 21:09:41 UTC (rev 22586)
@@ -8,12 +8,12 @@
private static final String MESSAGE = "Please enter new text value";
- public StringValueEditor(Class<? extends String> type) {
+ public StringValueEditor(Class<String> type) {
super(type);
}
- @Override
- public String showEditor(Component parent, String initialValue) {
+
+ @Override public String showEditor(Component parent, String
initialValue) {
return JOptionPane.showInputDialog(parent, MESSAGE,
initialValue);
}
Copied:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/DeleteVisualStyleTask.java
(from rev 22416,
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/RemoveVisualStyleTask.java)
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/DeleteVisualStyleTask.java
(rev 0)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/DeleteVisualStyleTask.java
2010-10-28 21:09:41 UTC (rev 22586)
@@ -0,0 +1,53 @@
+package org.cytoscape.view.vizmap.gui.internal.task;
+
+import javax.swing.JOptionPane;
+
+import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.view.vizmap.VisualMappingManager;
+import org.cytoscape.view.vizmap.VisualStyle;
+import org.cytoscape.view.vizmap.events.VisualStyleRemovedEvent;
+import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
+import org.cytoscape.work.AbstractTask;
+import org.cytoscape.work.TaskMonitor;
+
+/**
+ *
+ */
+public class DeleteVisualStyleTask extends AbstractTask {
+
+ private final CyEventHelper eventHelper;
+ private final SelectedVisualStyleManager manager;
+
+ public DeleteVisualStyleTask(final CyEventHelper eventHelper,
+ final SelectedVisualStyleManager manager) {
+
+ this.eventHelper = eventHelper;
+ this.manager = manager;
+ }
+
+ @Override
+ public void run(TaskMonitor taskMonitor) throws Exception {
+
+ 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;
+ }
+
+ // 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 removes style.
+ eventHelper.fireSynchronousEvent(new
VisualStyleRemovedEvent(this,
+ currentStyle));
+ }
+ }
+}
Copied:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/DeleteVisualStyleTaskFactory.java
(from rev 22416,
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/RemoveVisualStyleTaskFactory.java)
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/DeleteVisualStyleTaskFactory.java
(rev 0)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/DeleteVisualStyleTaskFactory.java
2010-10-28 21:09:41 UTC (rev 22586)
@@ -0,0 +1,25 @@
+package org.cytoscape.view.vizmap.gui.internal.task;
+
+import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
+import org.cytoscape.work.TaskFactory;
+import org.cytoscape.work.TaskIterator;
+
+public class DeleteVisualStyleTaskFactory implements TaskFactory {
+
+ private final CyEventHelper eventHelper;
+ private final SelectedVisualStyleManager manager;
+
+ public DeleteVisualStyleTaskFactory(final CyEventHelper eventHelper,
+ final SelectedVisualStyleManager manager) {
+ this.manager = manager;
+ this.eventHelper = eventHelper;
+
+ }
+
+ @Override
+ public TaskIterator getTaskIterator() {
+ return new TaskIterator(new DeleteVisualStyleTask(eventHelper,
manager));
+ }
+
+}
Deleted:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/RemoveVisualStyleTask.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/RemoveVisualStyleTask.java
2010-10-28 20:47:25 UTC (rev 22585)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/RemoveVisualStyleTask.java
2010-10-28 21:09:41 UTC (rev 22586)
@@ -1,73 +0,0 @@
-package org.cytoscape.view.vizmap.gui.internal.task;
-
-
-import javax.swing.JOptionPane;
-
-import org.cytoscape.session.CyApplicationManager;
-import org.cytoscape.view.model.CyNetworkView;
-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.VizMapPropertySheetBuilder;
-import org.cytoscape.view.vizmap.gui.internal.VizMapperMainPanel;
-import org.cytoscape.work.AbstractTask;
-import org.cytoscape.work.TaskMonitor;
-
-
-public class RemoveVisualStyleTask extends AbstractTask {
-
- private final VisualMappingManager vmm;
- private final CyApplicationManager applicationManager;
- private final VizMapPropertySheetBuilder vizMapPropertySheetBuilder;
- private final SelectedVisualStyleManager manager;
-
- public RemoveVisualStyleTask(final VisualMappingManager vmm,
- final SelectedVisualStyleManager manager,
- final CyApplicationManager applicationManager,
- final VizMapPropertySheetBuilder
vizMapPropertySheetBuilder) {
- this.vmm = vmm;
- this.manager = manager;
- this.applicationManager = applicationManager;
- this.vizMapPropertySheetBuilder = vizMapPropertySheetBuilder;
- }
-
- @Override
- public void run(TaskMonitor taskMonitor) throws Exception {
-
- 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;
- }
-
- // 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) {
-
- //FIXME
-
-// vmm.removeVisualStyle(currentStyle);
-//
vizMapperMainPanel.getDefaultImageManager().remove(currentStyle);
-//
vizMapPropertySheetBuilder.getPropertyMap().remove(currentStyle);
-//
-// // Switch to the default style
-// final VisualStyle defaultStyle =
vizMapperMainPanel.getDefaultVisualStyle();
-//
-// vizMapperMainPanel.switchVS(defaultStyle);
-// // Apply to the current view
-// final CyNetworkView view =
applicationManager.getCurrentNetworkView();
-// if (view != null)
-// vmm.setVisualStyle(defaultStyle, view);
- }
-
- }
-
-}
Deleted:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/RemoveVisualStyleTaskFactory.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/RemoveVisualStyleTaskFactory.java
2010-10-28 20:47:25 UTC (rev 22585)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/RemoveVisualStyleTaskFactory.java
2010-10-28 21:09:41 UTC (rev 22586)
@@ -1,37 +0,0 @@
-package org.cytoscape.view.vizmap.gui.internal.task;
-
-
-import org.cytoscape.session.CyApplicationManager;
-import org.cytoscape.view.vizmap.VisualMappingManager;
-import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
-import org.cytoscape.view.vizmap.gui.internal.VizMapPropertySheetBuilder;
-import org.cytoscape.work.TaskFactory;
-import org.cytoscape.work.TaskIterator;
-
-
-public class RemoveVisualStyleTaskFactory implements TaskFactory {
- private final VisualMappingManager vmm;
- private final CyApplicationManager applicationManager;
- private final VizMapPropertySheetBuilder vizMapPropertySheetBuilder;
-
- private final SelectedVisualStyleManager manager;
-
- public RemoveVisualStyleTaskFactory(final VisualMappingManager vmm,
- final SelectedVisualStyleManager manager,
- final CyApplicationManager applicationManager,
- final VizMapPropertySheetBuilder
vizMapPropertySheetBuilder) {
- this.applicationManager = applicationManager;
- this.vizMapPropertySheetBuilder = vizMapPropertySheetBuilder;
- this.vmm = vmm;
- this.manager = manager;
-
- }
-
- @Override
- public TaskIterator getTaskIterator() {
- return new TaskIterator(new RemoveVisualStyleTask(vmm,
- manager, applicationManager,
- vizMapPropertySheetBuilder));
- }
-
-}
Modified:
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
2010-10-28 20:47:25 UTC (rev 22585)
+++
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
2010-10-28 21:09:41 UTC (rev 22586)
@@ -8,8 +8,10 @@
<!-- Export Service Listeners -->
<osgi:service id="selectedVisualStyleManagerService"
ref="selectedVisualStyleManager" auto-export="interfaces" />
+ <!-- The main pane is a service -->
<osgi:service id="vizMapperGUIService" ref="vizMapperMainPanel"
auto-export="interfaces" />
+
<osgi:service id="defaultViewEditorService" ref="defViewEditor"
auto-export="interfaces" />
@@ -176,6 +178,8 @@
</osgi:set>
+
+ <!-- Export value editors as services -->
<osgi:set id="valueEditorSet"
interface="org.cytoscape.view.vizmap.gui.editor.ValueEditor"
cardinality="0..N">
Modified:
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
2010-10-28 20:47:25 UTC (rev 22585)
+++
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-vizmapper.xml
2010-10-28 21:09:41 UTC (rev 22586)
@@ -195,12 +195,10 @@
</bean>
<bean name="removeVisualStyleTaskFactory"
-
class="org.cytoscape.view.vizmap.gui.internal.task.RemoveVisualStyleTaskFactory"
+
class="org.cytoscape.view.vizmap.gui.internal.task.DeleteVisualStyleTaskFactory"
depends-on="vizMapperMainPanel">
- <constructor-arg ref="vmmServiceRef" />
+ <constructor-arg ref="cyEventHelperServiceRef" />
<constructor-arg ref="selectedVisualStyleManager"/>
- <constructor-arg ref="cyApplicationManagerServiceRef" />
- <constructor-arg ref="vizMapPropertySheetBuilder" />
</bean>
--
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.
