Author: kono
Date: 2012-06-05 10:11:38 -0700 (Tue, 05 Jun 2012)
New Revision: 29459
Modified:
core3/api/trunk/vizmap-gui-api/src/main/java/org/cytoscape/view/vizmap/gui/SelectedVisualStyleManager.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
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/SelectedVisualStyleManagerImpl.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.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:
>From this version, default Visual Style can be obtained only from VMM.
Modified:
core3/api/trunk/vizmap-gui-api/src/main/java/org/cytoscape/view/vizmap/gui/SelectedVisualStyleManager.java
===================================================================
---
core3/api/trunk/vizmap-gui-api/src/main/java/org/cytoscape/view/vizmap/gui/SelectedVisualStyleManager.java
2012-06-05 17:08:52 UTC (rev 29458)
+++
core3/api/trunk/vizmap-gui-api/src/main/java/org/cytoscape/view/vizmap/gui/SelectedVisualStyleManager.java
2012-06-05 17:11:38 UTC (rev 29459)
@@ -17,13 +17,4 @@
*
*/
VisualStyle getCurrentVisualStyle();
-
- /**
- * Returns Default Visual Style.
- * Manager should always return actual (non-null) Visual Style.
- *
- * @return default Visual Style. This cannot be null.
- */
- VisualStyle getDefaultStyle();
-
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
2012-06-05 17:08:52 UTC (rev 29458)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
2012-06-05 17:11:38 UTC (rev 29459)
@@ -248,7 +248,7 @@
private void initializeVisualStyleComboBox() {
vsComboBoxModel = new DefaultComboBoxModel();
- final VisualStyle defaultVS = manager.getDefaultStyle();
+ final VisualStyle defaultVS = this.vmm.getDefaultVisualStyle();
final Set<VisualStyle> styles = vmm.getAllVisualStyles();
for(VisualStyle style: styles)
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-06-05 17:08:52 UTC (rev 29458)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
2012-06-05 17:11:38 UTC (rev 29459)
@@ -130,7 +130,7 @@
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(selectedVisualStyleManager);
+ RenameVisualStyleTaskFactory renameVisualStyleTaskFactory = new
RenameVisualStyleTaskFactory(selectedVisualStyleManager, vmmServiceRef);
CopyVisualStyleTaskFactory copyVisualStyleTaskFactory = new
CopyVisualStyleTaskFactory(vmmServiceRef,visualStyleFactoryServiceRef,selectedVisualStyleManager);
CreateLegendTaskFactory createLegendTaskFactory = new
CreateLegendTaskFactory(selectedVisualStyleManager,cyApplicationManagerServiceRef,
vmmServiceRef);
DeleteMappingFunctionTaskFactory
deleteMappingFunctionTaskFactory = new
DeleteMappingFunctionTaskFactory(propertySheetPanel,selectedVisualStyleManager,cyApplicationManagerServiceRef);
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/SelectedVisualStyleManagerImpl.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/SelectedVisualStyleManagerImpl.java
2012-06-05 17:08:52 UTC (rev 29458)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/SelectedVisualStyleManagerImpl.java
2012-06-05 17:11:38 UTC (rev 29459)
@@ -20,21 +20,14 @@
private VisualStyle selectedStyle;
- protected final VisualStyle defaultVS;
-
public SelectedVisualStyleManagerImpl(final VisualMappingManager vmm) {
if (vmm == null)
throw new NullPointerException("Visual Mapping Manager
is missing.");
this.vmm = vmm;
- this.defaultVS = vmm.getDefaultVisualStyle();
- this.selectedStyle = this.defaultVS;
+ this.selectedStyle = this.vmm.getDefaultVisualStyle();
}
- public VisualStyle getDefaultVisualStyle() {
- return defaultVS;
- }
-
@Override
public void handleEvent(SelectedVisualStyleSwitchedEvent e) {
@@ -52,10 +45,6 @@
return selectedStyle;
}
- @Override
- public VisualStyle getDefaultStyle() {
- return defaultVS;
- }
@Override
public void handleEvent(SetCurrentNetworkViewEvent e) {
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2012-06-05 17:08:52 UTC (rev 29458)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2012-06-05 17:11:38 UTC (rev 29459)
@@ -266,7 +266,7 @@
}
// Switch back to the original style.
- switchVS(manager.getDefaultStyle());
+ switchVS(this.vmm.getDefaultVisualStyle());
// Sync check box and actual lock state
spcs.firePropertyChange("UPDATE_LOCK", null, true);
@@ -414,7 +414,7 @@
// Switch to the default style if necessary
if (toBeRemoved.equals(selectedStyle)) {
- final VisualStyle defaultStyle =
manager.getDefaultStyle();
+ final VisualStyle defaultStyle =
this.vmm.getDefaultVisualStyle();
switchVS(defaultStyle);
// Apply to the current view
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-06-05 17:08:52 UTC (rev 29458)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/DeleteVisualStyleTask.java
2012-06-05 17:11:38 UTC (rev 29459)
@@ -25,7 +25,7 @@
final VisualStyle currentStyle =
manager.getCurrentVisualStyle();
- if (currentStyle.equals(manager.getDefaultStyle()))
+ if (currentStyle.equals(this.vmm.getDefaultVisualStyle()))
throw new IllegalArgumentException("You cannot delete
the default style.");
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-06-05 17:08:52 UTC (rev 29458)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/RenameVisualStyleTask.java
2012-06-05 17:11:38 UTC (rev 29459)
@@ -1,5 +1,6 @@
package org.cytoscape.view.vizmap.gui.internal.task;
+import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
import org.cytoscape.work.AbstractTask;
@@ -18,9 +19,11 @@
public String vsName;
private final SelectedVisualStyleManager manager;
+ private final VisualMappingManager vmm;
- public RenameVisualStyleTask(final SelectedVisualStyleManager manager) {
+ public RenameVisualStyleTask(final SelectedVisualStyleManager manager,
final VisualMappingManager vmm) {
this.manager = manager;
+ this.vmm = vmm;
}
@Override
@@ -28,7 +31,7 @@
final VisualStyle currentStyle =
manager.getCurrentVisualStyle();
- if (currentStyle.equals(manager.getDefaultStyle()))
+ if (currentStyle.equals(this.vmm.getDefaultVisualStyle()))
throw new IllegalArgumentException("You cannot rename
the default style.");
// Ignore if user does not enter new name.
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-06-05 17:08:52 UTC (rev 29458)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/RenameVisualStyleTaskFactory.java
2012-06-05 17:11:38 UTC (rev 29459)
@@ -1,5 +1,6 @@
package org.cytoscape.view.vizmap.gui.internal.task;
+import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
import org.cytoscape.work.AbstractTaskFactory;
import org.cytoscape.work.TaskIterator;
@@ -7,13 +8,15 @@
public class RenameVisualStyleTaskFactory extends AbstractTaskFactory {
private final SelectedVisualStyleManager manager;
+ private final VisualMappingManager vmm;
- public RenameVisualStyleTaskFactory(final SelectedVisualStyleManager
manager) {
+ public RenameVisualStyleTaskFactory(final SelectedVisualStyleManager
manager, final VisualMappingManager vmm) {
this.manager = manager;
+ this.vmm = vmm;
}
@Override
public TaskIterator createTaskIterator() {
- return new TaskIterator(new RenameVisualStyleTask(manager));
+ return new TaskIterator(new RenameVisualStyleTask(manager,
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.
