Author: ruschein
Date: 2010-12-28 10:37:30 -0800 (Tue, 28 Dec 2010)
New Revision: 23271
Modified:
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/TableBrowser.java
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/ui/AttributeBrowserToolBar.java
Log:
Enabled creation of new attributes.
Modified:
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/TableBrowser.java
===================================================================
---
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/TableBrowser.java
2010-12-28 17:03:23 UTC (rev 23270)
+++
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/TableBrowser.java
2010-12-28 18:37:30 UTC (rev 23271)
@@ -32,7 +32,7 @@
private final CyEventHelper eventHelper;
private final EqnCompiler compiler;
private final BrowserTable browserTable;
- private final AttributeBrowserToolBar attributeBrowserToolBar = null;
+ private final AttributeBrowserToolBar attributeBrowserToolBar;
private BrowserTableModel browserTableModel;
private CyTable currentTable;
@@ -45,17 +45,17 @@
this.eventHelper = eventHelper;
this.compiler = compiler;
this.browserTable = new BrowserTable();
-// this.attributeBrowserToolBar = new
AttributeBrowserToolBar(browserTable);
+ this.attributeBrowserToolBar = new
AttributeBrowserToolBar(browserTable);
this.setLayout(new BorderLayout());
browserTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
final TableChooser tableChooser = new
TableChooser(tableManager);
tableChooser.addActionListener(this);
- add(tableChooser, BorderLayout.NORTH);
+ add(tableChooser, BorderLayout.SOUTH);
browserTable.getTableHeader().setBackground(Color.yellow);
add(new JScrollPane(browserTable), BorderLayout.CENTER);
-// add(attributeBrowserToolBar, BorderLayout.NORTH);
+ add(attributeBrowserToolBar, BorderLayout.NORTH);
}
/**
@@ -99,7 +99,7 @@
serviceRegistrar.registerAllServices(browserTableModel,
new Properties());
browserTable.setModel(browserTableModel);
browserTable.setRowSorter(new
TableRowSorter(browserTableModel));
-// attributeBrowserToolBar.setAttrs(table);
+ attributeBrowserToolBar.setAttrs(table);
}
}
}
\ No newline at end of file
Modified:
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/ui/AttributeBrowserToolBar.java
===================================================================
---
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/ui/AttributeBrowserToolBar.java
2010-12-28 17:03:23 UTC (rev 23270)
+++
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/ui/AttributeBrowserToolBar.java
2010-12-28 18:37:30 UTC (rev 23271)
@@ -77,7 +77,7 @@
*/
private JPopupMenu attributeSelectionPopupMenu = null;
private JScrollPane jScrollPane = null;
- private JPopupMenu jPopupMenu1 = null;
+ private JPopupMenu jPopupMenu = null;
private JMenuItem jMenuItemStringAttribute = null;
private JMenuItem jMenuItemIntegerAttribute = null;
@@ -114,6 +114,7 @@
public void setAttrs(final CyTable attrs) {
this.attrs = attrs;
+ createNewAttributeButton.setEnabled(attrs != null);
}
private void initializeGUI() {
@@ -123,7 +124,7 @@
this.add(getJToolBar(), java.awt.BorderLayout.CENTER);
// getAttributeSelectionPopupMenu();
- getJPopupMenu1();
+ getJPopupMenu();
// modDialog = new ModDialog(tableModel, objectType,
Cytoscape.getDesktop());
// attrModButton.setVisible(objectType != NETWORK);
@@ -170,26 +171,26 @@
*/
/**
- * This method initializes jPopupMenu1
+ * This method initializes jPopupMenu
*
* @return javax.swing.JPopupMenu
*/
- private JPopupMenu getJPopupMenu1() {
- if (jPopupMenu1 == null) {
- jPopupMenu1 = new JPopupMenu();
- jPopupMenu1.add(getJMenuItemIntegerAttribute());
- jPopupMenu1.add(getJMenuItemLongIntegerAttribute());
- jPopupMenu1.add(getJMenuItemStringAttribute());
- jPopupMenu1.add(getJMenuItemFloatingPointAttribute());
- jPopupMenu1.add(getJMenuItemBooleanAttribute());
- jPopupMenu1.add(getJMenuItemIntegerListAttribute());
- jPopupMenu1.add(getJMenuItemLongIntegerListAttribute());
- jPopupMenu1.add(getJMenuItemStringListAttribute());
-
jPopupMenu1.add(getJMenuItemFloatingPointListAttribute());
- jPopupMenu1.add(getJMenuItemBooleanListAttribute());
+ private JPopupMenu getJPopupMenu() {
+ if (jPopupMenu == null) {
+ jPopupMenu = new JPopupMenu();
+ jPopupMenu.add(getJMenuItemIntegerAttribute());
+ jPopupMenu.add(getJMenuItemLongIntegerAttribute());
+ jPopupMenu.add(getJMenuItemStringAttribute());
+ jPopupMenu.add(getJMenuItemFloatingPointAttribute());
+ jPopupMenu.add(getJMenuItemBooleanAttribute());
+ jPopupMenu.add(getJMenuItemIntegerListAttribute());
+ jPopupMenu.add(getJMenuItemLongIntegerListAttribute());
+ jPopupMenu.add(getJMenuItemStringListAttribute());
+
jPopupMenu.add(getJMenuItemFloatingPointListAttribute());
+ jPopupMenu.add(getJMenuItemBooleanListAttribute());
}
- return jPopupMenu1;
+ return jPopupMenu;
}
/**
@@ -241,7 +242,7 @@
jMenuItemLongIntegerAttribute.setText("Long Integer
Attribute");
jMenuItemLongIntegerAttribute.addActionListener(new
java.awt.event.ActionListener() {
public void
actionPerformed(java.awt.event.ActionEvent e) {
-
createNewAttribute("LongInteger");
+ createNewAttribute("Long
Integer");
}
});
}
@@ -407,6 +408,7 @@
buttonBarLayout.setHorizontalGroup(buttonBarLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
.addGroup(buttonBarLayout.createSequentialGroup()
.addPreferredGap(ComponentPlacement.RELATED)
+
/*
.addComponent(getSelectButton())
.addPreferredGap(ComponentPlacement.RELATED)
*/
@@ -786,9 +788,11 @@
createNewAttributeButton.setIcon(new
javax.swing.ImageIcon(getClass().getClassLoader().getResource("images/stock_new.png")));
createNewAttributeButton.addMouseListener(new
java.awt.event.MouseAdapter() {
public void
mouseClicked(java.awt.event.MouseEvent e) {
-
jPopupMenu1.show(e.getComponent(), e.getX(), e.getY());
+ if (attrs != null)
+
jPopupMenu.show(e.getComponent(), e.getX(), e.getY());
}
});
+ createNewAttributeButton.setEnabled(false);
}
return createNewAttributeButton;
@@ -820,7 +824,7 @@
attrs.createColumn(newAttribName, Double.class);
else if (type.equals("Integer"))
attrs.createColumn(newAttribName, Integer.class);
- else if (type.equals("Long"))
+ else if (type.equals("Long Integer"))
attrs.createColumn(newAttribName, Long.class);
else if (type.equals("Boolean"))
attrs.createColumn(newAttribName, Boolean.class);
--
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.
