Author: clopes
Date: 2012-06-20 13:55:36 -0700 (Wed, 20 Jun 2012)
New Revision: 29644
Modified:
core3/api/trunk/vizmap-api/src/main/java/org/cytoscape/view/vizmap/VisualMappingManager.java
core3/api/trunk/vizmap-api/src/test/java/org/cytoscape/view/vizmap/AbstractVisualMappingManagerTest.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/DefaultViewEditorImpl.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/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/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/ImportDefaultVizmapTask.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/ImportDefaultVizmapTaskFactory.java
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualMappingManagerImpl.java
Log:
Adds setCurrentVisualStyle method to VisualMappingManager.
VizMapperMainPanel: removed listeners that are no longer necessary.
Modified:
core3/api/trunk/vizmap-api/src/main/java/org/cytoscape/view/vizmap/VisualMappingManager.java
===================================================================
---
core3/api/trunk/vizmap-api/src/main/java/org/cytoscape/view/vizmap/VisualMappingManager.java
2012-06-20 18:16:07 UTC (rev 29643)
+++
core3/api/trunk/vizmap-api/src/main/java/org/cytoscape/view/vizmap/VisualMappingManager.java
2012-06-20 20:55:36 UTC (rev 29644)
@@ -62,8 +62,7 @@
* @param visualStyle Visual Style to be set.
* @param networkViewModel The target network view model.
*/
- void setVisualStyle(final VisualStyle visualStyle,
- final CyNetworkView networkViewModel);
+ void setVisualStyle(final VisualStyle visualStyle, final CyNetworkView
networkViewModel);
/**
* Returns the {@linkplain VisualStyle} associated with the target
network
@@ -110,15 +109,23 @@
VisualStyle getDefaultVisualStyle();
/**
+ * Set the specified {@link VisualStyle} as the current one.
+ *
+ * @param visualStyle the {@link VisualStyle} that will become the
current style.
+ */
+ void setCurrentVisualStyle(VisualStyle visualStyle);
+
+ /**
* Returns currently selected Visual Style.
*
* @return Selected Visual Style.
- *
*/
VisualStyle getCurrentVisualStyle();
- /** Returns a Set of all {@link VisualLexicon}s.
+ /**
+ * Returns a Set of all {@link VisualLexicon}s.
+ *
* @return a Set of all {@link VisualLexicon}s.
*/
Set<VisualLexicon> getAllVisualLexicon();
Modified:
core3/api/trunk/vizmap-api/src/test/java/org/cytoscape/view/vizmap/AbstractVisualMappingManagerTest.java
===================================================================
---
core3/api/trunk/vizmap-api/src/test/java/org/cytoscape/view/vizmap/AbstractVisualMappingManagerTest.java
2012-06-20 18:16:07 UTC (rev 29643)
+++
core3/api/trunk/vizmap-api/src/test/java/org/cytoscape/view/vizmap/AbstractVisualMappingManagerTest.java
2012-06-20 20:55:36 UTC (rev 29644)
@@ -18,6 +18,11 @@
}
@Test
+ public void testGetDefaultVisualStyle() {
+ assertNotNull(vmm.getDefaultVisualStyle());
+ }
+
+ @Test
public void testGetAndSetVisualStyle() {
final VisualStyle style1 = mock(VisualStyle.class);
final VisualStyle style2 = mock(VisualStyle.class);
@@ -47,10 +52,8 @@
assertEquals(style3, vmm.getVisualStyle(view3));
}
-
@Test
public void testAddAndRemoveVisualStyle() {
-
int originalSize = vmm.getAllVisualStyles().size();
final VisualStyle style1 = mock(VisualStyle.class);
@@ -61,6 +64,24 @@
assertEquals(originalSize + 2, vmm.getAllVisualStyles().size());
vmm.removeVisualStyle(style2);
assertEquals(originalSize + 1, vmm.getAllVisualStyles().size());
+ }
+
+ @Test
+ public void testGetCurrentVisualStyle() {
+ assertNotNull(vmm.getCurrentVisualStyle());
+ }
+
+ @Test
+ public void testGetAndSetCurrentVisualStyle() {
+ assertNotNull(vmm.getCurrentVisualStyle());
+ assertEquals(vmm.getDefaultVisualStyle(),
vmm.getCurrentVisualStyle());
+ VisualStyle style = mock(VisualStyle.class);
+ vmm.setCurrentVisualStyle(style);
+ assertEquals(style, vmm.getCurrentVisualStyle());
+
+ // Setting null current style
+ vmm.setCurrentVisualStyle(null);
+ assertEquals(vmm.getDefaultVisualStyle(),
vmm.getCurrentVisualStyle());
}
}
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-20 18:16:07 UTC (rev 29643)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/AbstractVizMapperPanel.java
2012-06-20 20:55:36 UTC (rev 29644)
@@ -60,7 +60,6 @@
import javax.swing.table.DefaultTableCellRenderer;
import org.cytoscape.application.CyApplicationManager;
-import org.cytoscape.event.CyEventHelper;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.view.vizmap.VisualStyleFactory;
@@ -112,8 +111,6 @@
protected AttributeEventsListener edgeAttrListener;
protected AttributeEventsListener networkAttrListener;
- protected CyEventHelper eventHelper;
-
protected VisualMappingManager vmm;
protected ColorManager colorMgr;
@@ -171,7 +168,6 @@
final
VizMapPropertySheetBuilder vizMapPropertySheetBuilder,
final
EditorWindowManager editorWindowManager,
final
CyApplicationManager applicationManager,
- final
CyEventHelper eventHelper,
final
SetViewModeAction viewModeAction) {
if (menuMgr == null)
throw new NullPointerException("Menu manager is
missing.");
@@ -187,7 +183,6 @@
this.vizMapPropertySheetBuilder = vizMapPropertySheetBuilder;
this.editorWindowManager = editorWindowManager;
this.applicationManager = applicationManager;
- this.eventHelper = eventHelper;
this.viewModeAction = viewModeAction;
editorReg = new PropertyEditorRegistry();
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-20 18:16:07 UTC (rev 29643)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/CyActivator.java
2012-06-20 20:55:36 UTC (rev 29644)
@@ -123,15 +123,15 @@
SetViewModeAction viewModeAction = new SetViewModeAction();
DefaultViewEditorImpl defViewEditor = new
DefaultViewEditorImpl(defaultViewPanel,editorManager,cyApplicationManagerServiceRef,vmmServiceRef,vizMapperUtil,cyEventHelperServiceRef,viewModeAction);
- CreateNewVisualStyleTaskFactory createNewVisualStyleTaskFactory
= new
CreateNewVisualStyleTaskFactory(visualStyleFactoryServiceRef,vmmServiceRef,cyEventHelperServiceRef);
+ CreateNewVisualStyleTaskFactory createNewVisualStyleTaskFactory
= new
CreateNewVisualStyleTaskFactory(visualStyleFactoryServiceRef,vmmServiceRef);
DeleteVisualStyleTaskFactory removeVisualStyleTaskFactory = new
DeleteVisualStyleTaskFactory(vmmServiceRef);
- ImportDefaultVizmapTaskFactory importDefaultVizmapTaskFactory =
new
ImportDefaultVizmapTaskFactory(vizmapReaderManagerServiceRef,vmmServiceRef,cyApplicationConfigurationServiceRef,
cyEventHelperServiceRef);
+ ImportDefaultVizmapTaskFactory importDefaultVizmapTaskFactory =
new
ImportDefaultVizmapTaskFactory(vizmapReaderManagerServiceRef,vmmServiceRef,cyApplicationConfigurationServiceRef);
VizMapPropertySheetBuilder vizMapPropertySheetBuilder = new
VizMapPropertySheetBuilder(menuManager,cyNetworkManagerServiceRef,propertySheetPanel,editorManager,defaultViewPanel,cyTableManagerServiceRef,vizMapperUtil,vmmServiceRef);
EditorWindowManager editorWindowManager = new
EditorWindowManager(editorManager,propertySheetPanel);
- VizMapperMainPanel vizMapperMainPanel = new
VizMapperMainPanel(visualStyleFactoryServiceRef,defViewEditor,iconManager,colorMgr,vmmServiceRef,menuManager,editorManager,propertySheetPanel,vizMapPropertySheetBuilder,editorWindowManager,cyApplicationManagerServiceRef,cyEventHelperServiceRef,importDefaultVizmapTaskFactory,dialogTaskManagerServiceRef,viewModeAction);
+ VizMapperMainPanel vizMapperMainPanel = new
VizMapperMainPanel(visualStyleFactoryServiceRef,defViewEditor,iconManager,colorMgr,vmmServiceRef,menuManager,editorManager,propertySheetPanel,vizMapPropertySheetBuilder,editorWindowManager,cyApplicationManagerServiceRef,importDefaultVizmapTaskFactory,dialogTaskManagerServiceRef,viewModeAction);
RenameVisualStyleTaskFactory renameVisualStyleTaskFactory = new
RenameVisualStyleTaskFactory(vmmServiceRef);
- CopyVisualStyleTaskFactory copyVisualStyleTaskFactory = new
CopyVisualStyleTaskFactory(vmmServiceRef,visualStyleFactoryServiceRef,cyEventHelperServiceRef);
+ CopyVisualStyleTaskFactory copyVisualStyleTaskFactory = new
CopyVisualStyleTaskFactory(vmmServiceRef,visualStyleFactoryServiceRef);
CreateLegendTaskFactory createLegendTaskFactory = new
CreateLegendTaskFactory(cyApplicationManagerServiceRef, vmmServiceRef);
DeleteMappingFunctionTaskFactory
deleteMappingFunctionTaskFactory = new
DeleteMappingFunctionTaskFactory(propertySheetPanel,vmmServiceRef,
cyApplicationManagerServiceRef);
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
2012-06-20 18:16:07 UTC (rev 29643)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
2012-06-20 20:55:36 UTC (rev 29644)
@@ -602,7 +602,7 @@
}
@Override
- public void handleEvent(SetCurrentVisualStyleEvent e) {
+ public void handleEvent(final SetCurrentVisualStyleEvent e) {
final VisualStyle selectedStyle = e.getVisualStyle();
setTitle("Default Appearance for " + selectedStyle.getTitle());
}
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-20 18:16:07 UTC (rev 29643)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2012-06-20 20:55:36 UTC (rev 29644)
@@ -51,15 +51,10 @@
import javax.swing.event.PopupMenuListener;
import org.cytoscape.application.CyApplicationManager;
-import org.cytoscape.application.events.SetCurrentNetworkViewEvent;
-import org.cytoscape.application.events.SetCurrentNetworkViewListener;
import org.cytoscape.application.swing.CytoPanelComponent;
import org.cytoscape.application.swing.CytoPanelName;
-import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.view.model.events.NetworkViewAddedEvent;
-import org.cytoscape.view.model.events.NetworkViewAddedListener;
import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.view.presentation.property.BasicVisualLexicon;
import org.cytoscape.view.vizmap.VisualMappingManager;
@@ -102,9 +97,8 @@
* </ul>
*/
public class VizMapperMainPanel extends AbstractVizMapperPanel implements
VisualStyleAddedListener,
- VisualStyleSetListener, VisualStyleAboutToBeRemovedListener,
PopupMenuListener, NetworkViewAddedListener,
- SetCurrentNetworkViewListener, CytoPanelComponent,
PropertyChangeListener, LexiconStateChangedListener,
- SetCurrentVisualStyleListener {
+ VisualStyleSetListener, VisualStyleAboutToBeRemovedListener,
PopupMenuListener, CytoPanelComponent,
+ PropertyChangeListener, LexiconStateChangedListener,
SetCurrentVisualStyleListener {
private final static long serialVersionUID = 1202339867854959L;
@@ -137,12 +131,11 @@
final
VizMapPropertySheetBuilder vizMapPropertySheetBuilder,
final
EditorWindowManager editorWindowManager,
final
CyApplicationManager applicationManager,
- final CyEventHelper
eventHelper,
final
ImportDefaultVizmapTaskFactory taskFactory,
final TaskManager<?,
?> tManager,
final
SetViewModeAction viewModeAction) {
super(vsFactory, defViewEditor, iconMgr, colorMgr, vmm,
menuMgr, editorFactory, propertySheetPanel,
- vizMapPropertySheetBuilder,
editorWindowManager, applicationManager, eventHelper, viewModeAction);
+ vizMapPropertySheetBuilder,
editorWindowManager, applicationManager, viewModeAction);
this.defaultViewMouseListener = new
DefaultViewMouseListener(defViewEditor, this, vmm);
@@ -194,7 +187,7 @@
if (!style.equals(lastStyle)) {
switchTo(style);
- eventHelper.fireEvent(new
SetCurrentVisualStyleEvent(this, style));
+ vmm.setCurrentVisualStyle(style);
}
}
@@ -366,37 +359,6 @@
vsComboBoxModel.addElement(newStyle);
}
- @Override
- public void handleEvent(final NetworkViewAddedEvent e) {
- final CyNetworkView view = e.getNetworkView();
- final VisualStyle viewStyle = vmm.getVisualStyle(view);
- final VisualStyle curStyle = vmm.getCurrentVisualStyle();
-
- if (viewStyle == null) {
- vmm.setVisualStyle(curStyle, view);
- curStyle.apply(view);
- view.updateView();
- } else if (!viewStyle.equals(curStyle)) {
- switchTo(viewStyle);
- eventHelper.fireEvent(new
SetCurrentVisualStyleEvent(this, viewStyle));
- }
- }
-
- @Override
- public void handleEvent(SetCurrentNetworkViewEvent e) {
- final CyNetworkView view = e.getNetworkView();
-
- if (view != null) {
- final VisualStyle viewStyle = vmm.getVisualStyle(view);
- final VisualStyle curStyle = (VisualStyle)
visualStyleComboBox.getSelectedItem();
-
- if (curStyle == null || !curStyle.equals(viewStyle)) {
- switchTo(viewStyle);
- eventHelper.fireEvent(new
SetCurrentVisualStyleEvent(this, viewStyle));
- }
- }
- }
-
/**
* Update panel when removed
*/
@@ -424,7 +386,7 @@
view.updateView();
}
- eventHelper.fireEvent(new
SetCurrentVisualStyleEvent(this, defaultStyle));
+ vmm.setCurrentVisualStyle(defaultStyle);
}
}
@@ -440,7 +402,7 @@
// Also check if the style is not already selected
if (!style.equals(lastStyle))
- eventHelper.fireEvent(new
SetCurrentVisualStyleEvent(this, style));
+ vmm.setCurrentVisualStyle(style);
}
}
@@ -509,13 +471,7 @@
}
}
- SwingUtilities.invokeLater(new Runnable() {
- @Override
- public void run() {
-
visualStyleComboBox.setSelectedItem(curStyle);
- }
- });
-
+ visualStyleComboBox.setSelectedItem(curStyle);
switchTo(curStyle);
}
}
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-06-20 18:16:07 UTC (rev 29643)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CopyVisualStyleTask.java
2012-06-20 20:55:36 UTC (rev 29644)
@@ -1,10 +1,8 @@
package org.cytoscape.view.vizmap.gui.internal.task;
-import org.cytoscape.event.CyEventHelper;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.view.vizmap.VisualStyleFactory;
-import org.cytoscape.view.vizmap.events.SetCurrentVisualStyleEvent;
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.ProvidesTitle;
import org.cytoscape.work.TaskMonitor;
@@ -22,14 +20,10 @@
private final VisualMappingManager vmm;
private final VisualStyleFactory factory;
- private final CyEventHelper eventHelper;
- public CopyVisualStyleTask(final VisualMappingManager vmm,
- final
VisualStyleFactory factory,
- final CyEventHelper
eventHelper) {
+ public CopyVisualStyleTask(final VisualMappingManager vmm, final
VisualStyleFactory factory) {
this.factory = factory;
this.vmm = vmm;
- this.eventHelper = eventHelper;
}
@Override
@@ -42,8 +36,8 @@
final VisualStyle copiedStyle =
factory.createVisualStyle(originalStyle);
copiedStyle.setTitle(vsName);
+
vmm.addVisualStyle(copiedStyle);
-
- eventHelper.fireEvent(new SetCurrentVisualStyleEvent(this,
copiedStyle));
+ vmm.setCurrentVisualStyle(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-06-20 18:16:07 UTC (rev 29643)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CopyVisualStyleTaskFactory.java
2012-06-20 20:55:36 UTC (rev 29644)
@@ -1,6 +1,5 @@
package org.cytoscape.view.vizmap.gui.internal.task;
-import org.cytoscape.event.CyEventHelper;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyleFactory;
import org.cytoscape.work.AbstractTaskFactory;
@@ -10,18 +9,14 @@
private final VisualMappingManager vmm;
private final VisualStyleFactory factory;
- private final CyEventHelper eventHelper;
- public CopyVisualStyleTaskFactory(final VisualMappingManager vmm,
- final
VisualStyleFactory factory,
- final
CyEventHelper eventHelper) {
+ public CopyVisualStyleTaskFactory(final VisualMappingManager vmm, final
VisualStyleFactory factory) {
this.vmm = vmm;
this.factory = factory;
- this.eventHelper = eventHelper;
}
@Override
public TaskIterator createTaskIterator() {
- return new TaskIterator(new CopyVisualStyleTask(vmm, factory,
eventHelper));
+ return new TaskIterator(new CopyVisualStyleTask(vmm, factory));
}
}
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-06-20 18:16:07 UTC (rev 29643)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CreateNewVisualStyleTask.java
2012-06-20 20:55:36 UTC (rev 29644)
@@ -3,11 +3,9 @@
import java.io.IOException;
import java.util.Iterator;
-import org.cytoscape.event.CyEventHelper;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.view.vizmap.VisualStyleFactory;
-import org.cytoscape.view.vizmap.events.SetCurrentVisualStyleEvent;
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.ProvidesTitle;
import org.cytoscape.work.TaskMonitor;
@@ -19,7 +17,7 @@
public class CreateNewVisualStyleTask extends AbstractTask implements
TunableValidator {
private static final Logger logger =
LoggerFactory.getLogger(CreateNewVisualStyleTask.class);
-
+
@ProvidesTitle
public String getTitle() {
return "Create New Visual Style";
@@ -27,48 +25,41 @@
@Tunable(description = "Name of new Visual Style:")
public String vsName;
-
+
private final VisualStyleFactory vsFactory;
private final VisualMappingManager vmm;
- private final CyEventHelper eventHelper;
-
- public CreateNewVisualStyleTask(final VisualStyleFactory vsFactory,
- final
VisualMappingManager vmm,
- final
CyEventHelper eventHelper) {
+
+ public CreateNewVisualStyleTask(final VisualStyleFactory vsFactory,
final VisualMappingManager vmm) {
super();
this.vsFactory = vsFactory;
this.vmm = vmm;
- this.eventHelper = eventHelper;
}
-
public void run(TaskMonitor tm) {
if (vsName == null)
return;
- // Create new style. This method call automatically fire event.
final VisualStyle style = vsFactory.createVisualStyle(vsName);
+
vmm.addVisualStyle(style);
- logger.debug("CreateNewVisualStyleTask created new Visual
Style: " + style);
- eventHelper.fireEvent(new SetCurrentVisualStyleEvent(this,
style));
+ vmm.setCurrentVisualStyle(style);
}
-
-
- public ValidationState getValidationState(final Appendable errMsg){
+
+ public ValidationState getValidationState(final Appendable errMsg) {
Iterator<VisualStyle> it =
this.vmm.getAllVisualStyles().iterator();
-
- while(it.hasNext()){
+
+ while (it.hasNext()) {
VisualStyle exist_vs = it.next();
-
- if (exist_vs.getTitle().equalsIgnoreCase(vsName)){
+
+ if (exist_vs.getTitle().equalsIgnoreCase(vsName)) {
try {
- errMsg.append("Visual style "+ vsName
+" already existed!");
+ errMsg.append("Visual style " + vsName
+ " already existed!");
return ValidationState.INVALID;
} catch (IOException e) {
}
}
}
-
+
return ValidationState.OK;
}
}
\ No newline at end of file
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-06-20 18:16:07 UTC (rev 29643)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/CreateNewVisualStyleTaskFactory.java
2012-06-20 20:55:36 UTC (rev 29644)
@@ -1,6 +1,5 @@
package org.cytoscape.view.vizmap.gui.internal.task;
-import org.cytoscape.event.CyEventHelper;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyleFactory;
import org.cytoscape.work.AbstractTaskFactory;
@@ -10,18 +9,14 @@
private final VisualStyleFactory vsFactory;
private final VisualMappingManager vmm;
- private final CyEventHelper eventHelper;
- public CreateNewVisualStyleTaskFactory(final VisualStyleFactory
vsFactory,
-
final VisualMappingManager vmm,
-
final CyEventHelper eventHelper) {
+ public CreateNewVisualStyleTaskFactory(final VisualStyleFactory
vsFactory, final VisualMappingManager vmm) {
this.vsFactory = vsFactory;
this.vmm = vmm;
- this.eventHelper = eventHelper;
}
@Override
public TaskIterator createTaskIterator() {
- return new TaskIterator(new CreateNewVisualStyleTask(vsFactory,
vmm, eventHelper));
+ return new TaskIterator(new CreateNewVisualStyleTask(vsFactory,
vmm));
}
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/ImportDefaultVizmapTask.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/ImportDefaultVizmapTask.java
2012-06-20 18:16:07 UTC (rev 29643)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/ImportDefaultVizmapTask.java
2012-06-20 20:55:36 UTC (rev 29644)
@@ -5,12 +5,10 @@
import java.util.Set;
import org.cytoscape.application.CyApplicationConfiguration;
-import org.cytoscape.event.CyEventHelper;
import org.cytoscape.io.read.VizmapReader;
import org.cytoscape.io.read.VizmapReaderManager;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyle;
-import org.cytoscape.view.vizmap.events.SetCurrentVisualStyleEvent;
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.TaskMonitor;
import org.slf4j.Logger;
@@ -25,13 +23,12 @@
private final VizmapReaderManager vizmapReaderMgr;
private final File vizmapFile;
- private final CyEventHelper eventHelper;
- public ImportDefaultVizmapTask(final VizmapReaderManager
vizmapReaderMgr, final VisualMappingManager vmm,
- final CyApplicationConfiguration config, final
CyEventHelper eventHelper) {
+ public ImportDefaultVizmapTask(final VizmapReaderManager
vizmapReaderMgr,
+ final
VisualMappingManager vmm,
+ final
CyApplicationConfiguration config) {
this.vizmapReaderMgr = vizmapReaderMgr;
this.vmm = vmm;
- this.eventHelper = eventHelper;
this.vizmapFile = new
File(config.getConfigurationDirectoryLocation(), PRESET_VIZMAP_FILE);
}
@@ -52,19 +49,17 @@
if (reader == null)
throw new NullPointerException("Failed to find Default
Vizmap loader.");
- insertTasksAfterCurrentTask(reader, new
AddVisualStylesTask(reader, vmm, eventHelper));
+ insertTasksAfterCurrentTask(reader, new
AddVisualStylesTask(reader, vmm));
}
private static final class AddVisualStylesTask extends AbstractTask {
private final VizmapReader reader;
private final VisualMappingManager vmMgr;
- private final CyEventHelper helper;
- public AddVisualStylesTask(VizmapReader reader,
VisualMappingManager vmMgr, final CyEventHelper eventHelper) {
+ public AddVisualStylesTask(final VizmapReader reader, final
VisualMappingManager vmMgr) {
this.reader = reader;
this.vmMgr = vmMgr;
- this.helper = eventHelper;
}
@Override
@@ -94,7 +89,7 @@
}
final VisualStyle defStyle =
vmMgr.getDefaultVisualStyle();
- helper.fireEvent(new
SetCurrentVisualStyleEvent(this, defStyle));
+ vmMgr.setCurrentVisualStyle(defStyle);
}
}
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/ImportDefaultVizmapTaskFactory.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/ImportDefaultVizmapTaskFactory.java
2012-06-20 18:16:07 UTC (rev 29643)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/task/ImportDefaultVizmapTaskFactory.java
2012-06-20 20:55:36 UTC (rev 29644)
@@ -1,7 +1,6 @@
package org.cytoscape.view.vizmap.gui.internal.task;
import org.cytoscape.application.CyApplicationConfiguration;
-import org.cytoscape.event.CyEventHelper;
import org.cytoscape.io.read.VizmapReaderManager;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.work.AbstractTaskFactory;
@@ -12,19 +11,17 @@
private final VizmapReaderManager vizmapReaderMgr;
private final VisualMappingManager vmm;
private final CyApplicationConfiguration config;
-
- private final CyEventHelper eventHelper;
- public ImportDefaultVizmapTaskFactory(VizmapReaderManager
vizmapReaderMgr, VisualMappingManager vmm,
- final CyApplicationConfiguration config, final
CyEventHelper eventHelper) {
+ public ImportDefaultVizmapTaskFactory(final VizmapReaderManager
vizmapReaderMgr,
+
final VisualMappingManager vmm,
+
final CyApplicationConfiguration config) {
this.vizmapReaderMgr = vizmapReaderMgr;
this.vmm = vmm;
this.config = config;
- this.eventHelper = eventHelper;
}
@Override
public TaskIterator createTaskIterator() {
- return new TaskIterator(new
ImportDefaultVizmapTask(vizmapReaderMgr, vmm, config, eventHelper));
+ return new TaskIterator(new
ImportDefaultVizmapTask(vizmapReaderMgr, vmm, config));
}
}
Modified:
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualMappingManagerImpl.java
===================================================================
---
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualMappingManagerImpl.java
2012-06-20 18:16:07 UTC (rev 29643)
+++
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualMappingManagerImpl.java
2012-06-20 20:55:36 UTC (rev 29644)
@@ -51,7 +51,6 @@
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.view.vizmap.VisualStyleFactory;
import org.cytoscape.view.vizmap.events.SetCurrentVisualStyleEvent;
-import org.cytoscape.view.vizmap.events.SetCurrentVisualStyleListener;
import org.cytoscape.view.vizmap.events.VisualStyleAboutToBeRemovedEvent;
import org.cytoscape.view.vizmap.events.VisualStyleAddedEvent;
import org.cytoscape.view.vizmap.events.VisualStyleSetEvent;
@@ -61,7 +60,7 @@
/**
*
*/
-public class VisualMappingManagerImpl implements VisualMappingManager,
SetCurrentVisualStyleListener, SetCurrentNetworkViewListener {
+public class VisualMappingManagerImpl implements VisualMappingManager,
SetCurrentNetworkViewListener {
private static final Logger logger =
LoggerFactory.getLogger(VisualMappingManagerImpl.class);
@@ -103,7 +102,6 @@
this.currentStyle = defaultStyle;
}
-
private VisualStyle buildGlobalDefaultStyle(final VisualStyleFactory
factory) {
final VisualStyle defStyle =
factory.createVisualStyle(DEFAULT_STYLE_NAME);
@@ -136,19 +134,17 @@
style = getDefaultVisualStyle();
network2VisualStyleMap.put(nv, style);
}
+
return style;
}
- /**
- * {@inheritDoc}
- */
@Override
public void setVisualStyle(final VisualStyle vs, final CyNetworkView
nv) {
if (nv == null)
throw new NullPointerException("Network view is null.");
boolean changed = false;
-
+
if (vs == null) {
changed = network2VisualStyleMap.remove(nv) != null;
} else {
@@ -158,124 +154,113 @@
if (this.visualStyles.contains(vs) == false)
this.visualStyles.add(vs);
-
+
if (changed)
cyEventHelper.fireEvent(new VisualStyleSetEvent(this,
vs, nv));
}
/**
- * Remove a {@linkplain VisualStyle} from this manager. This will be
called
- * through OSGi service mechanism.
- *
- * @param vs
- * DOCUMENT ME!
+ * Remove a {@linkplain VisualStyle} from this manager. This will be
called through OSGi service mechanism.
*/
@Override
public void removeVisualStyle(VisualStyle vs) {
if (vs == null)
throw new NullPointerException("Visual Style is null.");
if (vs == defaultStyle)
- throw new IllegalArgumentException(
- "Cannot remove default visual style.");
+ throw new IllegalArgumentException("Cannot remove
default visual style.");
-
// Use default for all views using this vs.
if (this.network2VisualStyleMap.values().contains(vs)) {
- for(final CyNetworkView view:
network2VisualStyleMap.keySet()) {
- if(network2VisualStyleMap.get(view).equals(vs))
+ for (final CyNetworkView view :
network2VisualStyleMap.keySet()) {
+ if (network2VisualStyleMap.get(view).equals(vs))
network2VisualStyleMap.put(view,
defaultStyle);
}
}
-
+
logger.info("Visual Style about to be removed from VMM: " +
vs.getTitle());
cyEventHelper.fireEvent(new
VisualStyleAboutToBeRemovedEvent(this, vs));
visualStyles.remove(vs);
vs = null;
-
+
logger.info("Total Number of VS in VMM after remove = " +
visualStyles.size());
}
-
/**
- * Add a new VisualStyle to this manager. This will be called through
OSGi
- * service mechanism.
+ * Add a new VisualStyle to this manager. This will be called through
OSGi service mechanism.
*
* @param vs new Visual Style to be added.
*/
@Override
public void addVisualStyle(final VisualStyle vs) {
- if(vs == null) {
+ if (vs == null) {
logger.warn("Tried to add null to VMM.");
return;
}
-
- if (hasDuplicatedTitle(vs)){
+
+ if (hasDuplicatedTitle(vs)) {
String newTitle = getSuggestedTitle(vs.getTitle());
- //Update the title
+ // Update the title
vs.setTitle(newTitle);
}
-
+
this.visualStyles.add(vs);
logger.info("New visual Style registered to VMM: " +
vs.getTitle());
logger.info("Total Number of VS in VMM = " +
visualStyles.size());
- if(vs.getTitle() != null &&
vs.getTitle().equals(DEFAULT_STYLE_NAME))
- defaultStyle = vs;
+ if (vs.getTitle() != null &&
vs.getTitle().equals(DEFAULT_STYLE_NAME))
+ defaultStyle = vs;
+
cyEventHelper.fireEvent(new VisualStyleAddedEvent(this, vs));
}
- private String getSuggestedTitle(String title){
- int i=0;
+ private String getSuggestedTitle(String title) {
+ int i = 0;
String suggesteTitle = title;
-
- while (true){
- suggesteTitle = title + "_"+(new Integer(i).toString());
-
+
+ while (true) {
+ suggesteTitle = title + "_" + (new
Integer(i).toString());
boolean duplicated = false;
-
+
Iterator<VisualStyle> it =
this.getAllVisualStyles().iterator();
- while(it.hasNext()){
+
+ while (it.hasNext()) {
VisualStyle exist_vs = it.next();
- if
(exist_vs.getTitle().equalsIgnoreCase(suggesteTitle)){
+
+ if
(exist_vs.getTitle().equalsIgnoreCase(suggesteTitle)) {
duplicated = true;
break;
}
}
- if (duplicated){
+ if (duplicated) {
i++;
continue;
}
-
+
break;
}
-
+
return suggesteTitle;
}
-
- private boolean hasDuplicatedTitle(VisualStyle vs){
-
- if (this.getAllVisualStyles().size() == 0){
+ private boolean hasDuplicatedTitle(VisualStyle vs) {
+ if (this.getAllVisualStyles().size() == 0)
return false;
- }
+
Iterator<VisualStyle> it = this.getAllVisualStyles().iterator();
- while(it.hasNext()){
+
+ while (it.hasNext()) {
VisualStyle exist_vs = it.next();
- if (exist_vs.getTitle() == null || vs.getTitle() ==
null){
+
+ if (exist_vs.getTitle() == null || vs.getTitle() ==
null)
continue;
- }
- if
(exist_vs.getTitle().equalsIgnoreCase(vs.getTitle())){
+ if (exist_vs.getTitle().equalsIgnoreCase(vs.getTitle()))
return true;
- }
}
-
+
return false;
}
-
- /**
- * {@inheritDoc}
- */
+
@Override
public Set<VisualStyle> getAllVisualStyles() {
return visualStyles;
@@ -285,6 +270,7 @@
public VisualStyle getDefaultVisualStyle() {
if (defaultStyle == null)
throw new IllegalStateException("No rendering engine is
available, and cannot create default style!");
+
return defaultStyle;
}
@@ -293,7 +279,6 @@
return lexManager.getAllVisualLexicon();
}
-
@Override
public VisualStyle getCurrentVisualStyle() {
return currentStyle;
@@ -302,19 +287,25 @@
@Override
public void handleEvent(SetCurrentNetworkViewEvent e) {
final CyNetworkView view = e.getNetworkView();
- if(view == null)
+
+ if (view == null)
return;
-
+
final VisualStyle newStyle = this.getVisualStyle(view);
- if(newStyle != null)
- this.currentStyle = newStyle;
+
+ if (newStyle != null)
+ setCurrentVisualStyle(newStyle);
}
-
@Override
- public void handleEvent(SetCurrentVisualStyleEvent e) {
- final VisualStyle newStyle = e.getVisualStyle();
- if(newStyle != null)
- this.currentStyle = newStyle;
+ public void setCurrentVisualStyle(VisualStyle newStyle) {
+ if (newStyle == null)
+ newStyle = defaultStyle;
+
+ boolean changed = !newStyle.equals(currentStyle);
+ this.currentStyle = newStyle;
+
+ if (changed)
+ cyEventHelper.fireEvent(new
SetCurrentVisualStyleEvent(this, currentStyle));
}
}
--
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.
