Author: mes
Date: 2010-09-09 09:48:58 -0700 (Thu, 09 Sep 2010)
New Revision: 21772
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/AttributeEventsListener.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
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/VizMapPropertySheetMouseAdapter.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.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/bypass/BypassHack.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/EdgeBypass.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/NodeBypass.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/VizMapBypass.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.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/propertyeditor/AttributeComboBoxPropertyEditor.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
Log:
Changed CyDataTable name to CyTable
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/AttributeEventsListener.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/AttributeEventsListener.java
2010-09-09 16:48:51 UTC (rev 21771)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/AttributeEventsListener.java
2010-09-09 16:48:58 UTC (rev 21772)
@@ -4,7 +4,7 @@
import java.util.Collections;
import java.util.List;
-import org.cytoscape.model.CyDataTable;
+import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyRow;
import org.cytoscape.model.events.ColumnCreatedEvent;
@@ -17,7 +17,7 @@
private CyComboBoxPropertyEditor propEditor;
private Class<?> filter;
- private final CyDataTable attr;
+ private final CyTable attr;
private CyNetworkManager cyNetworkManager;
private static final String NAME = "name";
@@ -26,10 +26,10 @@
* Constructor.
*
* @param cyAttributes
- * CyDataTable
+ * CyTable
*/
public AttributeEventsListener(CyComboBoxPropertyEditor propEditor,
Class<?> filter,
- CyDataTable attributes, CyNetworkManager
cyNetworkManager) {
+ CyTable attributes, CyNetworkManager cyNetworkManager) {
this.attr = attributes;
this.filter = filter;
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
2010-09-09 16:48:51 UTC (rev 21771)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewEditorImpl.java
2010-09-09 16:48:58 UTC (rev 21772)
@@ -34,9 +34,9 @@
*/
package org.cytoscape.view.vizmap.gui.internal;
-import static org.cytoscape.model.GraphObject.EDGE;
-import static org.cytoscape.model.GraphObject.NETWORK;
-import static org.cytoscape.model.GraphObject.NODE;
+import static org.cytoscape.model.CyTableEntry.EDGE;
+import static org.cytoscape.model.CyTableEntry.NETWORK;
+import static org.cytoscape.model.CyTableEntry.NODE;
import java.awt.Color;
import java.awt.Component;
@@ -69,7 +69,7 @@
import javax.swing.SwingUtilities;
import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.GraphObject;
+import org.cytoscape.model.CyTableEntry;
import org.cytoscape.session.CyNetworkManager;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
@@ -478,9 +478,9 @@
public void ActionPerformed(ActionEvent
e) {
boolean lock = false;
- if
(vp.getObjectType().equals(GraphObject.NETWORK)) {
+ if
(vp.getObjectType().equals(CyTableEntry.NETWORK)) {
lock =
((View<CyNetwork>)networkView).isValueLocked(vp);
- } else if
(vp.getObjectType().equals(GraphObject.NODE)) {
+ } else if
(vp.getObjectType().equals(CyTableEntry.NODE)) {
}
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-09-09 16:48:51 UTC (rev 21771)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
2010-09-09 16:48:58 UTC (rev 21772)
@@ -35,8 +35,8 @@
package org.cytoscape.view.vizmap.gui.internal;
-import static org.cytoscape.model.GraphObject.EDGE;
-import static org.cytoscape.model.GraphObject.NODE;
+import static org.cytoscape.model.CyTableEntry.EDGE;
+import static org.cytoscape.model.CyTableEntry.NODE;
import java.beans.PropertyEditor;
import java.util.ArrayList;
@@ -50,9 +50,9 @@
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableCellRenderer;
-import org.cytoscape.model.CyDataTable;
+import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.GraphObject;
+import org.cytoscape.model.CyTableEntry;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.VisualMappingFunction;
@@ -146,8 +146,8 @@
.getEditorFactory()).registerEditor(mappingHeader,
editorFactory.getDefaultComboBoxEditor("mappingTypeEditor"));
- CyDataTable attr = null;
- Iterator<? extends GraphObject> it = null;
+ CyTable attr = null;
+ Iterator<? extends CyTableEntry> it = null;
if (targetNetwork == null)
return null;
@@ -225,7 +225,7 @@
VizMapperProperty<K> oneProperty;
while (it.hasNext()) {
- GraphObject go = it.next();
+ CyTableEntry go = it.next();
Class<?> attrClass =
attr.getColumnTypeMap().get(attrName);
id = go.attrs().get("name", String.class);
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-09-09 16:48:51 UTC (rev 21771)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetBuilder.java
2010-09-09 16:48:58 UTC (rev 21772)
@@ -1,8 +1,8 @@
package org.cytoscape.view.vizmap.gui.internal;
-import static org.cytoscape.model.GraphObject.EDGE;
-import static org.cytoscape.model.GraphObject.NETWORK;
-import static org.cytoscape.model.GraphObject.NODE;
+import static org.cytoscape.model.CyTableEntry.EDGE;
+import static org.cytoscape.model.CyTableEntry.NETWORK;
+import static org.cytoscape.model.CyTableEntry.NODE;
import java.awt.Color;
import java.awt.Font;
@@ -422,7 +422,7 @@
// Attribute Names
final List<String> names = new ArrayList<String>();
//
-// CyDataTable attr = /* TODO
*/getTargetNetwork().getNodeCyDataTables()
+// CyTable attr = /* TODO
*/getTargetNetwork().getNodeCyDataTables()
// .get(CyNetwork.DEFAULT_ATTRS);
//
// // TODO remove the next line too!
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetMouseAdapter.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetMouseAdapter.java
2010-09-09 16:48:51 UTC (rev 21771)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetMouseAdapter.java
2010-09-09 16:48:58 UTC (rev 21772)
@@ -35,8 +35,8 @@
package org.cytoscape.view.vizmap.gui.internal;
-import static org.cytoscape.model.GraphObject.EDGE;
-import static org.cytoscape.model.GraphObject.NODE;
+import static org.cytoscape.model.CyTableEntry.EDGE;
+import static org.cytoscape.model.CyTableEntry.NODE;
import java.awt.Rectangle;
import java.awt.event.MouseAdapter;
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2010-09-09 16:48:51 UTC (rev 21771)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2010-09-09 16:48:58 UTC (rev 21772)
@@ -358,7 +358,7 @@
}
/*
- * private Set<Object> loadKeys(final String attrName, final CyDataTable
+ * private Set<Object> loadKeys(final String attrName, final CyTable
* attrs, final MappingCalculator mapping, final int nOre) { if
* (attrName.equals("ID")) { return loadID(nOre); }
*
@@ -552,7 +552,7 @@
* (commented out) I'll leave it here -- abeld private Set<Object>
* loadID(final int nOre) { Set<Object> ids = new TreeSet<Object>();
*
- * List<? extends GraphObject> obj;
+ * List<? extends CyTableEntry> obj;
*
* if (nOre == MappingCalculator.NODE_MAPPING) { obj =
* cyNetworkManager.getCurrentNetworkView
@@ -560,7 +560,7 @@
* cyNetworkManager.getCurrentNetworkView
* ().getGraphPerspective().getEdgeList(); }
*
- * for (GraphObject o : obj) { ids.add(o.attrs().get("name",
String.class));
+ * for (CyTableEntry o : obj) { ids.add(o.attrs().get("name",
String.class));
* }
*
* return ids; }
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-09-09 16:48:51 UTC (rev 21771)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/EditSelectedCellAction.java
2010-09-09 16:48:58 UTC (rev 21772)
@@ -38,7 +38,7 @@
import java.awt.event.ActionEvent;
-import org.cytoscape.model.CyDataTable;
+import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.model.VisualProperty;
@@ -106,7 +106,7 @@
* Extract calculator
*/
final VisualMappingFunction<?, ?> mapping;
- final CyDataTable attr;
+ final CyTable attr;
final CyNetwork targetNetwork =
cyNetworkManager.getCurrentNetwork();
mapping =
vizMapGUI.getSelectedVisualStyle().getVisualMappingFunction(vp);
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-09-09 16:48:51 UTC (rev 21771)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/GenerateSeriesAction.java
2010-09-09 16:48:58 UTC (rev 21772)
@@ -64,7 +64,7 @@
//
// if (vp != null && oMap != null) {
//
-// final CyDataTable attr =
tableMgr.getTableMap(vp.getObjectType(),targetNetwork).get(
+// final CyTable 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-09-09 16:48:51 UTC (rev 21771)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/GenerateValueAction.java
2010-09-09 16:48:58 UTC (rev 21772)
@@ -44,7 +44,7 @@
import javax.swing.JOptionPane;
-import org.cytoscape.model.CyDataTable;
+import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.model.CyNetworkView;
@@ -103,7 +103,7 @@
final long seed = System.currentTimeMillis();
final Random rand = new Random(seed);
- final CyDataTable attr;
+ final CyTable attr;
attr = tableMgr.getTableMap(type.getObjectType(),
cyNetworkManager.getCurrentNetwork()).get(CyNetwork.DEFAULT_ATTRS);
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-09-09 16:48:51 UTC (rev 21771)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/action/ModifyBrightnessAction.java
2010-09-09 16:48:58 UTC (rev 21772)
@@ -34,7 +34,7 @@
*/
package org.cytoscape.view.vizmap.gui.internal.action;
-import static org.cytoscape.model.GraphObject.NODE;
+import static org.cytoscape.model.CyTableEntry.NODE;
import java.awt.Color;
import java.awt.event.ActionEvent;
@@ -44,7 +44,7 @@
import java.util.Set;
import java.util.TreeSet;
-import org.cytoscape.model.CyDataTable;
+import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.model.VisualProperty;
@@ -110,7 +110,7 @@
final VisualStyle vs = this.vizMapperMainPanel
.getSelectedVisualStyle();
- final CyDataTable attr =
tableMgr.getTableMap(type.getObjectType(),
targetNetwork).get(CyNetwork.DEFAULT_ATTRS);
+ final CyTable 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/bypass/BypassHack.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/BypassHack.java
2010-09-09 16:48:51 UTC (rev 21771)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/BypassHack.java
2010-09-09 16:48:58 UTC (rev 21772)
@@ -37,7 +37,7 @@
*/
package org.cytoscape.view.vizmap.gui.internal.bypass;
-import org.cytoscape.model.GraphObject;
+import org.cytoscape.model.CyTableEntry;
/**
* ARgh. This is a horrible, horrible hack that allows LabelPosition to
@@ -51,13 +51,13 @@
* This should be handled in a completely different way in the future.
*/
public class BypassHack {
- private static GraphObject curr = null;
+ private static CyTableEntry curr = null;
- static void setCurrentObject(GraphObject o) {
+ static void setCurrentObject(CyTableEntry o) {
curr = o;
}
- public static GraphObject getCurrentObject() {
+ public static CyTableEntry getCurrentObject() {
return curr;
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/EdgeBypass.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/EdgeBypass.java
2010-09-09 16:48:51 UTC (rev 21771)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/EdgeBypass.java
2010-09-09 16:48:58 UTC (rev 21772)
@@ -36,7 +36,7 @@
*/
package org.cytoscape.view.vizmap.gui.internal.bypass;
-import static org.cytoscape.model.GraphObject.EDGE;
+import static org.cytoscape.model.CyTableEntry.EDGE;
import java.util.ArrayList;
import java.util.List;
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/NodeBypass.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/NodeBypass.java
2010-09-09 16:48:51 UTC (rev 21771)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/NodeBypass.java
2010-09-09 16:48:58 UTC (rev 21772)
@@ -36,7 +36,7 @@
*/
package org.cytoscape.view.vizmap.gui.internal.bypass;
-import static org.cytoscape.model.GraphObject.NODE;
+import static org.cytoscape.model.CyTableEntry.NODE;
import java.util.ArrayList;
import java.util.List;
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/VizMapBypass.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/VizMapBypass.java
2010-09-09 16:48:51 UTC (rev 21771)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/VizMapBypass.java
2010-09-09 16:48:58 UTC (rev 21772)
@@ -45,7 +45,7 @@
import javax.swing.JMenuItem;
import org.cytoscape.model.CyRow;
-import org.cytoscape.model.GraphObject;
+import org.cytoscape.model.CyTableEntry;
import org.cytoscape.view.model.RootVisualLexicon;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.VisualMappingManager;
@@ -58,7 +58,7 @@
*/
abstract class VizMapBypass {
protected VisualMappingManager vmm;
- protected GraphObject graphObj = null;
+ protected CyTableEntry graphObj = null;
abstract protected List<String> getBypassNames();
@@ -123,7 +123,7 @@
//TODO: what's the replacement?
// String val =
ObjectToString.getStringValue(obj);
-// CyDataTable table =
graphObj.attrs().getDataTable();
+// CyTable table =
graphObj.attrs().getDataTable();
//
// if
(!table.getColumnTypeMap().containsKey(type.getDisplayName()))
//
table.createColumn(type.getDisplayName(), String.class, false);
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
2010-09-09 16:48:51 UTC (rev 21771)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
2010-09-09 16:48:58 UTC (rev 21772)
@@ -39,7 +39,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.cytoscape.model.CyDataTable;
+import org.cytoscape.model.CyTable;
import org.cytoscape.model.events.ColumnCreatedEvent;
import org.cytoscape.model.events.ColumnCreatedListener;
import org.cytoscape.model.events.ColumnDeletedEvent;
@@ -256,7 +256,7 @@
return (ValueEditor<V>) this.valueEditors.get(dataType);
}
- public PropertyEditor getDataTableComboBoxEditor(CyDataTable table,
+ public PropertyEditor getDataTableComboBoxEditor(CyTable table,
String editorName) {
PropertyEditor editor = comboBoxEditors.get(editorName);
if (editor == null) {
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-09-09 16:48:51 UTC (rev 21771)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
2010-09-09 16:48:58 UTC (rev 21772)
@@ -52,7 +52,7 @@
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
-import org.cytoscape.model.CyDataTable;
+import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.view.model.VisualProperty;
@@ -382,7 +382,7 @@
private void initRangeValues() {
// Attribute to be mapped.
- final CyDataTable attrs;
+ final CyTable attrs;
attrs =
tableMgr.getTableMap(type.getObjectType(),cyNetworkManager.getCurrentNetwork()).get(CyNetwork.DEFAULT_ATTRS);
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/AttributeComboBoxPropertyEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/AttributeComboBoxPropertyEditor.java
2010-09-09 16:48:51 UTC (rev 21771)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/AttributeComboBoxPropertyEditor.java
2010-09-09 16:48:58 UTC (rev 21772)
@@ -7,7 +7,7 @@
import javax.swing.JComboBox;
-import org.cytoscape.model.CyDataTable;
+import org.cytoscape.model.CyTable;
import org.cytoscape.model.events.ColumnCreatedEvent;
import org.cytoscape.model.events.ColumnCreatedListener;
import org.cytoscape.model.events.ColumnDeletedEvent;
@@ -17,13 +17,13 @@
implements ColumnDeletedListener, ColumnCreatedListener {
private Class<?> filter;
- private CyDataTable attributes;
+ private CyTable attributes;
- public AttributeComboBoxPropertyEditor(final CyDataTable attributes) {
+ public AttributeComboBoxPropertyEditor(final CyTable attributes) {
this(attributes, Object.class);
}
- public AttributeComboBoxPropertyEditor(final CyDataTable attributes,
+ public AttributeComboBoxPropertyEditor(final CyTable attributes,
final Class<?> filter) {
super();
this.attributes = attributes;
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-09-09 16:48:51 UTC (rev 21771)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
2010-09-09 16:48:58 UTC (rev 21772)
@@ -41,7 +41,7 @@
import javax.swing.JOptionPane;
-import org.cytoscape.model.CyDataTable;
+import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.vizmap.VisualMappingFunction;
@@ -148,7 +148,7 @@
// if (parentValue != null) {
// ctrAttrName = parentValue.toString();
//
-// CyDataTable attr =
tableMgr.getTableMap().(type.getObjectType(),cyNetworkManager.getCurrentNetwork()).get(
CyNetwork.DEFAULT_ATTRS);
+// CyTable attr =
tableMgr.getTableMap().(type.getObjectType(),cyNetworkManager.getCurrentNetwork()).get(
CyNetwork.DEFAULT_ATTRS);
//
// final Class<?> dataClass =
attr.getColumnTypeMap().get(
// ctrAttrName);
@@ -196,7 +196,7 @@
// /*
// * Ignore if not compatible.
// */
-// final CyDataTable attrForTest =
tableMgr.getTableMap(type.getObjectType(),cyNetworkManager.getCurrentNetwork()).get(CyNetwork.DEFAULT_ATTRS);
+// final CyTable attrForTest =
tableMgr.getTableMap(type.getObjectType(),cyNetworkManager.getCurrentNetwork()).get(CyNetwork.DEFAULT_ATTRS);
//
// final Class<?> dataType =
attrForTest.getColumnTypeMap().get(
// ctrAttrName);
@@ -298,7 +298,7 @@
// /*
// * Need to convert this string to proper data types.
// */
-// final CyDataTable attr =
tableMgr.getTableMap(type.getObjectType(),cyNetworkManager.getCurrentNetwork()).get(CyNetwork.DEFAULT_ATTRS);
+// final CyTable attr =
tableMgr.getTableMap(type.getObjectType(),cyNetworkManager.getCurrentNetwork()).get(CyNetwork.DEFAULT_ATTRS);
// ctrAttrName = mapping.getMappingAttributeName();
//
// // Byte attrType = attr.getType(ctrAttrName);
--
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.
