Author: kono
Date: 2011-01-25 13:24:09 -0800 (Tue, 25 Jan 2011)
New Revision: 23610
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/AttributeSetManager.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/propertyeditor/AttributeComboBoxPropertyEditor.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/CyComboBoxPropertyEditor.java
Log:
Update method in attr combo box will be called every time user click it.
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/AttributeSetManager.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/AttributeSetManager.java
2011-01-25 21:18:50 UTC (rev 23609)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/AttributeSetManager.java
2011-01-25 21:24:09 UTC (rev 23610)
@@ -105,8 +105,10 @@
@Override
public void handleEvent(ColumnCreatedEvent e) {
+
+ final String newAttrName = e.getColumnName();
final CyTable table = e.getSource();
-
+
for (CyNetwork network : tableSets.keySet()) {
Map<Class<? extends CyTableEntry>, Set<CyTable>> tMap =
tableSets.get(network);
for (final Class<? extends CyTableEntry> objectType :
GRAPH_OBJECTS) {
@@ -118,8 +120,8 @@
.get(network)
.get(objectType)
.getAttrMap()
- .put(e.getColumnName(),
-
table.getType(e.getColumnName()));
+ .put(newAttrName,
+
table.getType(newAttrName));
return;
}
}
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
2011-01-25 21:18:50 UTC (rev 23609)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/EditorManagerImpl.java
2011-01-25 21:24:09 UTC (rev 23610)
@@ -102,9 +102,9 @@
attrComboBoxEditors = new HashMap<Class<?>, ListEditor>();
- final AttributeComboBoxPropertyEditor nodeAttrEditor = new
AttributeComboBoxPropertyEditor(CyNode.class, attrManager);
- final AttributeComboBoxPropertyEditor edgeAttrEditor = new
AttributeComboBoxPropertyEditor(CyEdge.class, attrManager);
- final AttributeComboBoxPropertyEditor networkAttrEditor = new
AttributeComboBoxPropertyEditor(CyNetwork.class, attrManager);
+ final AttributeComboBoxPropertyEditor nodeAttrEditor = new
AttributeComboBoxPropertyEditor(CyNode.class, attrManager, appManager);
+ final AttributeComboBoxPropertyEditor edgeAttrEditor = new
AttributeComboBoxPropertyEditor(CyEdge.class, attrManager, appManager);
+ final AttributeComboBoxPropertyEditor networkAttrEditor = new
AttributeComboBoxPropertyEditor(CyNetwork.class, attrManager, appManager);
attrComboBoxEditors.put(nodeAttrEditor.getTargetObjectType(),
nodeAttrEditor);
attrComboBoxEditors.put(edgeAttrEditor.getTargetObjectType(),
edgeAttrEditor);
attrComboBoxEditors.put(networkAttrEditor.getTargetObjectType(),
networkAttrEditor);
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
2011-01-25 21:18:50 UTC (rev 23609)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/AttributeComboBoxPropertyEditor.java
2011-01-25 21:24:09 UTC (rev 23610)
@@ -1,9 +1,20 @@
package org.cytoscape.view.vizmap.gui.internal.editor.propertyeditor;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+
import javax.swing.JComboBox;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyTableEntry;
+import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.session.events.SetCurrentNetworkViewEvent;
import org.cytoscape.session.events.SetCurrentNetworkViewListener;
import org.cytoscape.view.model.CyNetworkView;
@@ -30,10 +41,18 @@
private final AttributeSetManager attrManager;
public AttributeComboBoxPropertyEditor(final Class<? extends
CyTableEntry> type,
- final AttributeSetManager attrManager) {
-
+ final AttributeSetManager attrManager, final
CyApplicationManager appManager) {
+ super();
this.attrManager = attrManager;
this.type = type;
+
+ final JComboBox comboBox = (JComboBox) editor;
+ comboBox.addActionListener(new ActionListener(){
+
+ @Override
+ public void actionPerformed(ActionEvent arg0) {
+ updateComboBox(appManager.getCurrentNetwork());
+ }});
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/CyComboBoxPropertyEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/CyComboBoxPropertyEditor.java
2011-01-25 21:18:50 UTC (rev 23609)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/CyComboBoxPropertyEditor.java
2011-01-25 21:24:09 UTC (rev 23610)
@@ -68,6 +68,7 @@
final JComboBox combo = (JComboBox) editor;
combo.setRenderer(new Renderer());
+
combo.addPopupMenuListener(new PopupMenuListener() {
public void popupMenuCanceled(PopupMenuEvent e) {
}
@@ -103,7 +104,6 @@
}
});
combo.setSelectedIndex(-1);
-
}
/**
--
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.
