Author: kono
Date: 2010-07-16 18:04:33 -0700 (Fri, 16 Jul 2010)
New Revision: 20956
Modified:
coreplugins/trunk/browser/src/browser/AttributeBrowser.java
coreplugins/trunk/browser/src/browser/ui/AttributeBrowserToolBar.java
coreplugins/trunk/browser/src/browser/ui/CyAttributeBrowserTable.java
Log:
GUI component sizes are tweaked. Column resize problem for network attribute
browser has been fixed.
Modified: coreplugins/trunk/browser/src/browser/AttributeBrowser.java
===================================================================
--- coreplugins/trunk/browser/src/browser/AttributeBrowser.java 2010-07-16
23:11:13 UTC (rev 20955)
+++ coreplugins/trunk/browser/src/browser/AttributeBrowser.java 2010-07-17
01:04:33 UTC (rev 20956)
@@ -82,6 +82,8 @@
*/
public class AttributeBrowser implements TableColumnModelListener {
+ private static final Dimension PANEL_SIZE = new Dimension(400, 300);
+
protected static Object pcsO = new Object();
protected static PropertyChangeSupport pcs = new
SwingPropertyChangeSupport(pcsO);
@@ -94,9 +96,7 @@
final PropertyChangeEvent e = new PropertyChangeEvent(pcsO,
property_type, old_value, new_value);
getPropertyChangeSupport().firePropertyChange(e);
}
- /**
- *
- */
+
public static final String ID = "ID";
/**
@@ -189,7 +189,7 @@
// the attribute table display: CytoPanel 2, horizontal SOUTH
panel.
mainPanel = new JPanel();
mainPanel.setLayout(new BorderLayout());
- mainPanel.setPreferredSize(new Dimension(400, 200));
+ mainPanel.setPreferredSize(PANEL_SIZE);
mainPanel.setBorder(null);
// If this is a network attribute browser, do not allow to swap
Modified: coreplugins/trunk/browser/src/browser/ui/AttributeBrowserToolBar.java
===================================================================
--- coreplugins/trunk/browser/src/browser/ui/AttributeBrowserToolBar.java
2010-07-16 23:11:13 UTC (rev 20955)
+++ coreplugins/trunk/browser/src/browser/ui/AttributeBrowserToolBar.java
2010-07-17 01:04:33 UTC (rev 20956)
@@ -80,6 +80,9 @@
* Define toolbar for Attribute Browser.
*/
public class AttributeBrowserToolBar extends JPanel implements
PopupMenuListener {
+
+ private static final long serialVersionUID = -508393701912596399L;
+
private final CyAttributes attributes;
private DataTableModel tableModel;
private final JTable table;
@@ -106,7 +109,7 @@
private JMenuItem jMenuItemFloatingPointListAttribute = null;
private JMenuItem jMenuItemBooleanListAttribute = null;
- private JToolBar jToolBar = null;
+ private JToolBar browserToolBar = null;
private JButton selectButton = null;
private CheckBoxJList attributeList = null;
private JList attrDeletionList = null;
@@ -121,8 +124,7 @@
public AttributeBrowserToolBar(final DataTableModel tableModel, final
CyAttributeBrowserTable table,
final AttributeModel a_model, final
List<String> orderedCol,
- final DataObjectType graphObjectType)
- {
+ final DataObjectType graphObjectType) {
super();
this.tableModel = tableModel;
@@ -140,7 +142,7 @@
private void initializeGUI() {
this.setLayout(new BorderLayout());
- this.setPreferredSize(new java.awt.Dimension(210, 29));
+ this.setPreferredSize(new Dimension(210, 32));
this.add(getJToolBar(), java.awt.BorderLayout.CENTER);
getAttributeSelectionPopupMenu();
@@ -191,7 +193,7 @@
private JScrollPane getJScrollPane() {
if (jScrollPane == null) {
jScrollPane = new JScrollPane();
- jScrollPane.setPreferredSize(new Dimension(300, 200));
+ jScrollPane.setPreferredSize(new Dimension(600, 300));
jScrollPane.setViewportView(getSelectedAttributeList());
}
@@ -377,20 +379,20 @@
* @return javax.swing.JToolBar
*/
private JToolBar getJToolBar() {
- if (jToolBar == null) {
- jToolBar = new JToolBar();
- jToolBar.addMouseListener(new MouseAdapter() {
+ if (browserToolBar == null) {
+ browserToolBar = new JToolBar();
+ browserToolBar.addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent e) {
AttributeBrowser.getPropertyChangeSupport().firePropertyChange(AttributeBrowser.CLEAR_INTERNAL_SELECTION,
null, objectType);
}
});
- jToolBar.setMargin(new java.awt.Insets(0, 0, 0, 0));
- jToolBar.setPreferredSize(new java.awt.Dimension(200,
28));
- jToolBar.setFloatable(false);
- jToolBar.setOrientation(JToolBar.HORIZONTAL);
+ browserToolBar.setMargin(new java.awt.Insets(0, 0, 3,
0));
+ browserToolBar.setPreferredSize(new Dimension(200, 30));
+ browserToolBar.setFloatable(false);
+ browserToolBar.setOrientation(JToolBar.HORIZONTAL);
- final GroupLayout buttonBarLayout = new
GroupLayout(jToolBar);
- jToolBar.setLayout(buttonBarLayout);
+ final GroupLayout buttonBarLayout = new
GroupLayout(browserToolBar);
+ browserToolBar.setLayout(buttonBarLayout);
// Layout information.
if (objectType == NODES) {
@@ -565,7 +567,7 @@
}
}
- return jToolBar;
+ return browserToolBar;
}
/**
@@ -745,7 +747,7 @@
attributeType, tableModel);
dDialog.pack();
- dDialog.setLocationRelativeTo(jToolBar);
+ dDialog.setLocationRelativeTo(browserToolBar);
dDialog.setVisible(true);
attrModel.sortAttributes();
Modified: coreplugins/trunk/browser/src/browser/ui/CyAttributeBrowserTable.java
===================================================================
--- coreplugins/trunk/browser/src/browser/ui/CyAttributeBrowserTable.java
2010-07-16 23:11:13 UTC (rev 20955)
+++ coreplugins/trunk/browser/src/browser/ui/CyAttributeBrowserTable.java
2010-07-17 01:04:33 UTC (rev 20956)
@@ -22,8 +22,13 @@
import java.awt.Color;
import java.awt.Component;
import java.awt.Cursor;
+import java.awt.Dimension;
import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.KeyboardFocusManager;
+import java.awt.Rectangle;
import java.awt.Toolkit;
+import java.awt.Window;
import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.StringSelection;
import java.awt.event.ActionEvent;
@@ -42,21 +47,23 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.EventObject;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Properties;
-import java.util.Map.Entry;
import javax.swing.BorderFactory;
import javax.swing.JCheckBoxMenuItem;
import javax.swing.JComponent;
-import javax.swing.JLabel;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPopupMenu;
import javax.swing.JTable;
+import javax.swing.JViewport;
import javax.swing.KeyStroke;
import javax.swing.ListSelectionModel;
import javax.swing.SwingUtilities;
@@ -64,16 +71,18 @@
import javax.swing.event.ChangeEvent;
import javax.swing.event.ListSelectionEvent;
import javax.swing.table.JTableHeader;
-import javax.swing.table.TableCellRenderer;
+import javax.swing.table.TableCellEditor;
+import javax.swing.table.TableColumn;
+import javax.swing.table.TableColumnModel;
+import org.cytoscape.equations.Equation;
+
import browser.AttributeBrowser;
-import browser.AttributeBrowserPlugin;
import browser.DataObjectType;
import browser.DataTableModel;
import browser.SortTableModel;
import browser.ValidatedObjectAndEditString;
import browser.util.HyperLinkOut;
-
import cytoscape.CyNetwork;
import cytoscape.Cytoscape;
import cytoscape.CytoscapeInit;
@@ -93,22 +102,7 @@
import cytoscape.visual.GlobalAppearanceCalculator;
import cytoscape.visual.VisualMappingManager;
-import org.cytoscape.equations.Equation;
-import javax.swing.JViewport;
-import javax.swing.table.TableCellEditor;
-import java.awt.Window;
-import java.awt.Rectangle;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.KeyboardFocusManager;
-import java.util.EventObject;
-import javax.swing.table.TableColumn;
-import javax.swing.table.TableColumnModel;
-import java.util.Set;
-import java.util.Iterator;
-
-
/**
* Based on JSortTable and completely rewritten by kono
*/
@@ -196,10 +190,11 @@
// Initialize some attributes of this table
private void initialize() {
- this.setSize(400, 200);
+ this.setSize(400, 300);
this.setCellSelectionEnabled(true);
this.getPopupMenu();
this.getHeaderPopupMenu();
+
setKeyStroke();
Cytoscape.getSwingPropertyChangeSupport().addPropertyChangeListener(this);
@@ -1199,7 +1194,8 @@
tableColumn, tableRow);
}
- private void adjustColWidth(){
+ private void adjustColWidth() {
+
final HashMap<String, Integer> widthMap =
ColumnResizer.getColumnPreferredWidths(this);
// Save the width if it does not exist
@@ -1247,8 +1243,8 @@
if(ignore) return;
- if(e.getPropertyName().equals(AttributeBrowser.RESTORE_COLUMN)
&& e.getNewValue() != null && e.getNewValue().equals(objectType)) {
- //ColumnResizer.adjustColumnPreferredWidths(this);
+ if(e.getPropertyName().equals(AttributeBrowser.RESTORE_COLUMN)
&&
+ e.getNewValue() != null &&
e.getNewValue().equals(objectType)) {
this.adjustColWidth();
return;
}
@@ -1294,6 +1290,7 @@
} else {
// Network Attribute
tableModel.setTableData(null, null);
+ adjustColWidth();
}
}
@@ -1360,6 +1357,9 @@
* @param arg0 DOCUMENT ME!
*/
public void onSelectEvent(SelectEvent event) {
+ if(this.objectType.equals(NETWORK))
+ return;
+
if ((objectType == NODES)
&& ((event.getTargetType() == SelectEvent.SINGLE_NODE)
|| (event.getTargetType() == SelectEvent.NODE_SET))) {
--
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.
