Author: kono
Date: 2012-05-04 16:30:20 -0700 (Fri, 04 May 2012)
New Revision: 29123
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/BypassManager.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/BypassTask.java
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/AbstractApplyHandler.java
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/ApplyHandler.java
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/ApplyToEdgeHandler.java
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/ApplyToNetworkHandler.java
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/ApplyToNodeHandler.java
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/CyActivator.java
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleFactoryImpl.java
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
core3/impl/trunk/vizmap-impl/impl/src/test/java/org/cytoscape/view/vizmap/VisualStyleFactoryTest.java
core3/impl/trunk/vizmap-impl/impl/src/test/java/org/cytoscape/view/vizmap/VisualStyleTest.java
Log:
fixes #942 Visual Bypass refresh timing fixed. Also, apply(View view) method
problem in viizmap-impl had been fixed.
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/BypassManager.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/BypassManager.java
2012-05-04 21:57:26 UTC (rev 29122)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/BypassManager.java
2012-05-04 23:30:20 UTC (rev 29123)
@@ -21,6 +21,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * Creates Visual Style Bypass menu.
+ *
+ */
public final class BypassManager {
private static final Logger logger =
LoggerFactory.getLogger(BypassManager.class);
@@ -39,6 +43,7 @@
}
public void addBypass(RenderingEngineFactory<?> factory, Map props) {
+ // TODO: Replace this with Marker interface.
if (props.containsValue("ding") == false)
return;
@@ -54,6 +59,10 @@
depthFirst(PARENT_MENU_ITEM, nodeRootNode);
depthFirst(PARENT_MENU_ITEM, edgeRootNode);
}
+
+ public void removeBypass(RenderingEngineFactory<?> factory, Map props) {
+ // TODO: implement this
+ }
private void depthFirst(String menuText, final VisualLexiconNode node) {
final Collection<VisualLexiconNode> children =
node.getChildren();
@@ -88,8 +97,6 @@
}
}
- public void removeBypass(RenderingEngineFactory<?> factory, Map props) {
- // TODO: implement this
- }
+
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/BypassTask.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/BypassTask.java
2012-05-04 21:57:26 UTC (rev 29122)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/BypassTask.java
2012-05-04 23:30:20 UTC (rev 29123)
@@ -17,6 +17,7 @@
* Task to execute visual style bypass.
*
* @param <T>
+ * Type of Graph object: CyNode or CyEdge.
*/
public class BypassTask<T extends CyIdentifiable> extends AbstractTask {
@@ -30,7 +31,8 @@
private final SelectedVisualStyleManager selectedManager;
- public BypassTask(Component parent, ValueEditor<?> editor, final
VisualProperty<?> vp, final View<T> view,
+ @SuppressWarnings("unchecked")
+ BypassTask(Component parent, ValueEditor<?> editor, final
VisualProperty<?> vp, final View<T> view,
final CyNetworkView networkView, final
SelectedVisualStyleManager selectedManager) {
this.view = view;
this.vp = (VisualProperty<Object>) vp;
@@ -43,26 +45,28 @@
@Override
public void run(TaskMonitor taskMonitor) throws Exception {
-
final boolean lock = view.isValueLocked(vp);
+
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ update(lock);
+ }
+ });
+
+ }
+
+ private final void update(final boolean lock) {
if (!lock) {
- // Should be executed in EDT
- SwingUtilities.invokeLater(new Runnable() {
- @Override
- public void run() {
- final Object newValue =
editor.showEditor(parent, view.getVisualProperty(vp));
- view.setLockedValue(vp, newValue);
- }
- });
-
+ final Object newValue = editor.showEditor(parent,
view.getVisualProperty(vp));
+ view.setLockedValue(vp, newValue);
} else {
// Unlock it
view.clearValueLock(vp);
}
- selectedManager.getCurrentVisualStyle().apply(networkView);
+ selectedManager.getCurrentVisualStyle().apply(view);
networkView.updateView();
}
-
}
Modified:
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/AbstractApplyHandler.java
===================================================================
---
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/AbstractApplyHandler.java
2012-05-04 21:57:26 UTC (rev 29122)
+++
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/AbstractApplyHandler.java
2012-05-04 23:30:20 UTC (rev 29123)
@@ -8,7 +8,7 @@
import org.cytoscape.view.vizmap.VisualMappingFunction;
import org.cytoscape.view.vizmap.VisualStyle;
-public abstract class AbstractApplyHandler implements ApplyHandler {
+public abstract class AbstractApplyHandler<T extends CyIdentifiable>
implements ApplyHandler<T> {
protected final VisualStyle style;
protected final VisualLexiconManager lexManager;
@@ -19,9 +19,8 @@
}
- protected void applyValues(final View<? extends CyIdentifiable> view,
final Collection<VisualProperty<?>> vps) {
-
- for (VisualProperty<?> vp : vps) {
+ protected void applyValues(final View<T> view, final
Collection<VisualProperty<?>> vps) {
+ for (final VisualProperty<?> vp : vps) {
// check mapping exists or not
final VisualMappingFunction<?, ?> mapping =
style.getVisualMappingFunction(vp);
if (mapping != null) {
@@ -35,11 +34,12 @@
defaultValue = style.getDefaultValue(vp);
}
- view.setVisualProperty(vp, defaultValue);
+ if(!vp.shouldIgnoreDefault())
+ view.setVisualProperty(vp, defaultValue);
}
}
- protected void applyMappedValue(final View<? extends CyIdentifiable>
nodeView, final VisualProperty<?> vp,
+ protected void applyMappedValue(final View<T> nodeView, final
VisualProperty<?> vp,
final VisualMappingFunction<?, ?> mapping) {}
}
Modified:
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/ApplyHandler.java
===================================================================
---
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/ApplyHandler.java
2012-05-04 21:57:26 UTC (rev 29122)
+++
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/ApplyHandler.java
2012-05-04 23:30:20 UTC (rev 29123)
@@ -1,8 +1,9 @@
package org.cytoscape.view.vizmap.internal;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.view.model.View;
-public interface ApplyHandler {
- void apply(final View<?> view);
+public interface ApplyHandler<T extends CyIdentifiable> {
+ void apply(final View<T> view);
}
Modified:
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/ApplyToEdgeHandler.java
===================================================================
---
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/ApplyToEdgeHandler.java
2012-05-04 21:57:26 UTC (rev 29122)
+++
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/ApplyToEdgeHandler.java
2012-05-04 23:30:20 UTC (rev 29123)
@@ -1,25 +1,27 @@
package org.cytoscape.view.vizmap.internal;
import java.util.Collection;
+import java.util.Set;
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.CyNode;
-import org.cytoscape.model.CyIdentifiable;
+import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.view.model.View;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.VisualMappingFunction;
import org.cytoscape.view.vizmap.VisualStyle;
-public class ApplyToEdgeHandler extends AbstractApplyHandler {
+public class ApplyToEdgeHandler extends AbstractApplyHandler<CyEdge> {
- ApplyToEdgeHandler(final VisualStyle style, final VisualLexiconManager
lexManager) {
+ private final CyNetworkManager networkManager;
+
+ ApplyToEdgeHandler(final VisualStyle style, final VisualLexiconManager
lexManager, final CyNetworkManager networkManager) {
super(style, lexManager);
+ this.networkManager = networkManager;
}
@Override
- public void apply(View<?> view) {
- final View<CyEdge> edgeView = (View<CyEdge>) view;
+ public void apply(final View<CyEdge> edgeView) {
final Collection<VisualProperty<?>> edgeVP =
lexManager.getEdgeVisualProperties();
applyValues(edgeView, edgeVP);
}
@@ -28,19 +30,27 @@
* {@inheritDoc}
*/
@Override
- protected void applyMappedValue(final View<? extends CyIdentifiable>
edgeView, final VisualProperty<?> vp,
+ protected void applyMappedValue(final View<CyEdge> view, final
VisualProperty<?> vp,
final VisualMappingFunction<?, ?> mapping) {
+ final CyEdge model = view.getModel();
+ CyNetwork targetNetwork = null;
+ Set<CyNetwork> networks = networkManager.getNetworkSet();
+ for (CyNetwork net : networks) {
+ if (net.containsEdge(model)) {
+ targetNetwork = net;
+ break;
+ }
+ }
- final View<CyEdge> view = (View<CyEdge>) edgeView;
- final CyEdge model = view.getModel();
- final CyNode sourceNode = model.getSource();
- final CyNetwork net = sourceNode.getNetworkPointer();
+ if (targetNetwork==null) {
+ throw new NullPointerException("Could'nt find network");
+ }
// Default of this style
final Object styleDefaultValue = style.getDefaultValue(vp);
// Default of this Visual Property
final Object vpDefault = vp.getDefault();
- mapping.apply(net.getRow(model), view);
+ mapping.apply(targetNetwork.getRow(model), view);
if (view.getVisualProperty(vp) == vpDefault)
view.setVisualProperty(vp, styleDefaultValue);
Modified:
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/ApplyToNetworkHandler.java
===================================================================
---
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/ApplyToNetworkHandler.java
2012-05-04 21:57:26 UTC (rev 29122)
+++
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/ApplyToNetworkHandler.java
2012-05-04 23:30:20 UTC (rev 29123)
@@ -20,7 +20,7 @@
import org.slf4j.LoggerFactory;
-public class ApplyToNetworkHandler extends AbstractApplyHandler {
+public class ApplyToNetworkHandler extends AbstractApplyHandler<CyNetwork> {
private static final Logger logger =
LoggerFactory.getLogger(ApplyToNetworkHandler.class);
@@ -29,7 +29,7 @@
}
@Override
- public void apply(final View<?> view) {
+ public void apply(final View<CyNetwork> view) {
final long start = System.currentTimeMillis();
CyNetworkView networkView = (CyNetworkView) view;
Modified:
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/ApplyToNodeHandler.java
===================================================================
---
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/ApplyToNodeHandler.java
2012-05-04 21:57:26 UTC (rev 29122)
+++
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/ApplyToNodeHandler.java
2012-05-04 23:30:20 UTC (rev 29123)
@@ -1,24 +1,28 @@
package org.cytoscape.view.vizmap.internal;
import java.util.Collection;
+import java.util.Set;
import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyNode;
-import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.view.model.View;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.VisualMappingFunction;
import org.cytoscape.view.vizmap.VisualStyle;
-public class ApplyToNodeHandler extends AbstractApplyHandler {
+public class ApplyToNodeHandler extends AbstractApplyHandler<CyNode> {
- ApplyToNodeHandler(final VisualStyle style, final VisualLexiconManager
lexManager) {
+ private final CyNetworkManager networkManager;
+
+ ApplyToNodeHandler(final VisualStyle style, final VisualLexiconManager
lexManager,
+ final CyNetworkManager networkManager) {
super(style, lexManager);
+ this.networkManager = networkManager;
}
@Override
- public void apply(View<?> view) {
- final View<CyNode> nodeView = (View<CyNode>) view;
+ public void apply(final View<CyNode> nodeView) {
final Collection<VisualProperty<?>> nodeVP =
lexManager.getNodeVisualProperties();
applyValues(nodeView, nodeVP);
}
@@ -30,19 +34,28 @@
* @param vp
*/
@Override
- protected void applyMappedValue(final View<? extends CyIdentifiable>
nodeView, final VisualProperty<?> vp,
+ protected void applyMappedValue(final View<CyNode> view, final
VisualProperty<?> vp,
final VisualMappingFunction<?, ?> mapping) {
+ final CyNode model = view.getModel();
+ CyNetwork targetNetwork = null;
+ Set<CyNetwork> networks = networkManager.getNetworkSet();
+ for (CyNetwork net : networks) {
+ if (net.containsNode(model)) {
+ targetNetwork = net;
+ break;
+ }
+ }
- final View<CyNode> view = (View<CyNode>) nodeView;
- final CyNode model = view.getModel();
- final CyNetwork net = model.getNetworkPointer();
+ if (targetNetwork==null) {
+ throw new NullPointerException("Could'nt find network");
+ }
+
// Default of this style
final Object styleDefaultValue = style.getDefaultValue(vp);
// Default of this Visual Property
final Object vpDefault = vp.getDefault();
+ mapping.apply(targetNetwork.getRow(model), view);
- mapping.apply(net.getRow(model), view);
-
if (view.getVisualProperty(vp) == vpDefault)
view.setVisualProperty(vp, styleDefaultValue);
}
Modified:
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/CyActivator.java
2012-05-04 21:57:26 UTC (rev 29122)
+++
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/CyActivator.java
2012-05-04 23:30:20 UTC (rev 29123)
@@ -3,6 +3,7 @@
import java.util.Properties;
import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.service.util.AbstractCyActivator;
import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.view.presentation.RenderingEngineFactory;
@@ -23,10 +24,11 @@
final CyServiceRegistrar serviceRegistrarServiceRef =
getService(bc, CyServiceRegistrar.class);
CyEventHelper cyEventHelperServiceRef = getService(bc,
CyEventHelper.class);
+ CyNetworkManager cyNetworkManagerServiceRef = getService(bc,
CyNetworkManager.class);
VisualLexiconManager visualLexiconManager = new
VisualLexiconManager();
VisualStyleFactoryImpl visualStyleFactory = new
VisualStyleFactoryImpl(visualLexiconManager,
- serviceRegistrarServiceRef);
+ serviceRegistrarServiceRef,
cyNetworkManagerServiceRef);
VisualMappingManagerImpl visualMappingManager = new
VisualMappingManagerImpl(cyEventHelperServiceRef,
visualStyleFactory, visualLexiconManager);
DiscreteMappingFactory discreteMappingFactory = new
DiscreteMappingFactory();
Modified:
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleFactoryImpl.java
===================================================================
---
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleFactoryImpl.java
2012-05-04 21:57:26 UTC (rev 29122)
+++
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleFactoryImpl.java
2012-05-04 23:30:20 UTC (rev 29123)
@@ -5,6 +5,7 @@
import java.util.List;
import java.util.Set;
+import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.VisualMappingFunction;
@@ -22,15 +23,18 @@
private final VisualLexiconManager lexManager;
private final CyServiceRegistrar serviceRegistrar;
+ private final CyNetworkManager networkManager;
- public VisualStyleFactoryImpl(final VisualLexiconManager lexManager,
final CyServiceRegistrar serviceRegistrar) {
+ public VisualStyleFactoryImpl(final VisualLexiconManager lexManager,
final CyServiceRegistrar serviceRegistrar,
+ final CyNetworkManager networkManager) {
this.lexManager = lexManager;
this.serviceRegistrar = serviceRegistrar;
+ this.networkManager = networkManager;
}
@Override
public VisualStyle createVisualStyle(final VisualStyle original) {
- final VisualStyle copy = new
VisualStyleImpl(original.getTitle(), lexManager, serviceRegistrar);
+ final VisualStyle copy = new
VisualStyleImpl(original.getTitle(), lexManager,
serviceRegistrar,networkManager);
copyDefaultValues(original, copy);
copyMappingFunctions(original, copy);
@@ -40,7 +44,7 @@
@Override
public VisualStyle createVisualStyle(final String title) {
- return new VisualStyleImpl(title, lexManager, serviceRegistrar);
+ return new VisualStyleImpl(title, lexManager, serviceRegistrar,
networkManager);
}
private <V, S extends V> void copyDefaultValues(final VisualStyle
original, final VisualStyle copy) {
Modified:
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
===================================================================
---
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
2012-05-04 21:57:26 UTC (rev 29122)
+++
core3/impl/trunk/vizmap-impl/impl/src/main/java/org/cytoscape/view/vizmap/internal/VisualStyleImpl.java
2012-05-04 23:30:20 UTC (rev 29123)
@@ -44,6 +44,7 @@
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyNode;
import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.view.model.View;
@@ -71,7 +72,7 @@
private String title;
private final Set<VisualPropertyDependency<?>> dependencies;
-
+
/**
*
* @param title
@@ -79,7 +80,7 @@
* @param lexManager
*/
public VisualStyleImpl(final String title, final VisualLexiconManager
lexManager,
- final CyServiceRegistrar serviceRegistrar) {
+ final CyServiceRegistrar serviceRegistrar, final
CyNetworkManager networkManager) {
if (lexManager == null)
throw new NullPointerException("Lexicon Manager is
missing.");
@@ -88,15 +89,15 @@
this.title = DEFAULT_TITLE;
else
this.title = title;
-
+
mappings = new HashMap<VisualProperty<?>,
VisualMappingFunction<?, ?>>();
styleDefaults = new HashMap<VisualProperty<?>, Object>();
// Init Apply handlers for node, egde and network.
this.applyHandlersMap = new HashMap<Class<? extends
CyIdentifiable>, ApplyHandler>();
applyHandlersMap.put(CyNetwork.class, new
ApplyToNetworkHandler(this, lexManager));
- applyHandlersMap.put(CyNode.class, new ApplyToNodeHandler(this,
lexManager));
- applyHandlersMap.put(CyEdge.class, new ApplyToEdgeHandler(this,
lexManager));
+ applyHandlersMap.put(CyNode.class, new ApplyToNodeHandler(this,
lexManager, networkManager));
+ applyHandlersMap.put(CyEdge.class, new ApplyToEdgeHandler(this,
lexManager, networkManager));
dependencies = new HashSet<VisualPropertyDependency<?>>();
Modified:
core3/impl/trunk/vizmap-impl/impl/src/test/java/org/cytoscape/view/vizmap/VisualStyleFactoryTest.java
===================================================================
---
core3/impl/trunk/vizmap-impl/impl/src/test/java/org/cytoscape/view/vizmap/VisualStyleFactoryTest.java
2012-05-04 21:57:26 UTC (rev 29122)
+++
core3/impl/trunk/vizmap-impl/impl/src/test/java/org/cytoscape/view/vizmap/VisualStyleFactoryTest.java
2012-05-04 23:30:20 UTC (rev 29123)
@@ -2,6 +2,7 @@
import static org.mockito.Mockito.mock;
+import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.view.vizmap.internal.VisualLexiconManager;
import org.cytoscape.view.vizmap.internal.VisualStyleFactoryImpl;
@@ -15,7 +16,8 @@
public void setUp() throws Exception {
final VisualLexiconManager lexManager =
mock(VisualLexiconManager.class);
final CyServiceRegistrar serviceRegistrar =
mock(CyServiceRegistrar.class);
- factory = new VisualStyleFactoryImpl(lexManager,
serviceRegistrar);
+ final CyNetworkManager cyNetworkManagerServiceRef =
mock(CyNetworkManager.class);
+ factory = new VisualStyleFactoryImpl(lexManager,
serviceRegistrar, cyNetworkManagerServiceRef);
}
@After
Modified:
core3/impl/trunk/vizmap-impl/impl/src/test/java/org/cytoscape/view/vizmap/VisualStyleTest.java
===================================================================
---
core3/impl/trunk/vizmap-impl/impl/src/test/java/org/cytoscape/view/vizmap/VisualStyleTest.java
2012-05-04 21:57:26 UTC (rev 29122)
+++
core3/impl/trunk/vizmap-impl/impl/src/test/java/org/cytoscape/view/vizmap/VisualStyleTest.java
2012-05-04 23:30:20 UTC (rev 29123)
@@ -9,6 +9,7 @@
import java.util.Set;
import org.cytoscape.ding.NetworkViewTestSupport;
+import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyTable;
import org.cytoscape.property.CyProperty;
import org.cytoscape.service.util.CyServiceRegistrar;
@@ -59,7 +60,8 @@
when(lexManager.getAllVisualLexicon()).thenReturn(lexSet);
final CyServiceRegistrar serviceRegistrar =
mock(CyServiceRegistrar.class);
- final VisualStyleFactoryImpl visualStyleFactory = new
VisualStyleFactoryImpl(lexManager, serviceRegistrar);
+ final CyNetworkManager cyNetworkManagerServiceRef =
mock(CyNetworkManager.class);
+ final VisualStyleFactoryImpl visualStyleFactory = new
VisualStyleFactoryImpl(lexManager, serviceRegistrar,
cyNetworkManagerServiceRef);
originalTitle = "Style 1";
newTitle = "Style 2";
style = visualStyleFactory.createVisualStyle(originalTitle);
--
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.
