Author: pwang
Date: 2011-04-08 15:14:09 -0700 (Fri, 08 Apr 2011)
New Revision: 24727
Modified:
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/CytoscapeToolBar.java
Log:
Support to add ToolBarComponent
Modified:
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/CytoscapeToolBar.java
===================================================================
---
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/CytoscapeToolBar.java
2011-04-08 22:12:15 UTC (rev 24726)
+++
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/CytoscapeToolBar.java
2011-04-08 22:14:09 UTC (rev 24727)
@@ -100,12 +100,12 @@
int addInd = getInsertLocation(action.getToolbarGravity());
orderedList.add(addInd, button);
- addButtons();
+ addComponents();
return true;
}
- private void addButtons() {
+ private void addComponents() {
removeAll();
for ( Object o : orderedList) {
if ( o instanceof JButton ) {
@@ -113,6 +113,9 @@
} else if ( o instanceof Float ) {
addSeparator();
}
+ else if (o instanceof ToolBarComponent){
+ add(((ToolBarComponent)o).getComponent());
+ }
}
validate();
}
@@ -155,28 +158,24 @@
return true;
}
- public JToolBar getJToolBar() {
- return this;
- }
-
// use by toolbar updater to keep things properly enabled/disabled
Collection<CyAction> getAllToolBarActions() {
return actionButtonMap.keySet();
}
-
- public void addToolBarComponent(ToolBarComponent tp){
-
-
//System.out.println("CytoscapeToolBar.addToolBarComponent()....tp.getComponent()
="+ tp.getComponent());
-
- //add(tp.getComponent());
+ public void addToolBarComponent(ToolBarComponent tbc){
+ componentGravity.put(tbc,tbc.getToolBarGravity());
+ int addInd = getInsertLocation(tbc.getToolBarGravity());
+ orderedList.add(addInd, tbc);
+ addComponents();
}
- public void removeToolBarComponent(ToolBarComponent tp){
-
-
//System.out.println("CytoscapeToolBar.removeToolBarComponent()....tp.getComponent()
="+ tp.getComponent());
-
- //remove(tp.getComponent());
+ public void removeToolBarComponent(ToolBarComponent tbc){
+ if (tbc != null){
+ this.componentGravity.remove(tbc);
+ this.orderedList.remove(tbc);
+ this.remove(tbc.getComponent());
+ this.repaint();
+ }
}
-
}
--
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.
