Move search forms out of ProteinService

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<WebPartFactory> 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()

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<ProteinService.ProteinSearchForm>
+public class MqProteinSearchViewProvider implements QueryViewProvider<ProteinSearchForm>
 {
     @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

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<ProteinService.ProteinSearchForm>
+public class ProteinSearchWebPart extends JspView<ProteinSearchForm>
 {
-    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<ProteinService.ProteinSearchForm>
+    public static class ProteinSearchFormViewProvider implements ProteinService.FormViewProvider<ProteinSearchForm>
     {
         @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)))
             {

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<ProteinService.ProteinSearchForm> me = (JspView<ProteinService.ProteinSearchForm>) HttpView.currentView();
-    ProteinService.ProteinSearchForm bean = me.getModelBean();
+    JspView<ProteinSearchForm> me = (JspView<ProteinSearchForm>) HttpView.currentView();
+    ProteinSearchForm bean = me.getModelBean();
 %>
 
 <labkey:form layout="horizontal" action="<%=urlProvider(MS2Urls.class).getProteinSearchUrl(getContainer())%>">