Author: clopes
Date: 2012-06-05 12:56:30 -0700 (Tue, 05 Jun 2012)
New Revision: 29464
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
Log:
Fixes #1066 (VizMap defaults not populated in GUI)
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-05 18:40:46 UTC (rev 29463)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
2012-06-05 19:56:30 UTC (rev 29464)
@@ -116,19 +116,19 @@
private final EditorManager editorFactory;
private final VisualMappingManager vmm;
private final SelectedVisualStyleManager selectedManager;
-
private final VizMapperUtil util;
-
private final DefaultViewPanelImpl mainView;
-
private final CyEventHelper cyEventHelper;
private DependencyTable depTable;
- public DefaultViewEditorImpl(final DefaultViewPanelImpl mainView, final
EditorManager editorFactory,
- final CyApplicationManager cyApplicationManager, final
VisualMappingManager vmm,
- final SelectedVisualStyleManager selectedManager, final
VizMapperUtil util,
- final CyEventHelper cyEventHelper) {
+ public DefaultViewEditorImpl(final DefaultViewPanelImpl mainView,
+ final
EditorManager editorFactory,
+ final
CyApplicationManager cyApplicationManager,
+ final
VisualMappingManager vmm,
+ final
SelectedVisualStyleManager selectedManager,
+ final
VizMapperUtil util,
+ final
CyEventHelper cyEventHelper) {
super();
if (mainView == null)
@@ -449,14 +449,9 @@
* Populate the list model based on current lexicon tree structure.
*/
private void buildList() {
-
final VisualPropCellRenderer renderer = new
VisualPropCellRenderer();
- final RenderingEngine<CyNetwork> currentEngine =
this.cyApplicationManager.getCurrentRenderingEngine();
- if (currentEngine == null)
- return;
-
- final VisualLexicon lex = currentEngine.getVisualLexicon();
-
+ final RenderingEngine<CyNetwork> engine =
mainView.getRenderingEngine();
+ final VisualLexicon lex = engine.getVisualLexicon();
final VisualStyle selectedStyle =
selectedManager.getCurrentVisualStyle();
for (Class<? extends CyIdentifiable> key : vpSets.keySet()) {
@@ -533,7 +528,7 @@
if (value instanceof VisualProperty<?>) {
vp = (VisualProperty<Object>) value;
- final RenderingEngine<?> presentation =
cyApplicationManager.getCurrentRenderingEngine();
+ final RenderingEngine<?> presentation =
mainView.getRenderingEngine();
if (presentation != null) {
final Object defValue =
selectedStyle.getDefaultValue(vp);
--
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.
