Author: kono
Date: 2011-10-05 17:30:23 -0700 (Wed, 05 Oct 2011)
New Revision: 27080
Added:
core3/impl/trunk/table-browser-impl/src/main/resources/images/about_icon.txt
core3/impl/trunk/table-browser-impl/src/main/resources/images/table_selection_mode.png
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AbstractTableBrowser.java
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AttributeBrowserToolBar.java
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/DefaultTableBrowser.java
Log:
Start adding new Selection Mode. (Not working yet.)
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AbstractTableBrowser.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AbstractTableBrowser.java
2011-10-06 00:27:14 UTC (rev 27079)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AbstractTableBrowser.java
2011-10-06 00:30:23 UTC (rev 27080)
@@ -41,7 +41,7 @@
private static final long serialVersionUID = 1968196123280466989L;
- static final Dimension SELECTOR_SIZE = new Dimension(350, 20);
+ static final Dimension SELECTOR_SIZE = new Dimension(320, 20);
// Color theme for table browser.
static final Color NETWORK_COLOR = new Color(0xA5, 0x2A, 0x2A);
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AttributeBrowserToolBar.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AttributeBrowserToolBar.java
2011-10-06 00:27:14 UTC (rev 27079)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AttributeBrowserToolBar.java
2011-10-06 00:30:23 UTC (rev 27080)
@@ -52,6 +52,7 @@
import javax.swing.JPopupMenu;
import javax.swing.JScrollPane;
import javax.swing.JTable;
+import javax.swing.JToggleButton;
import javax.swing.JToolBar;
import javax.swing.LayoutStyle.ComponentPlacement;
import javax.swing.ListSelectionModel;
@@ -72,6 +73,8 @@
private static final long serialVersionUID = -508393701912596399L;
private BrowserTableModel browserTableModel = null;
+
+ private static final Dimension TOOLBAR_SIZE = new Dimension(400, 40);
/**
* GUI components
@@ -103,13 +106,20 @@
private AttributeListModel attrListModel;
private final EquationCompiler compiler;
- //private final CyTableManager tableManager;
private final TableTaskFactory deleteTableTaskFactoryService;
private final GUITaskManager guiTaskManagerServiceRef;
+ private final JToggleButton selectionModeButton;
+
public AttributeBrowserToolBar(final CyServiceRegistrar
serviceRegistrar, final EquationCompiler compiler,
final TableTaskFactory deleteTableTaskFactoryService,
GUITaskManager guiTaskManagerServiceRef, final JComboBox tableChooser) {
+ this(serviceRegistrar, compiler, deleteTableTaskFactoryService,
guiTaskManagerServiceRef, tableChooser, new JToggleButton());
+ }
+
+ public AttributeBrowserToolBar(final CyServiceRegistrar
serviceRegistrar, final EquationCompiler compiler,
+ final TableTaskFactory deleteTableTaskFactoryService,
GUITaskManager guiTaskManagerServiceRef, final JComboBox tableChooser, final
JToggleButton selectionModeButton) {
this.compiler = compiler;
+ this.selectionModeButton = selectionModeButton;
this.tableChooser = tableChooser;
this.deleteTableTaskFactoryService =
deleteTableTaskFactoryService;
@@ -135,7 +145,6 @@
private void initializeGUI() {
this.setLayout(new BorderLayout());
- this.setPreferredSize(new Dimension(210, 32));
this.add(getJToolBar(), java.awt.BorderLayout.CENTER);
getAttributeSelectionPopupMenu();
@@ -408,7 +417,8 @@
}
});
browserToolBar.setMargin(new java.awt.Insets(0, 0, 3,
0));
- browserToolBar.setPreferredSize(new Dimension(200, 30));
+ browserToolBar.setPreferredSize(TOOLBAR_SIZE);
+ browserToolBar.setSize(TOOLBAR_SIZE);
browserToolBar.setFloatable(false);
browserToolBar.setOrientation(JToolBar.HORIZONTAL);
@@ -419,31 +429,31 @@
buttonBarLayout.setHorizontalGroup(buttonBarLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
.addGroup(buttonBarLayout.createSequentialGroup()
.addPreferredGap(ComponentPlacement.RELATED)
-
+
.addComponent(selectionModeButton)
+
.addPreferredGap(ComponentPlacement.RELATED)
.addComponent(getSelectButton())
.addPreferredGap(ComponentPlacement.RELATED)
-
.addComponent(getNewButton())
.addPreferredGap(ComponentPlacement.RELATED)
.addComponent(getSelectAllButton())
.addPreferredGap(ComponentPlacement.RELATED)
.addComponent(getUnselectAllButton())
-
.addPreferredGap(ComponentPlacement.RELATED)
.addComponent(getDeleteButton())
.addPreferredGap(ComponentPlacement.RELATED)
.addComponent(getDeleteTableButton())
.addPreferredGap(ComponentPlacement.RELATED)
-
.addComponent(getFunctionBuilderButton(), GroupLayout.PREFERRED_SIZE, 28,
-
GroupLayout.PREFERRED_SIZE)
+
.addComponent(getFunctionBuilderButton())
.addPreferredGap(ComponentPlacement.RELATED)
.addComponent(this.tableChooser)));
buttonBarLayout.setVerticalGroup(buttonBarLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-
.addComponent(selectButton,
+
.addComponent(selectionModeButton, javax.swing.GroupLayout.Alignment.CENTER,
+
javax.swing.GroupLayout.DEFAULT_SIZE, 27, Short.MAX_VALUE)
+
.addComponent(selectButton,
javax.swing.GroupLayout.Alignment.CENTER,
javax.swing.GroupLayout.PREFERRED_SIZE,
27,
-
javax.swing.GroupLayout.PREFERRED_SIZE)
+
Short.MAX_VALUE)
.addComponent(createNewAttributeButton,
javax.swing.GroupLayout.Alignment.CENTER,
javax.swing.GroupLayout.DEFAULT_SIZE,
@@ -465,15 +475,14 @@
javax.swing.GroupLayout.Alignment.CENTER,
javax.swing.GroupLayout.DEFAULT_SIZE,
27,
Short.MAX_VALUE)
-
.addComponent(this.tableChooser,
-
javax.swing.GroupLayout.Alignment.CENTER,
+
.addComponent(formulaBuilderButton,
+
javax.swing.GroupLayout.Alignment.CENTER,
javax.swing.GroupLayout.DEFAULT_SIZE,
27,
Short.MAX_VALUE)
-
.addGroup(buttonBarLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
-
.addComponent(formulaBuilderButton,
-
javax.swing.GroupLayout.PREFERRED_SIZE,
- 27,
-
javax.swing.GroupLayout.PREFERRED_SIZE)));
+
.addComponent(tableChooser,
+
javax.swing.GroupLayout.Alignment.CENTER,
+
javax.swing.GroupLayout.DEFAULT_SIZE,
+ 27,
Short.MAX_VALUE));
}
return browserToolBar;
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
2011-10-06 00:27:14 UTC (rev 27079)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
2011-10-06 00:30:23 UTC (rev 27080)
@@ -1,21 +1,21 @@
package org.cytoscape.browser.internal;
-import java.io.IOException;
-import java.io.StringReader;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Vector;
+import javax.swing.JOptionPane;
import javax.swing.JTable;
-import javax.swing.table.AbstractTableModel;
import javax.swing.event.TableModelEvent;
+import javax.swing.table.AbstractTableModel;
-import org.cytoscape.equations.EquationCompiler;
+import org.cytoscape.browser.util.TableBrowserUtil;
import org.cytoscape.equations.Equation;
+import org.cytoscape.equations.EquationCompiler;
import org.cytoscape.model.CyColumn;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyRow;
@@ -31,16 +31,12 @@
import org.cytoscape.model.events.RowsCreatedListener;
import org.cytoscape.model.events.RowsSetEvent;
import org.cytoscape.model.events.RowsSetListener;
-import java.util.Vector;
-import org.cytoscape.browser.util.TableBrowserUtil;
-import javax.swing.JOptionPane;
public final class BrowserTableModel extends AbstractTableModel implements
ColumnCreatedListener,
ColumnDeletedListener, ColumnNameChangedListener,
RowsSetListener, RowsCreatedListener {
private static final long serialVersionUID = -517521404005631245L;
- private static final int EOF = -1;
private static final int MAX_INITIALLY_VSIBLE_ATTRS = 10;
private final JTable table;
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/DefaultTableBrowser.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/DefaultTableBrowser.java
2011-10-06 00:27:14 UTC (rev 27079)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/DefaultTableBrowser.java
2011-10-06 00:30:23 UTC (rev 27080)
@@ -1,16 +1,20 @@
package org.cytoscape.browser.internal;
-import static
org.cytoscape.browser.internal.AbstractTableBrowser.SELECTED_ITEM_BACKGROUND_COLOR;
-
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
-import java.awt.Dimension;
+import java.awt.Insets;
import java.awt.event.ActionEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.HashSet;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JList;
+import javax.swing.JToggleButton;
import javax.swing.ListCellRenderer;
import org.cytoscape.application.CyApplicationManager;
@@ -37,6 +41,8 @@
private static final long serialVersionUID = 627394119637512735L;
+ private final JToggleButton selectionModeButton;
+
private final JComboBox networkChooser;
private final Class<? extends CyTableEntry> objType;
@@ -59,12 +65,29 @@
networkChooser.setSize(SELECTOR_SIZE);
networkChooser.setEnabled(false);
+ selectionModeButton = new JToggleButton();
+ selectionModeButton.addActionListener(this);
+ selectionModeButton.setBorder(null);
+ selectionModeButton.setMargin(new Insets(0, 0, 0, 0));
+ selectionModeButton.setIcon(new
ImageIcon(getClass().getClassLoader().getResource("images/table_selection_mode.png")));
+ selectionModeButton.setToolTipText("Change Selection Mode");
+
+ selectionModeButton.addMouseListener(new MouseAdapter() {
+ public void mouseClicked(MouseEvent e) {
+
+ }
+ });
+
+
+
this.attributeBrowserToolBar = new
AttributeBrowserToolBar(serviceRegistrar, compiler,
- deleteTableTaskFactoryService,
guiTaskManagerServiceRef, networkChooser);
+ deleteTableTaskFactoryService,
guiTaskManagerServiceRef, networkChooser, selectionModeButton);
add(attributeBrowserToolBar, BorderLayout.NORTH);
}
+
+ @Override
public void actionPerformed(final ActionEvent e) {
final CyNetwork currentNetwork =
this.applicationManager.getCurrentNetwork();
final CyNetwork network = (CyNetwork)
networkChooser.getSelectedItem();
Added:
core3/impl/trunk/table-browser-impl/src/main/resources/images/about_icon.txt
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/resources/images/about_icon.txt
(rev 0)
+++
core3/impl/trunk/table-browser-impl/src/main/resources/images/about_icon.txt
2011-10-06 00:30:23 UTC (rev 27080)
@@ -0,0 +1,5 @@
+table_selection_mode.png icon was created by:
+
+Icon Pack:Farm-Fresh Web
+Designer:FatCow Web Hosting
+License:Creative Commons Attribution (by)
\ No newline at end of file
Added:
core3/impl/trunk/table-browser-impl/src/main/resources/images/table_selection_mode.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/table-browser-impl/src/main/resources/images/table_selection_mode.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
--
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.
