Author: mes
Date: 2010-08-10 16:37:00 -0700 (Tue, 10 Aug 2010)
New Revision: 21296
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/EditSelectedCellAction.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/GenerateSeriesAction.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/GenerateValueAction.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/ModifyBrightnessAction.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/ColorVisualPropertyEditor.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/NumberVisualPropertyEditor.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditor.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DMappingEditor.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
Log:
changed how CyDataTables are managed for networks
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
2010-08-10 23:32:24 UTC (rev 21295)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
2010-08-10 23:37:00 UTC (rev 21296)
@@ -53,6 +53,7 @@
import org.cytoscape.model.CyDataTable;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.GraphObject;
+import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.VisualMappingFunction;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
@@ -78,11 +79,13 @@
private EditorManager editorFactory;
private CyNetworkManager cyNetworkManager;
+ private CyTableManager tableMgr;
public VizMapPropertyBuilder(CyNetworkManager cyNetworkManager,
- EditorManager editorFactory) {
+ EditorManager editorFactory, CyTableManager tableMgr) {
this.cyNetworkManager = cyNetworkManager;
this.editorFactory = editorFactory;
+ this.tableMgr = tableMgr;
}
/**
@@ -149,7 +152,7 @@
if (targetNetwork == null)
return null;
- attr = targetNetwork.getCyDataTables(vp.getObjectType()).get(
+ attr =
tableMgr.getTableMap(vp.getObjectType(),targetNetwork).get(
CyNetwork.DEFAULT_ATTRS);
if (vp.getObjectType().equals(NODE)) {
it = targetNetwork.getNodeList().iterator();
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
2010-08-10 23:32:24 UTC (rev 21295)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
2010-08-10 23:37:00 UTC (rev 21296)
@@ -16,6 +16,7 @@
import javax.swing.SwingConstants;
import javax.swing.table.DefaultTableCellRenderer;
+import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.model.VisualLexicon;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.VisualMappingFunction;
@@ -80,7 +81,7 @@
public VizMapPropertySheetBuilder(CyNetworkManager cyNetworkManager,
PropertySheetPanel propertySheetPanel,
EditorManager editorManager,
- DefaultViewPanel defViewPanel) {
+ DefaultViewPanel defViewPanel, CyTableManager tableMgr)
{
this.cyNetworkManager = cyNetworkManager;
this.propertySheetPanel = propertySheetPanel;
@@ -89,7 +90,7 @@
propertyMap = new HashMap<VisualStyle, List<Property>>();
- vizMapPropertyBuilder = new
VizMapPropertyBuilder(cyNetworkManager, editorManager);
+ vizMapPropertyBuilder = new
VizMapPropertyBuilder(cyNetworkManager, editorManager, tableMgr);
}
public Map<VisualStyle, List<Property>> getPropertyMap() {
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/EditSelectedCellAction.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/EditSelectedCellAction.java
2010-08-10 23:32:24 UTC (rev 21295)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/EditSelectedCellAction.java
2010-08-10 23:37:00 UTC (rev 21296)
@@ -40,6 +40,7 @@
import org.cytoscape.model.CyDataTable;
import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.VisualMappingFunction;
import org.cytoscape.view.vizmap.gui.VizMapGUI;
@@ -59,10 +60,12 @@
public class EditSelectedCellAction extends AbstractVizMapperAction {
private VizMapGUI vizMapGUI;
+ private CyTableManager tableMgr;
- public EditSelectedCellAction(VizMapGUI vizMapGUI) {
+ public EditSelectedCellAction(VizMapGUI vizMapGUI, CyTableManager
tableMgr) {
super();
this.vizMapGUI = vizMapGUI;
+ this.tableMgr = tableMgr;
}
private static final long serialVersionUID = -6102797200439573667L;
@@ -107,7 +110,7 @@
final CyNetwork targetNetwork =
cyNetworkManager.getCurrentNetwork();
mapping =
vizMapGUI.getSelectedVisualStyle().getVisualMappingFunction(vp);
- attr =
targetNetwork.getCyDataTables(vp.getObjectType()).get(CyNetwork.DEFAULT_ATTRS);
+ attr =
tableMgr.getTableMap(vp.getObjectType(),targetNetwork).get(CyNetwork.DEFAULT_ATTRS);
if (mapping instanceof ContinuousMapping || mapping instanceof
PassthroughMapping)
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/GenerateSeriesAction.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/GenerateSeriesAction.java
2010-08-10 23:32:24 UTC (rev 21295)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/GenerateSeriesAction.java
2010-08-10 23:37:00 UTC (rev 21296)
@@ -64,7 +64,7 @@
//
// if (vp != null && oMap != null) {
//
-// final CyDataTable attr =
targetNetwork.getCyDataTables(vp.getObjectType()).get(
+// final CyDataTable attr =
tableMgr.getTableMap(vp.getObjectType(),targetNetwork).get(
// CyNetwork.DEFAULT_ATTRS);
//
// final Set<K> attrSet = new TreeSet<K>(
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/GenerateValueAction.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/GenerateValueAction.java
2010-08-10 23:32:24 UTC (rev 21295)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/GenerateValueAction.java
2010-08-10 23:37:00 UTC (rev 21296)
@@ -46,6 +46,7 @@
import org.cytoscape.model.CyDataTable;
import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.VisualMappingFunction;
@@ -62,11 +63,14 @@
* Type of attribute values.
*/
public class GenerateValueAction<K, V> extends AbstractVizMapperAction {
+
+ private CyTableManager tableMgr;
/**
* Creates a new GenerateValueAction object.
*/
- public GenerateValueAction() {
+ public GenerateValueAction(CyTableManager tableMgr) {
super();
+ this.tableMgr = tableMgr;
}
private final static long serialVersionUID = 1213748836986412L;
@@ -101,8 +105,7 @@
final CyDataTable attr;
- attr =
cyNetworkManager.getCurrentNetwork().getCyDataTables(
-
type.getObjectType()).get(CyNetwork.DEFAULT_ATTRS);
+ attr = tableMgr.getTableMap(type.getObjectType(),
cyNetworkManager.getCurrentNetwork()).get(CyNetwork.DEFAULT_ATTRS);
final VisualMappingFunction oMap = vmm.getVisualStyle(
targetNetworkView).getVisualMappingFunction(type);
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/ModifyBrightnessAction.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/ModifyBrightnessAction.java
2010-08-10 23:32:24 UTC (rev 21295)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/ModifyBrightnessAction.java
2010-08-10 23:37:00 UTC (rev 21296)
@@ -46,6 +46,7 @@
import org.cytoscape.model.CyDataTable;
import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.view.vizmap.gui.internal.VizMapperProperty;
@@ -61,6 +62,7 @@
protected static final int DARKER = 1;
protected static final int BRIGHTER = 2;
private final int functionType;
+ private CyTableManager tableMgr;
/**
* Creates a new BrightnessListener object.
@@ -68,8 +70,9 @@
* @param type
* DOCUMENT ME!
*/
- public ModifyBrightnessAction(final int type) {
+ public ModifyBrightnessAction(final int type, CyTableManager tableMgr) {
this.functionType = type;
+ this.tableMgr = tableMgr;
}
/**
@@ -104,17 +107,10 @@
final Map<Object, Color> valueMap = new HashMap<Object,
Color>();
- final CyDataTable attr;
final VisualStyle vs = this.vizMapperMainPanel
.getSelectedVisualStyle();
- if (type.getObjectType().equals(NODE))
- attr = targetNetwork.getNodeCyDataTables().get(
- CyNetwork.DEFAULT_ATTRS);
- else
- attr = targetNetwork.getEdgeCyDataTables().get(
- CyNetwork.DEFAULT_ATTRS);
-
+ final CyDataTable attr =
tableMgr.getTableMap(type.getObjectType(),
targetNetwork).get(CyNetwork.DEFAULT_ATTRS);
// If not discrete, return.
if ((vs.getVisualMappingFunction(type) instanceof
DiscreteMapping) == false)
return;
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/ColorVisualPropertyEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/ColorVisualPropertyEditor.java
2010-08-10 23:32:24 UTC (rev 21295)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/ColorVisualPropertyEditor.java
2010-08-10 23:37:00 UTC (rev 21296)
@@ -41,6 +41,7 @@
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableCellRenderer;
+import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.model.VisualProperty;
import
org.cytoscape.view.vizmap.gui.internal.editor.mappingeditor.GradientEditorPanel;
import
org.cytoscape.view.vizmap.gui.internal.editor.propertyeditor.CyColorPropertyEditor;
@@ -55,11 +56,11 @@
/**
* Constructor. Should instantiate one editor per VisualProperty.
*/
- public ColorVisualPropertyEditor(VisualProperty<Color> vp) {
+ public ColorVisualPropertyEditor(VisualProperty<Color> vp,
CyTableManager tm) {
super(vp);
tableCellRenderer = new DefaultTableCellRenderer();
//FIXME
- continuousEditor = new GradientEditorPanel(this.vp, null);
+ continuousEditor = new GradientEditorPanel(this.vp, null, tm);
propertyEditor = new CyColorPropertyEditor();
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/NumberVisualPropertyEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/NumberVisualPropertyEditor.java
2010-08-10 23:32:24 UTC (rev 21295)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/NumberVisualPropertyEditor.java
2010-08-10 23:37:00 UTC (rev 21296)
@@ -37,6 +37,7 @@
import javax.swing.Icon;
import javax.swing.table.DefaultTableCellRenderer;
+import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.gui.VizMapGUI;
import
org.cytoscape.view.vizmap.gui.internal.editor.mappingeditor.C2CMappingEditor;
@@ -50,11 +51,11 @@
/**
* Creates a new DiscreteNumber object.
*/
- public NumberVisualPropertyEditor(VisualProperty<Number> vp, VizMapGUI
vizMapGUI) {
+ public NumberVisualPropertyEditor(VisualProperty<Number> vp, VizMapGUI
vizMapGUI, CyTableManager tm) {
super(vp);
propertyEditor = new CyDoublePropertyEditor(null);
tableCellRenderer = new DefaultTableCellRenderer();
- continuousEditor = new C2CMappingEditor<Number>(this.vp,
vizMapGUI);
+ continuousEditor = new C2CMappingEditor<Number>(this.vp,
vizMapGUI, tm);
}
/**
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditor.java
2010-08-10 23:32:24 UTC (rev 21295)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditor.java
2010-08-10 23:37:00 UTC (rev 21296)
@@ -40,6 +40,7 @@
import javax.swing.ImageIcon;
+import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.gui.VizMapGUI;
import org.cytoscape.view.vizmap.mappings.BoundaryRangeValues;
@@ -75,8 +76,8 @@
* @param type
* DOCUMENT ME!
*/
- public C2CMappingEditor(VisualProperty<V> type, VizMapGUI vizMapGUI) {
- super(type, vizMapGUI);
+ public C2CMappingEditor(VisualProperty<V> type, VizMapGUI vizMapGUI,
CyTableManager tableMgr) {
+ super(type, vizMapGUI, tableMgr);
abovePanel.setVisible(false);
belowPanel.setVisible(false);
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DMappingEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DMappingEditor.java
2010-08-10 23:32:24 UTC (rev 21295)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DMappingEditor.java
2010-08-10 23:37:00 UTC (rev 21296)
@@ -43,6 +43,7 @@
import javax.swing.ImageIcon;
+import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.gui.VizMapGUI;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
@@ -70,8 +71,8 @@
private EditorManager editorFactory;
public C2DMappingEditor(VisualProperty<V> type,
- EditorManager editorFactory, VizMapGUI vizMapGUI) {
- super(type, vizMapGUI);
+ EditorManager editorFactory, VizMapGUI vizMapGUI,
CyTableManager tm) {
+ super(type, vizMapGUI, tm);
this.iconPanel.setVisible(false);
this.belowPanel.setVisible(false);
this.abovePanel.setVisible(false);
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
2010-08-10 23:32:24 UTC (rev 21295)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
2010-08-10 23:37:00 UTC (rev 21296)
@@ -54,6 +54,7 @@
import org.cytoscape.model.CyDataTable;
import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.VisualMappingFunction;
import org.cytoscape.view.vizmap.VisualMappingManager;
@@ -108,6 +109,7 @@
protected EditorValueRangeTracer tracer;
protected VizMapGUI vizMapGUI;
+ private CyTableManager tableMgr;
/**
*
@@ -116,9 +118,10 @@
*
* */
public ContinuousMappingEditorPanel(final VisualProperty<V> type,
- VizMapGUI vizMapGUI) {
+ VizMapGUI vizMapGUI, CyTableManager tableMgr) {
this.type = type;
this.vizMapGUI = vizMapGUI;
+ this.tableMgr = tableMgr;
initComponents();
setVisualPropLabel();
@@ -381,8 +384,7 @@
// Attribute to be mapped.
final CyDataTable attrs;
- attrs = cyNetworkManager.getCurrentNetwork().getCyDataTables(
-
type.getObjectType()).get(CyNetwork.DEFAULT_ATTRS);
+ attrs =
tableMgr.getTableMap(type.getObjectType(),cyNetworkManager.getCurrentNetwork()).get(CyNetwork.DEFAULT_ATTRS);
VisualMappingFunction<?, V> map =
vizMapGUI.getSelectedVisualStyle()
.getVisualMappingFunction(type);
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
2010-08-10 23:32:24 UTC (rev 21295)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
2010-08-10 23:37:00 UTC (rev 21296)
@@ -46,6 +46,7 @@
import javax.swing.JComponent;
import javax.swing.SwingUtilities;
+import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.gui.VizMapGUI;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
@@ -78,8 +79,8 @@
* @param type
* DOCUMENT ME!
*/
- public GradientEditorPanel(VisualProperty<Color> type, VizMapGUI
vizMapGUI) {
- super(type, vizMapGUI);
+ public GradientEditorPanel(VisualProperty<Color> type, VizMapGUI
vizMapGUI, CyTableManager tm) {
+ super(type, vizMapGUI, tm);
iconPanel.setVisible(false);
initSlider();
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
2010-08-10 23:32:24 UTC (rev 21295)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
2010-08-10 23:37:00 UTC (rev 21296)
@@ -148,9 +148,7 @@
// if (parentValue != null) {
// ctrAttrName = parentValue.toString();
//
-// CyDataTable attr =
cyNetworkManager.getCurrentNetwork()
-//
.getCyDataTables(type.getObjectType()).get(
-//
CyNetwork.DEFAULT_ATTRS);
+// CyDataTable attr =
tableMgr.getTableMap().(type.getObjectType(),cyNetworkManager.getCurrentNetwork()).get(
CyNetwork.DEFAULT_ATTRS);
//
// final Class<?> dataClass =
attr.getColumnTypeMap().get(
// ctrAttrName);
@@ -198,8 +196,7 @@
// /*
// * Ignore if not compatible.
// */
-// final CyDataTable attrForTest =
cyNetworkManager.getCurrentNetwork()
-//
.getCyDataTables(type.getObjectType()).get(CyNetwork.DEFAULT_ATTRS);
+// final CyDataTable attrForTest =
tableMgr.getTableMap(type.getObjectType(),cyNetworkManager.getCurrentNetwork()).get(CyNetwork.DEFAULT_ATTRS);
//
// final Class<?> dataType =
attrForTest.getColumnTypeMap().get(
// ctrAttrName);
@@ -301,8 +298,7 @@
// /*
// * Need to convert this string to proper data types.
// */
-// final CyDataTable attr =
cyNetworkManager.getCurrentNetwork().getCyDataTables(type.getObjectType())
-// .get(CyNetwork.DEFAULT_ATTRS);
+// final CyDataTable attr =
tableMgr.getTableMap(type.getObjectType(),cyNetworkManager.getCurrentNetwork()).get(CyNetwork.DEFAULT_ATTRS);
// ctrAttrName = mapping.getMappingAttributeName();
//
// // Byte attrType = attr.getType(ctrAttrName);
Modified:
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
2010-08-10 23:32:24 UTC (rev 21295)
+++
core3/vizmap-gui-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi-vizmapper.xml
2010-08-10 23:37:00 UTC (rev 21296)
@@ -52,6 +52,8 @@
<!-- Event helper -->
<osgi:reference id="cyEventHelperServiceRef"
interface="org.cytoscape.event.CyEventHelper" />
+ <osgi:reference id="cyTableManagerServiceRef"
interface="org.cytoscape.model.CyTableManager" />
+
<!-- Pull-down menu items -->
<osgi:service id="createNewStyleActionService"
ref="createNewStyleAction"
interface="org.cytoscape.view.vizmap.gui.action.VizMapUIAction"
/>
--
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.
