Refs #3872: VisualStyle now listens to the new VisualPropertyDependen…

…cyChangedEvent to fire a VisualStyleChangedEvent when one of its dependencies is enabled or disabled. VizMapperMediator no longer has to fire another event (to force a style to be applied) when a dependency is enabled or disabled through the UI.

vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/VizMapperMediator.java

@@ -45,7 +45,6 @@
 
 import org.cytoscape.application.swing.AbstractCyAction;
 import org.cytoscape.application.swing.CyAction;
-import org.cytoscape.event.CyEventHelper;
 import org.cytoscape.model.CyColumn;
 import org.cytoscape.model.CyEdge;
 import org.cytoscape.model.CyIdentifiable;
@@ -1301,20 +1300,10 @@ public void redo() {
 		}
 	}
 
-	@SuppressWarnings("rawtypes")
 	private void onDependencySelectionChanged(final ItemEvent e, final VisualPropertySheetItem<?> vpSheetItem) {
 		final boolean selected = e.getStateChange() == ItemEvent.SELECTED;
 		final VisualPropertyDependency<?> dep = vpSheetItem.getModel().getVisualPropertyDependency();
 		dep.setDependency(selected);
-
-		final CyEventHelper evtHelper = servicesUtil.get(CyEventHelper.class);
-		final Set<VisualProperty<?>> visualProperties = dep.getVisualProperties();
-		final Set parent = Collections.singleton(dep.getParentVisualProperty());
-
- 		if (selected)
- 			evtHelper.fireEvent(new LexiconStateChangedEvent(this, parent, visualProperties));
-		else
-			evtHelper.fireEvent(new LexiconStateChangedEvent(this, visualProperties, parent));
 	}
 
 	private void onColumnChanged(final String colName, final CyTable tbl) {

vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java

@@ -24,6 +24,8 @@
 import org.cytoscape.view.vizmap.VisualStyle;
 import org.cytoscape.view.vizmap.events.VisualMappingFunctionChangedEvent;
 import org.cytoscape.view.vizmap.events.VisualMappingFunctionChangedListener;
+import org.cytoscape.view.vizmap.events.VisualPropertyDependencyChangedEvent;
+import org.cytoscape.view.vizmap.events.VisualPropertyDependencyChangedListener;
 import org.cytoscape.view.vizmap.events.VisualStyleChangeRecord;
 import org.cytoscape.view.vizmap.events.VisualStyleChangedEvent;
 import org.slf4j.Logger;
@@ -53,7 +55,8 @@
  * #L%
  */
 
-public class VisualStyleImpl implements VisualStyle, VisualMappingFunctionChangedListener {
+public class VisualStyleImpl
+		implements VisualStyle, VisualMappingFunctionChangedListener, VisualPropertyDependencyChangedListener {
 
 	private static final Logger logger = LoggerFactory.getLogger(VisualStyleImpl.class);
 
@@ -106,7 +109,7 @@ public VisualStyleImpl(final String title, final CyServiceRegistrar serviceRegis
 		serviceRegistrar.registerServiceListener(this, "registerDependencyFactory", "unregisterDependencyFactory",
 				VisualPropertyDependencyFactory.class);
 		serviceRegistrar.registerService(this, VisualMappingFunctionChangedListener.class, new Properties());
-		logger.info("New Visual Style Created: Style Name = " + this.title);
+		serviceRegistrar.registerService(this, VisualPropertyDependencyChangedListener.class, new Properties());
 	}
 
 	@Override
@@ -255,8 +258,10 @@ public void addVisualPropertyDependency(VisualPropertyDependency<?> dependency)
 			changed = dependencies.add(dependency);
 		}
 
-		if (changed)
+		if (changed) {
+			dependency.setEventHelper(eventHelper);
 			eventHelper.addEventPayload(this, new VisualStyleChangeRecord(), VisualStyleChangedEvent.class);
+		}
 	}
 
 	@Override
@@ -294,4 +299,12 @@ public void handleEvent(VisualMappingFunctionChangedEvent e) {
 		if (hasMapping)
 			eventHelper.addEventPayload(this, new VisualStyleChangeRecord(), VisualStyleChangedEvent.class);
 	}
+
+	@Override
+	public void handleEvent(VisualPropertyDependencyChangedEvent e) {
+		final VisualPropertyDependency<?> dep = e.getSource();
+
+		if (dependencies.contains(dep))
+			eventHelper.addEventPayload(this, new VisualStyleChangeRecord(), VisualStyleChangedEvent.class);
+	}
 }