Skip to content

Commit

Permalink
merged in master changes
Browse files Browse the repository at this point in the history
  • Loading branch information
nathandunn committed Dec 21, 2015
2 parents bac0e54 + e665b7d commit 9c38352
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
6 changes: 2 additions & 4 deletions src/gwt/org/bbop/apollo/gwt/client/ExportPanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@
import org.bbop.apollo.gwt.client.rest.SequenceRestService;
import org.bbop.apollo.gwt.shared.FeatureStringEnum;
import org.gwtbootstrap3.client.ui.*;
import org.gwtbootstrap3.client.ui.constants.ButtonType;
import org.gwtbootstrap3.client.ui.constants.IconRotate;
import org.gwtbootstrap3.client.ui.constants.IconType;
import org.gwtbootstrap3.client.ui.constants.Toggle;
import org.gwtbootstrap3.client.ui.constants.*;

import java.util.List;

Expand Down Expand Up @@ -47,6 +44,7 @@ public ExportPanel(OrganismInfo organismInfo, String type, Boolean exportAll, Li
setTitle("Export");
setClosable(true);
setRemoveOnHide(true);
setDataBackdrop(ModalBackdrop.FALSE);

Integer count = exportAll ? -1 : sequenceInfoList.size();
String countText = count < 0 ? "all" : count + "";
Expand Down
3 changes: 1 addition & 2 deletions src/gwt/org/bbop/apollo/gwt/client/MainPanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ interface MainPanelUiBinder extends UiBinder<Widget, MainPanel> {
@UiField
HTML editUserHeader;

private MultiWordSuggestOracle sequenceOracle = new ReferenceSequenceOracle();

private LoginDialog loginDialog = new LoginDialog();
private RegisterDialog registerDialog = new RegisterDialog();
Expand All @@ -149,7 +148,7 @@ public static MainPanel getInstance() {

MainPanel() {
instance = this;
sequenceSuggestBox = new SuggestBox(sequenceOracle);
sequenceSuggestBox = new SuggestBox(new ReferenceSequenceOracle());

mainSplitPanel = new SplitLayoutPanel() {
@Override
Expand Down

0 comments on commit 9c38352

Please sign in to comment.