Permalink
Browse files

Only allow to search in one group at a time (see #9323)

Handling the search results has to be reviewed when
data found are in different group.
  • Loading branch information...
1 parent 5e077de commit 8e24ab67302676bfa00245f87e1c8993c7b898fc @jburel committed Jul 10, 2012
@@ -94,6 +94,7 @@
while (i.hasNext()) {
e = i.next();
ctx = e.getKey();
+ this.ctx = ctx;
objects = e.getValue();
numberOfImages += objects.size();
if (singleGroup) {
@@ -189,7 +190,7 @@ protected DataBrowserLoader createDataLoader(boolean refresh,
protected int getType() { return DataBrowserModel.SEARCH; }
/**
- * No-op implementation in our case.
+ * No-operation implementation in our case.
* @see DataBrowserModel#getNodes()
*/
protected List<ImageDisplay> getNodes() { return null; }
@@ -67,8 +67,6 @@
import org.openmicroscopy.shoola.util.ui.SeparatorPane;
import org.openmicroscopy.shoola.util.ui.UIUtilities;
-import pojos.GroupData;
-
/**
* The Component hosting the various fields used to collect the
@@ -330,9 +328,9 @@
private JComboBox createBox()
{
List<GroupContext> groups = model.getGroups();
- Object[] values = new Object[groups.size()+1];
- values[0] = new GroupContext("All your groups", -1);
- int j = 1;
+ Object[] values = new Object[groups.size()];
+ //values[0] = new GroupContext("All your groups", -1);
+ int j = 0;
Iterator<GroupContext> i = groups.iterator();
while (i.hasNext()) {
values[j] = i.next();

0 comments on commit 8e24ab6

Please sign in to comment.