Author: kono
Date: 2012-12-06 12:38:35 -0800 (Thu, 06 Dec 2012)
New Revision: 30907
Modified:
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/CyActivator.java
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/ui/PSICQUICSearchUI.java
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/ui/SourceStatusPanel.java
Log:
fixes #1536 Finalized UX based on discussion with Barry and Trey.
Modified:
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/CyActivator.java
===================================================================
---
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/CyActivator.java
2012-12-06 20:23:04 UTC (rev 30906)
+++
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/CyActivator.java
2012-12-06 20:38:35 UTC (rev 30907)
@@ -25,6 +25,13 @@
import org.osgi.framework.BundleContext;
public class CyActivator extends AbstractCyActivator {
+
+ private static final String CLIENT_DISCRIPTION = "<strong>Universal
Interaction Database Client</strong>" +
+ "<p>This is a web service client for <a
href=\"http://code.google.com/p/psicquic/\";>PSICQUIC</a>-compliant
databases.</p>" +
+ "<ul><li><a
href=\"http://code.google.com/p/psicquic/wiki/MiqlReference\";>Query language
(MIQL) Syntax</a></li>" +
+ "<li><a
href=\"http://www.ebi.ac.uk/Tools/webservices/psicquic/registry/registry?action=STATUS\";>List
of Supported Databases</a></li></ul>";
+
+
public CyActivator() {
super();
}
@@ -59,7 +66,7 @@
final PSICQUICWebServiceClient psicquicClient = new
PSICQUICWebServiceClient(
"http://www.ebi.ac.uk/Tools/webservices/psicquic/registry/registry";,
"Interaction Database Universal Client",
- "REST version of universal interaction datavase
client.", cyNetworkFactoryServiceRef, cyNetworkManagerServiceRef,
+ CLIENT_DISCRIPTION, cyNetworkFactoryServiceRef,
cyNetworkManagerServiceRef,
tm, createViewTaskFactoryServiceRef,
openBrowser, builder, vsBuilder, vmm, tagManager);
registerAllServices(bc, psicquicClient, new Properties());
Modified:
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/ui/PSICQUICSearchUI.java
===================================================================
---
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/ui/PSICQUICSearchUI.java
2012-12-06 20:23:04 UTC (rev 30906)
+++
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/ui/PSICQUICSearchUI.java
2012-12-06 20:38:35 UTC (rev 30907)
@@ -10,6 +10,7 @@
import java.awt.event.MouseEvent;
import java.util.Map;
+import javax.swing.BorderFactory;
import javax.swing.BoxLayout;
import javax.swing.JButton;
import javax.swing.JComboBox;
@@ -18,6 +19,7 @@
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.SwingUtilities;
+import javax.swing.border.Border;
import javax.swing.border.EmptyBorder;
import javax.swing.border.TitledBorder;
@@ -39,10 +41,12 @@
private static final long serialVersionUID = 3163269742016489767L;
- private static final String MIQL_REFERENCE_PAGE_URL =
"http://code.google.com/p/psicquic/wiki/MiqlReference";;
-
private static final Dimension PANEL_SIZE = new Dimension(680, 500);
-
+
+ // Preset design elements for Search Panel
+ private static final Color SEARCH_BORDER_COLOR = new Color(0x1E, 0x90,
0xFF, 200);
+ private static final Border SEARCH_BORDER =
BorderFactory.createLineBorder(SEARCH_BORDER_COLOR, 2);
+
// Color Scheme
private static final Color MIQL_COLOR = new Color(0x7f, 0xff, 0xd4);
private static final Color ID_LIST_COLOR = new Color(0xff, 0xa5, 0x00);
@@ -51,14 +55,8 @@
// Fixed messages
private static final String MIQL_MODE = "Search by Query Language
(MIQL)";
private static final String INTERACTOR_ID_LIST = "Search by ID
(gene/protein/compound ID)";
- private static final String BY_SPECIES = "Search by Species";
+ private static final String BY_SPECIES = "Search Interactome (this may
take long time)";
- private static final String MIQL_QUERY_AREA_MESSAGE_STRING = "Please
enter search query (MIQL) here. "
- + "Currently the result table shows number of all
binary interactions available in the database. "
- + "\nIf you need help, please click Syntax Help button
below.";
- private static final String INTERACTOR_LIST_AREA_MESSAGE_STRING =
"Please enter list of genes/proteins/compounds, separated by space. "
- + "Currently the result table shows number of all
binary interactions available in the database.";
-
private final RegistryManager regManager;
private final PSICQUICRestClient client;
private final TaskManager<?, ?> taskManager;
@@ -75,10 +73,12 @@
private JButton refreshButton;
private JPanel speciesPanel;
-
+
private JComboBox searchModeSelector;
private JComboBox speciesSelector;
+ private JPanel searchConditionPanel;
+
private SearchMode mode = SearchMode.MIQL;
private String searchAreaTitle = MIQL_MODE;
@@ -90,8 +90,8 @@
public PSICQUICSearchUI(final CyNetworkManager networkManager, final
RegistryManager regManager,
final PSICQUICRestClient client, final TaskManager<?,
?> tmManager,
- final CreateNetworkViewTaskFactory
createViewTaskFactory,
- final PSIMI25VisualStyleBuilder vsBuilder, final
VisualMappingManager vmm, final PSIMITagManager tagManager) {
+ final CreateNetworkViewTaskFactory
createViewTaskFactory, final PSIMI25VisualStyleBuilder vsBuilder,
+ final VisualMappingManager vmm, final PSIMITagManager
tagManager) {
this.regManager = regManager;
this.client = client;
this.taskManager = tmManager;
@@ -110,15 +110,29 @@
this.setBackground(Color.white);
this.setBorder(new EmptyBorder(10, 10, 10, 10));
+ searchConditionPanel = new JPanel();
+ searchConditionPanel.setBackground(Color.white);
+ searchConditionPanel.setLayout(new
BoxLayout(searchConditionPanel, BoxLayout.Y_AXIS));
+ final TitledBorder searchConditionPanelBorder =
BorderFactory.createTitledBorder(SEARCH_BORDER,
+ "1. Enter Search Conditions");
+ searchConditionPanelBorder.setTitleFont(STRONG_FONT);
+ searchConditionPanel.setBorder(searchConditionPanelBorder);
+
createDBlistPanel();
createQueryPanel();
createQueryModePanel();
createSpeciesPanel();
-
+
queryModeChanged();
-
+
this.setSize(PANEL_SIZE);
this.setPreferredSize(PANEL_SIZE);
+
+ searchConditionPanel.add(queryScrollPane);
+ searchConditionPanel.add(searchPanel);
+
+ this.add(searchConditionPanel);
+ this.add(statesPanel);
}
private final void createDBlistPanel() {
@@ -126,7 +140,6 @@
this.statesPanel = new SourceStatusPanel("", client,
regManager, networkManager, null, taskManager, mode,
createViewTaskFactory, vsBuilder, vmm,
tagManager);
statesPanel.enableComponents(false);
- this.add(statesPanel);
}
private final void createQueryPanel() {
@@ -136,20 +149,17 @@
queryArea = new JEditorPane();
final TitledBorder border = new TitledBorder(searchAreaTitle);
- border.setTitleColor(MIQL_COLOR);
border.setTitleFont(STRONG_FONT);
queryScrollPane.setBorder(border);
queryScrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
queryScrollPane.setPreferredSize(new Dimension(500, 150));
queryScrollPane.setViewportView(queryArea);
- this.add(queryScrollPane);
-
- queryArea.addMouseListener(new MouseAdapter() {
+ searchConditionPanel.add(queryScrollPane);
+ queryArea.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent arg0) {
- if(firstClick) {
- queryArea.setText("");
+ if (firstClick) {
firstClick = false;
searchButton.setEnabled(true);
}
@@ -168,7 +178,6 @@
this.searchModeSelector.setSelectedItem(INTERACTOR_ID_LIST);
this.searchModeSelector.addActionListener(new ActionListener() {
-
@Override
public void actionPerformed(ActionEvent e) {
queryModeChanged();
@@ -205,7 +214,7 @@
searchPanel.add(searchButton);
searchPanel.add(refreshButton);
- this.add(searchPanel);
+ searchConditionPanel.add(searchPanel);
}
private final void createSpeciesPanel() {
@@ -218,21 +227,17 @@
speciesPanel.setLayout(new BoxLayout(speciesPanel,
BoxLayout.X_AXIS));
speciesPanel.add(speciesLabel);
speciesPanel.add(speciesSelector);
-
- speciesSelector.addActionListener(new ActionListener() {
+ speciesSelector.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent arg0) {
searchButton.setEnabled(true);
}
-
});
}
-
-
+
private void refreshButtonActionPerformed() {
SwingUtilities.invokeLater(new Runnable() {
-
@Override
public void run() {
regManager.refresh();
@@ -241,31 +246,27 @@
});
}
-
private void search() {
final SearchRecoredsTask searchTask = new
SearchRecoredsTask(client, mode);
final Map<String, String> activeSource =
regManager.getActiveServices();
String query = this.queryArea.getText();
-
-
+
// Query by species
- if(mode == SearchMode.SPECIES)
+ if (mode == SearchMode.SPECIES)
query = buildSpeciesQuery();
-
-
+
statesPanel.setQuery(query);
-
searchTask.setQuery(query);
searchTask.setTargets(activeSource.values());
taskManager.execute(new TaskIterator(searchTask, new
SetTableTask(searchTask)));
}
-
+
private final String buildSpeciesQuery() {
mode = SearchMode.SPECIES;
final Object selectedItem =
this.speciesSelector.getSelectedItem();
final Species species = (Species) selectedItem;
-
+
if (species == Species.ALL) {
return "*";
} else {
@@ -284,34 +285,38 @@
@Override
public void run(TaskMonitor taskMonitor) throws Exception {
final Map<String, Long> result = searchTask.getResult();
-
+
String query;
// Query by species
- if(mode == SearchMode.SPECIES)
+ if (mode == SearchMode.SPECIES)
query = buildSpeciesQuery();
else {
query = queryArea.getText();
}
-
- statesPanel = new SourceStatusPanel(query, client,
regManager, networkManager, result,
- taskManager, mode,
createViewTaskFactory, vsBuilder, vmm, tagManager);
+
+ statesPanel = new SourceStatusPanel(query, client,
regManager, networkManager, result, taskManager, mode,
+ createViewTaskFactory, vsBuilder, vmm,
tagManager);
statesPanel.sort();
updateGUILayout();
statesPanel.enableComponents(true);
}
}
- private final void updateGUILayout() {
+ private final void updateGUILayout() {
+ searchConditionPanel.removeAll();
removeAll();
-
- add(statesPanel);
- if(mode == SearchMode.SPECIES)
- add(speciesPanel);
+
+ if (mode == SearchMode.SPECIES)
+ searchConditionPanel.add(speciesPanel);
else
- add(queryScrollPane);
-
- add(searchPanel);
-
+ searchConditionPanel.add(queryScrollPane);
+
+ searchConditionPanel.add(searchPanel);
+
+ // Add to main panel
+ this.add(searchConditionPanel);
+ this.add(statesPanel);
+
if (getRootPane() != null) {
Window parentWindow = ((Window)
getRootPane().getParent());
parentWindow.pack();
@@ -324,45 +329,31 @@
final Object selectedObject =
this.searchModeSelector.getSelectedItem();
if (selectedObject == null)
return;
-
+
final String modeString = selectedObject.toString();
- final Color borderColor;
final String query;
if (modeString.equals(MIQL_MODE)) {
mode = SearchMode.MIQL;
searchAreaTitle = MIQL_MODE;
- // speciesSelector.setEnabled(true);
- // helpButton.setEnabled(true);
- queryArea.setText(MIQL_QUERY_AREA_MESSAGE_STRING);
- borderColor = MIQL_COLOR;
query = queryArea.getText();
} else if (modeString.equals(INTERACTOR_ID_LIST)) {
mode = SearchMode.INTERACTOR;
searchAreaTitle = INTERACTOR_ID_LIST;
- // speciesSelector.setEnabled(false);
- // helpButton.setEnabled(false);
- queryArea.setText(INTERACTOR_LIST_AREA_MESSAGE_STRING);
- borderColor = ID_LIST_COLOR;
query = queryArea.getText();
} else {
mode = SearchMode.SPECIES;
searchAreaTitle = BY_SPECIES;
- borderColor = MIQL_COLOR;
query = buildSpeciesQuery();
}
firstClick = true;
- final TitledBorder border = new TitledBorder(searchAreaTitle);
- border.setTitleColor(borderColor);
- border.setTitleFont(STRONG_FONT);
- queryScrollPane.setBorder(border);
-
-
- statesPanel = new SourceStatusPanel(query, client, regManager,
networkManager, null,
- taskManager, mode, createViewTaskFactory,
vsBuilder, vmm, tagManager);
+ queryArea.setText("");
+ queryScrollPane.setBorder(BorderFactory.createEmptyBorder(5, 5,
5, 5));
+ statesPanel = new SourceStatusPanel(query, client, regManager,
networkManager, null, taskManager, mode,
+ createViewTaskFactory, vsBuilder, vmm,
tagManager);
statesPanel.sort();
-
+
updateGUILayout();
statesPanel.enableComponents(false);
searchButton.setEnabled(false);
Modified:
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/ui/SourceStatusPanel.java
===================================================================
---
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/ui/SourceStatusPanel.java
2012-12-06 20:23:04 UTC (rev 30906)
+++
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/ui/SourceStatusPanel.java
2012-12-06 20:38:35 UTC (rev 30907)
@@ -13,6 +13,7 @@
import java.util.Map;
import java.util.Set;
+import javax.swing.BorderFactory;
import javax.swing.DefaultRowSorter;
import javax.swing.GroupLayout;
import javax.swing.JButton;
@@ -23,6 +24,7 @@
import javax.swing.RowSorter;
import javax.swing.SortOrder;
import javax.swing.SwingConstants;
+import javax.swing.border.TitledBorder;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableModel;
@@ -43,7 +45,8 @@
private static final long serialVersionUID = 6996385373168492882L;
private static final Color SELECTED_ROW = new Color(0xaa, 0xaa, 0xaa,
200);
-
+ private static final Font TITLE_FONT = new Font("SansSerif", Font.BOLD,
14);
+
private static final int IMPORT_COLUMN_INDEX = 0;
private static final int STATUS_COLUMN_INDEX = 1;
private static final int DB_NAME_COLUMN_INDEX = 2;
@@ -65,9 +68,9 @@
private final PSIMI25VisualStyleBuilder vsBuilder;
private final VisualMappingManager vmm;
-
+
private final PSIMITagManager tagManager;
-
+
private int interactionsFound = 0;
/**
@@ -76,16 +79,16 @@
*/
public SourceStatusPanel(final String query, final PSICQUICRestClient
client, final RegistryManager manager,
final CyNetworkManager networkManager, final
Map<String, Long> result, final TaskManager taskManager,
- final SearchMode mode, final
CreateNetworkViewTaskFactory createViewTaskFactory, final
PSIMI25VisualStyleBuilder vsBuilder,
- final VisualMappingManager vmm, final PSIMITagManager
tagManager) {
+ final SearchMode mode, final
CreateNetworkViewTaskFactory createViewTaskFactory,
+ final PSIMI25VisualStyleBuilder vsBuilder, final
VisualMappingManager vmm, final PSIMITagManager tagManager) {
this.manager = manager;
this.client = client;
this.query = query;
this.networkManager = networkManager;
this.taskManager = taskManager;
this.tagManager = tagManager;
-
- if(mode == SearchMode.SPECIES)
+
+ if (mode == SearchMode.SPECIES)
this.mode = SearchMode.MIQL;
else
this.mode = mode;
@@ -94,27 +97,22 @@
this.vsBuilder = vsBuilder;
setTableModel(result);
-
+
refreshGUI();
+ final TitledBorder titledBorder =
BorderFactory.createTitledBorder(BorderFactory.createEmptyBorder(6, 3, 0, 3),
+ "2. Select Database");
+ titledBorder.setTitleFont(TITLE_FONT);
+ this.setBorder(titledBorder);
+ this.setOpaque(false);
resultTable.setEnabled(false);
}
-
+
private void refreshGUI() {
initComponents();
setCoumnWidth();
-
- // Set number of items:
- if (interactionsFound > 0) {
- this.titleLabel.setText("Binary Interactions Found: " +
interactionsFound);
- this.titleLabel.setForeground(Color.GREEN);
- this.titleLabel.setEnabled(true);
- this.titleLabel.repaint();
- }
}
public void enableComponents(final boolean enable) {
- //this.clearButtonActionPerformed(null);
-
this.resultTable.setEnabled(enable);
this.resultScrollPane.setEnabled(enable);
this.selectAllButton.setEnabled(enable);
@@ -139,7 +137,6 @@
if (selected)
selectedService.add(model.getValueAt(i,
DB_NAME_COLUMN_INDEX).toString());
}
-
return selectedService;
}
@@ -155,9 +152,8 @@
resultTable.getColumnModel().getColumn(DB_NAME_COLUMN_INDEX).setPreferredWidth(120);
// Record Number
resultTable.getColumnModel().getColumn(RECORD_COUNT_COLUMN_INDEX).setPreferredWidth(120);
-
// Tags
-
resultTable.getColumnModel().getColumn(TAG_COLUMN_INDEX).setPreferredWidth(260);
+
resultTable.getColumnModel().getColumn(TAG_COLUMN_INDEX).setPreferredWidth(280);
resultTable.setSelectionBackground(SELECTED_ROW);
resultTable.setDefaultRenderer(String.class, new
StringCellRenderer());
@@ -239,29 +235,30 @@
public String getToolTipText(MouseEvent e) {
final int row =
convertRowIndexToModel(rowAtPoint(e.getPoint()));
final TableModel m = getModel();
- return "<html><strong>" + m.getValueAt(row,
DB_NAME_COLUMN_INDEX) + "</strong><br>" + m.getValueAt(row, TAG_COLUMN_INDEX) +
"</html>";
+ return "<html><strong>" + m.getValueAt(row,
DB_NAME_COLUMN_INDEX) + "</strong><br>"
+ + m.getValueAt(row,
TAG_COLUMN_INDEX) + "</html>";
}
};
this.resultTable.setAutoCreateRowSorter(true);
model.fireTableDataChanged();
repaint();
}
-
+
private final String convertTags(final String serviceName) {
final StringBuilder builder = new StringBuilder();
final List<String> tags = manager.getTagMap().get(serviceName);
- for(final String tag: tags) {
+ for (final String tag : tags) {
final String psimiName = tagManager.toName(tag);
- if(psimiName != null)
+ if (psimiName != null)
builder.append(psimiName);
else
builder.append(tag);
-
+
builder.append(", ");
}
-
- final String nameString = builder.toString();
- return nameString.substring(0, nameString.length()-2);
+
+ final String nameString = builder.toString();
+ return nameString.substring(0, nameString.length() - 2);
}
/**
@@ -272,8 +269,8 @@
@SuppressWarnings("unchecked")
// <editor-fold defaultstate="collapsed" desc="Generated Code">
private void initComponents() {
- titlePanel = new javax.swing.JPanel();
- titleLabel = new javax.swing.JLabel();
+ // titlePanel = new javax.swing.JPanel();
+ // titleLabel = new javax.swing.JLabel();
resultScrollPane = new javax.swing.JScrollPane();
buttonPanel = new javax.swing.JPanel();
@@ -284,22 +281,23 @@
clusterResultCheckBox = new JCheckBox("Merge results into one
network");
clusterResultCheckBox.setSelected(true);
- titlePanel.setBackground(java.awt.Color.white);
+ // titlePanel.setBackground(java.awt.Color.white);
+ //
+ // titleLabel.setFont(new java.awt.Font("SansSerif", Font.BOLD,
14)); //
+ // NOI18N
+ // titleLabel.setEnabled(false);
+ // titleLabel.setText("Binary Interactions Found: -");
- titleLabel.setFont(new java.awt.Font("SansSerif", Font.BOLD,
14)); // NOI18N
- titleLabel.setEnabled(false);
- titleLabel.setText("Binary Interactions Found: -");
+ // GroupLayout titlePanelLayout = new GroupLayout(titlePanel);
+ // titlePanel.setLayout(titlePanelLayout);
+ //
titlePanelLayout.setHorizontalGroup(titlePanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
+ // .addGroup(
+ //
titlePanelLayout.createSequentialGroup().addContainerGap().addComponent(titleLabel)
+ // .addContainerGap(40, Short.MAX_VALUE)));
+ //
titlePanelLayout.setVerticalGroup(titlePanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(
+ //
titlePanelLayout.createSequentialGroup().addContainerGap().addComponent(titleLabel)
+ // .addContainerGap(GroupLayout.DEFAULT_SIZE,
Short.MAX_VALUE)));
- GroupLayout titlePanelLayout = new GroupLayout(titlePanel);
- titlePanel.setLayout(titlePanelLayout);
-
titlePanelLayout.setHorizontalGroup(titlePanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
- .addGroup(
-
titlePanelLayout.createSequentialGroup().addContainerGap().addComponent(titleLabel)
-
.addContainerGap(40, Short.MAX_VALUE)));
-
titlePanelLayout.setVerticalGroup(titlePanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(
-
titlePanelLayout.createSequentialGroup().addContainerGap().addComponent(titleLabel)
-
.addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
-
resultScrollPane.setBackground(java.awt.Color.white);
resultScrollPane.setViewportView(resultTable);
@@ -373,13 +371,15 @@
GroupLayout layout = new GroupLayout(this);
setLayout(layout);
layout.setHorizontalGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING)
- .addComponent(titlePanel,
GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ // .addComponent(titlePanel,
GroupLayout.DEFAULT_SIZE,
+ // GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(resultScrollPane,
GroupLayout.DEFAULT_SIZE, 300, Short.MAX_VALUE)
.addComponent(buttonPanel));
layout.setVerticalGroup(layout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(
layout.createSequentialGroup()
- .addComponent(titlePanel,
GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
-
GroupLayout.PREFERRED_SIZE)
+ // .addComponent(titlePanel,
GroupLayout.PREFERRED_SIZE,
+ // GroupLayout.DEFAULT_SIZE,
+ // GroupLayout.PREFERRED_SIZE)
.addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
.addComponent(resultScrollPane,
GroupLayout.DEFAULT_SIZE, 300, Short.MAX_VALUE)
.addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
@@ -391,7 +391,7 @@
private void importButtonActionPerformed(ActionEvent evt) {
final boolean mergeNetwork = clusterResultCheckBox.isSelected();
-
+
final Set<String> targetSources = getSelected();
final Set<String> sourceURLs = new HashSet<String>();
for (String source : targetSources)
@@ -441,9 +441,10 @@
private javax.swing.JScrollPane resultScrollPane;
private javax.swing.JTable resultTable;
- private javax.swing.JLabel titleLabel;
- private javax.swing.JPanel titlePanel;
+ // private javax.swing.JLabel titleLabel;
+ // private javax.swing.JPanel titlePanel;
+
// End of variables declaration
private final class StatusTableModel extends DefaultTableModel {
@@ -503,14 +504,14 @@
else
this.setBackground(table.getBackground());
- if(column == STATUS_COLUMN_INDEX || column ==
TAG_COLUMN_INDEX) {
+ if (column == STATUS_COLUMN_INDEX || column ==
TAG_COLUMN_INDEX) {
this.setHorizontalAlignment(SwingConstants.LEFT);
} else {
this.setHorizontalAlignment(SwingConstants.CENTER);
}
-
- if(table.isEnabled() == false) {
- // Table is disabled. Grayed-out
+
+ if (table.isEnabled() == false) {
+ // Table is disabled. Grayed-out
this.setForeground(Color.LIGHT_GRAY);
this.setEnabled(false);
}
@@ -556,9 +557,9 @@
this.setBackground(table.getSelectionBackground());
else
this.setBackground(table.getBackground());
-
- if(table.isEnabled() == false) {
- // Table is disabled. Grayed-out
+
+ if (table.isEnabled() == false) {
+ // Table is disabled. Grayed-out
this.setForeground(Color.LIGHT_GRAY);
this.setEnabled(false);
}
@@ -566,7 +567,6 @@
}
}
-
/**
* Force to sort row
*/
@@ -581,7 +581,7 @@
}
}
- void setQuery(final String query){
+ void setQuery(final String query) {
this.query = query;
}
}
--
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.
