Author: kono
Date: 2012-12-06 15:30:17 -0800 (Thu, 06 Dec 2012)
New Revision: 30914
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/SelectorBuilder.java
Log:
Species query mode modified. "All" removed since it is useless.
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 23:16:56 UTC (rev 30913)
+++
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/ui/PSICQUICSearchUI.java
2012-12-06 23:30:17 UTC (rev 30914)
@@ -227,7 +227,8 @@
speciesPanel.setLayout(new BoxLayout(speciesPanel,
BoxLayout.X_AXIS));
speciesPanel.add(speciesLabel);
speciesPanel.add(speciesSelector);
-
+ searchButton.setEnabled(true);
+
speciesSelector.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent arg0) {
@@ -267,11 +268,7 @@
final Object selectedItem =
this.speciesSelector.getSelectedItem();
final Species species = (Species) selectedItem;
- if (species == Species.ALL) {
- return "*";
- } else {
- return "species:\"" + species.toString() + "\"";
- }
+ return "species:\"" + species.toString() + "\"";
}
private final class SetTableTask extends AbstractTask {
@@ -306,9 +303,10 @@
searchConditionPanel.removeAll();
removeAll();
- if (mode == SearchMode.SPECIES)
+ if (mode == SearchMode.SPECIES) {
searchConditionPanel.add(speciesPanel);
- else
+ searchButton.setEnabled(true);
+ } else
searchConditionPanel.add(queryScrollPane);
searchConditionPanel.add(searchPanel);
@@ -336,14 +334,17 @@
mode = SearchMode.MIQL;
searchAreaTitle = MIQL_MODE;
query = queryArea.getText();
+ searchButton.setEnabled(false);
} else if (modeString.equals(INTERACTOR_ID_LIST)) {
mode = SearchMode.INTERACTOR;
searchAreaTitle = INTERACTOR_ID_LIST;
query = queryArea.getText();
+ searchButton.setEnabled(false);
} else {
mode = SearchMode.SPECIES;
searchAreaTitle = BY_SPECIES;
query = buildSpeciesQuery();
+ searchButton.setEnabled(true);
}
firstClick = true;
@@ -356,6 +357,5 @@
updateGUILayout();
statesPanel.enableComponents(false);
- searchButton.setEnabled(false);
}
}
\ No newline at end of file
Modified:
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/ui/SelectorBuilder.java
===================================================================
---
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/ui/SelectorBuilder.java
2012-12-06 23:16:56 UTC (rev 30913)
+++
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/ui/SelectorBuilder.java
2012-12-06 23:30:17 UTC (rev 30914)
@@ -5,7 +5,7 @@
public class SelectorBuilder {
protected enum Species {
- ALL("All Species"), HUMAN("Homo sapiens"), MOUSE("Mus
musculus"), YEAST("Saccharomyces cerevisiae"), FLY(
+ HUMAN("Homo sapiens"), MOUSE("Mus musculus"),
YEAST("Saccharomyces cerevisiae"), FLY(
"Drosophila melanogaster"),
ROUNDWORM("Caenorhabditis elegans"), ZEBRAFISH("Danio rerio"), MOUSE_EAR_CRESS(
"Arabidopsis Thaliana");
--
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.
