diff --git a/src/org/labkey/mq/MqModule.java b/src/org/labkey/mq/MqModule.java index 3ef5e2c..9a3c0c8 100644 --- a/src/org/labkey/mq/MqModule.java +++ b/src/org/labkey/mq/MqModule.java @@ -27,6 +27,7 @@ import org.labkey.api.module.FolderTypeManager; import org.labkey.api.module.ModuleContext; import org.labkey.api.pipeline.PipelineService; +import org.labkey.api.protein.ProteinSearchForm; import org.labkey.api.protein.ProteinService; import org.labkey.api.query.QueryService; import org.labkey.api.query.QuerySettings; @@ -130,7 +131,7 @@ protected Collection createWebPartFactories() @Override public WebPartView getWebPartView(@NotNull ViewContext portalCtx, @NotNull Portal.WebPart webPart) { - return new ProteinSearchWebPart(new ProteinService.ProteinSearchForm() + return new ProteinSearchWebPart(new ProteinSearchForm() { @Override public int[] getSeqId() diff --git a/src/org/labkey/mq/MqProteinSearchViewProvider.java b/src/org/labkey/mq/MqProteinSearchViewProvider.java index 7ddd46d..c63e3b8 100644 --- a/src/org/labkey/mq/MqProteinSearchViewProvider.java +++ b/src/org/labkey/mq/MqProteinSearchViewProvider.java @@ -6,7 +6,7 @@ import org.labkey.api.data.SQLFragment; import org.labkey.api.data.TableInfo; import org.labkey.api.module.ModuleLoader; -import org.labkey.api.protein.ProteinService; +import org.labkey.api.protein.ProteinSearchForm; import org.labkey.api.query.FieldKey; import org.labkey.api.query.FilteredTable; import org.labkey.api.query.QuerySettings; @@ -22,7 +22,7 @@ import static org.labkey.mq.MqSchema.TABLE_PROTEIN_GROUP; -public class MqProteinSearchViewProvider implements QueryViewProvider +public class MqProteinSearchViewProvider implements QueryViewProvider { @Override public String getDataRegionName() @@ -32,7 +32,7 @@ public String getDataRegionName() @Nullable @Override - public QueryView createView(ViewContext viewContext, ProteinService.ProteinSearchForm form, BindException errors) + public QueryView createView(ViewContext viewContext, ProteinSearchForm form, BindException errors) { if (!viewContext.getContainer().getActiveModules().contains(ModuleLoader.getInstance().getModule(MqModule.class))) return null; // only enable this view if the MqModule is active diff --git a/src/org/labkey/mq/view/ProteinSearchWebPart.java b/src/org/labkey/mq/view/ProteinSearchWebPart.java index 74c6a0a..fcdb761 100644 --- a/src/org/labkey/mq/view/ProteinSearchWebPart.java +++ b/src/org/labkey/mq/view/ProteinSearchWebPart.java @@ -1,6 +1,7 @@ package org.labkey.mq.view; import org.labkey.api.module.ModuleLoader; +import org.labkey.api.protein.ProteinSearchForm; import org.labkey.api.protein.ProteinService; import org.labkey.api.view.JspView; import org.labkey.api.view.ViewContext; @@ -9,18 +10,18 @@ import static org.labkey.mq.MqModule.SEARCH_WEBPART_NAME; -public class ProteinSearchWebPart extends JspView +public class ProteinSearchWebPart extends JspView { - public ProteinSearchWebPart(ProteinService.ProteinSearchForm form) + public ProteinSearchWebPart(ProteinSearchForm form) { super("/org/labkey/mq/view/proteinSearch.jsp", form); setTitle(SEARCH_WEBPART_NAME); } - public static class ProteinSearchFormViewProvider implements ProteinService.FormViewProvider + public static class ProteinSearchFormViewProvider implements ProteinService.FormViewProvider { @Override - public WebPartView createView(ViewContext viewContext, ProteinService.ProteinSearchForm form) + public WebPartView createView(ViewContext viewContext, ProteinSearchForm form) { if (viewContext.getContainer().getActiveModules().contains(ModuleLoader.getInstance().getModule(MqModule.class))) { diff --git a/src/org/labkey/mq/view/proteinSearch.jsp b/src/org/labkey/mq/view/proteinSearch.jsp index dcaa7ed..22331d0 100644 --- a/src/org/labkey/mq/view/proteinSearch.jsp +++ b/src/org/labkey/mq/view/proteinSearch.jsp @@ -1,12 +1,12 @@ <%@ page import="org.labkey.api.ms2.MS2Urls" %> -<%@ page import="org.labkey.api.protein.ProteinService" %> +<%@ page import="org.labkey.api.protein.ProteinSearchForm" %> <%@ page import="org.labkey.api.view.HttpView" %> <%@ page import="org.labkey.api.view.JspView" %> <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %> <%@ page extends="org.labkey.api.jsp.JspBase" %> <% - JspView me = (JspView) HttpView.currentView(); - ProteinService.ProteinSearchForm bean = me.getModelBean(); + JspView me = (JspView) HttpView.currentView(); + ProteinSearchForm bean = me.getModelBean(); %>