Switch from direct ClientDependency references to Suppliers (#30)

labkey-jeckels · web-flow · commit 99615614bec5 · 2020-04-08T09:28:07.000-07:00
Issue 40118: Client dependencies are cached too aggressively
diff --git a/SequenceAnalysis/src/org/labkey/sequenceanalysis/button/AddSraRunButton.java b/SequenceAnalysis/src/org/labkey/sequenceanalysis/button/AddSraRunButton.java
@@ -7,7 +7,6 @@
 import org.labkey.sequenceanalysis.SequenceAnalysisModule;
 
 import java.util.Arrays;
-import java.util.LinkedHashSet;
 
 /**
  * Created by bimber on 7/12/2017.
@@ -16,7 +15,7 @@ public class AddSraRunButton extends SimpleButtonConfigFactory
 {
     public AddSraRunButton()
     {
-        super(ModuleLoader.getInstance().getModule(SequenceAnalysisModule.class), "Add/Update SRA Run", "SequenceAnalysis.window.AddSraRunWindow.buttonHandler(dataRegionName);", new LinkedHashSet<>(Arrays.asList(ClientDependency.fromModuleName("ldk"), ClientDependency.fromModuleName("laboratory"), ClientDependency.fromPath("sequenceanalysis/window/AddSraRunWindow.js"))));
+        super(ModuleLoader.getInstance().getModule(SequenceAnalysisModule.class), "Add/Update SRA Run", "SequenceAnalysis.window.AddSraRunWindow.buttonHandler(dataRegionName);", Arrays.asList(ClientDependency.supplierFromModuleName("ldk"), ClientDependency.supplierFromModuleName("laboratory"), ClientDependency.supplierFromPath("sequenceanalysis/window/AddSraRunWindow.js")));
         setPermission(UpdatePermission.class);
     }
 }
diff --git a/SequenceAnalysis/src/org/labkey/sequenceanalysis/button/CellHashingButton.java b/SequenceAnalysis/src/org/labkey/sequenceanalysis/button/CellHashingButton.java
@@ -8,7 +8,6 @@
 import org.labkey.sequenceanalysis.analysis.CellHashingHandler;
 
 import java.util.Arrays;
-import java.util.LinkedHashSet;
 
 /**
  * Created by bimber on 7/12/2017.
@@ -17,7 +16,7 @@ public class CellHashingButton extends SimpleButtonConfigFactory
 {
     public CellHashingButton()
     {
-        super(ModuleLoader.getInstance().getModule(SequenceAnalysisModule.class), "Generate Cell Hashing Calls", "SequenceAnalysis.window.OutputHandlerWindow.readsetButtonHandler(dataRegionName, '" + CellHashingHandler.class.getName() + "');", new LinkedHashSet<>(Arrays.asList(ClientDependency.fromModuleName("ldk"), ClientDependency.fromModuleName("laboratory"), ClientDependency.fromPath("sequenceanalysis/window/OutputHandlerWindow.js"))));
+        super(ModuleLoader.getInstance().getModule(SequenceAnalysisModule.class), "Generate Cell Hashing Calls", "SequenceAnalysis.window.OutputHandlerWindow.readsetButtonHandler(dataRegionName, '" + CellHashingHandler.class.getName() + "');", Arrays.asList(ClientDependency.supplierFromModuleName("ldk"), ClientDependency.supplierFromModuleName("laboratory"), ClientDependency.supplierFromPath("sequenceanalysis/window/OutputHandlerWindow.js")));
         setPermission(UpdatePermission.class);
     }
 }
diff --git a/SequenceAnalysis/src/org/labkey/sequenceanalysis/button/ChangeReadsetStatusButton.java b/SequenceAnalysis/src/org/labkey/sequenceanalysis/button/ChangeReadsetStatusButton.java
@@ -6,7 +6,6 @@
 import org.labkey.sequenceanalysis.SequenceAnalysisModule;
 
 import java.util.Arrays;
-import java.util.LinkedHashSet;
 
 /**
  * User: bimber
@@ -17,6 +16,6 @@ public class ChangeReadsetStatusButton extends SimpleButtonConfigFactory
 {
     public ChangeReadsetStatusButton()
     {
-        super(ModuleLoader.getInstance().getModule(SequenceAnalysisModule.class), "Change Readset Status", "SequenceAnalysis.window.ChangeReadsetStatusWindow.buttonHandlerForReadsets(dataRegionName);", new LinkedHashSet<>(Arrays.asList(ClientDependency.fromPath("sequenceanalysis/window/ChangeReadsetStatusWindow.js"))));
+        super(ModuleLoader.getInstance().getModule(SequenceAnalysisModule.class), "Change Readset Status", "SequenceAnalysis.window.ChangeReadsetStatusWindow.buttonHandlerForReadsets(dataRegionName);", Arrays.asList(ClientDependency.supplierFromPath("sequenceanalysis/window/ChangeReadsetStatusWindow.js")));
     }
 }
diff --git a/SequenceAnalysis/src/org/labkey/sequenceanalysis/button/ChangeReadsetStatusForAnalysesButton.java b/SequenceAnalysis/src/org/labkey/sequenceanalysis/button/ChangeReadsetStatusForAnalysesButton.java
@@ -6,7 +6,6 @@
 import org.labkey.sequenceanalysis.SequenceAnalysisModule;
 
 import java.util.Arrays;
-import java.util.LinkedHashSet;
 
 /**
  * User: bimber
@@ -17,6 +16,6 @@ public class ChangeReadsetStatusForAnalysesButton extends SimpleButtonConfigFact
 {
     public ChangeReadsetStatusForAnalysesButton()
     {
-        super(ModuleLoader.getInstance().getModule(SequenceAnalysisModule.class), "Change Readset Status", "SequenceAnalysis.window.ChangeReadsetStatusWindow.buttonHandlerForAnalyses(dataRegionName);", new LinkedHashSet<>(Arrays.asList(ClientDependency.fromPath("sequenceanalysis/window/ChangeReadsetStatusWindow.js"))));
+        super(ModuleLoader.getInstance().getModule(SequenceAnalysisModule.class), "Change Readset Status", "SequenceAnalysis.window.ChangeReadsetStatusWindow.buttonHandlerForAnalyses(dataRegionName);", Arrays.asList(ClientDependency.supplierFromPath("sequenceanalysis/window/ChangeReadsetStatusWindow.js")));
     }
 }
diff --git a/SequenceAnalysis/src/org/labkey/sequenceanalysis/button/CiteSeqButton.java b/SequenceAnalysis/src/org/labkey/sequenceanalysis/button/CiteSeqButton.java
@@ -5,11 +5,9 @@
 import org.labkey.api.security.permissions.UpdatePermission;
 import org.labkey.api.view.template.ClientDependency;
 import org.labkey.sequenceanalysis.SequenceAnalysisModule;
-import org.labkey.sequenceanalysis.analysis.CellHashingHandler;
 import org.labkey.sequenceanalysis.analysis.CiteSeqHandler;
 
 import java.util.Arrays;
-import java.util.LinkedHashSet;
 
 /**
  * Created by bimber on 7/12/2017.
@@ -18,7 +16,11 @@ public class CiteSeqButton extends SimpleButtonConfigFactory
 {
     public CiteSeqButton()
     {
-        super(ModuleLoader.getInstance().getModule(SequenceAnalysisModule.class), "Generate CITE-seq Table", "SequenceAnalysis.window.OutputHandlerWindow.readsetButtonHandler(dataRegionName, '" + CiteSeqHandler.class.getName() + "');", new LinkedHashSet<>(Arrays.asList(ClientDependency.fromModuleName("ldk"), ClientDependency.fromModuleName("laboratory"), ClientDependency.fromPath("sequenceanalysis/window/OutputHandlerWindow.js"))));
+        super(ModuleLoader.getInstance().getModule(SequenceAnalysisModule.class), "Generate CITE-seq Table", "SequenceAnalysis.window.OutputHandlerWindow.readsetButtonHandler(dataRegionName, '" + CiteSeqHandler.class.getName() + "');",
+                Arrays.asList(
+                        ClientDependency.supplierFromModuleName("ldk"),
+                        ClientDependency.supplierFromModuleName("laboratory"),
+                        ClientDependency.supplierFromPath("sequenceanalysis/window/OutputHandlerWindow.js")));
         setPermission(UpdatePermission.class);
     }
 }
diff --git a/SequenceAnalysis/src/org/labkey/sequenceanalysis/button/ReprocessLibraryButton.java b/SequenceAnalysis/src/org/labkey/sequenceanalysis/button/ReprocessLibraryButton.java
@@ -6,7 +6,6 @@
 import org.labkey.sequenceanalysis.SequenceAnalysisModule;
 
 import java.util.Arrays;
-import java.util.LinkedHashSet;
 
 /**
  * User: bimber
@@ -17,6 +16,6 @@ public class ReprocessLibraryButton extends SimpleButtonConfigFactory
 {
     public ReprocessLibraryButton()
     {
-        super(ModuleLoader.getInstance().getModule(SequenceAnalysisModule.class), "Re-process Selected", "SequenceAnalysis.window.ReprocessLibraryWindow.buttonHandler(dataRegionName);", new LinkedHashSet<>(Arrays.asList(ClientDependency.fromPath("sequenceanalysis/window/ReprocessLibraryWindow.js"))));
+        super(ModuleLoader.getInstance().getModule(SequenceAnalysisModule.class), "Re-process Selected", "SequenceAnalysis.window.ReprocessLibraryWindow.buttonHandler(dataRegionName);", Arrays.asList(ClientDependency.supplierFromPath("sequenceanalysis/window/ReprocessLibraryWindow.js")));
     }
 }
diff --git a/SequenceAnalysis/src/org/labkey/sequenceanalysis/button/RunMultiQCButton.java b/SequenceAnalysis/src/org/labkey/sequenceanalysis/button/RunMultiQCButton.java
@@ -8,7 +8,6 @@
 import org.labkey.sequenceanalysis.analysis.MultiQCHandler;
 
 import java.util.Arrays;
-import java.util.LinkedHashSet;
 
 /**
  * Created by bimber on 7/12/2017.
@@ -17,7 +16,7 @@ public class RunMultiQCButton extends SimpleButtonConfigFactory
 {
     public RunMultiQCButton()
     {
-        super(ModuleLoader.getInstance().getModule(SequenceAnalysisModule.class), "Run MultiQC", "SequenceAnalysis.window.OutputHandlerWindow.readsetButtonHandler(dataRegionName, '" + MultiQCHandler.class.getName() + "');", new LinkedHashSet<>(Arrays.asList(ClientDependency.fromModuleName("ldk"), ClientDependency.fromModuleName("laboratory"), ClientDependency.fromPath("sequenceanalysis/window/OutputHandlerWindow.js"))));
+        super(ModuleLoader.getInstance().getModule(SequenceAnalysisModule.class), "Run MultiQC", "SequenceAnalysis.window.OutputHandlerWindow.readsetButtonHandler(dataRegionName, '" + MultiQCHandler.class.getName() + "');", Arrays.asList(ClientDependency.supplierFromModuleName("ldk"), ClientDependency.supplierFromModuleName("laboratory"), ClientDependency.supplierFromPath("sequenceanalysis/window/OutputHandlerWindow.js")));
         setPermission(UpdatePermission.class);
     }
 }
diff --git a/blast/src/org/labkey/blast/button/BlastOligosButton.java b/blast/src/org/labkey/blast/button/BlastOligosButton.java
@@ -6,7 +6,6 @@
 import org.labkey.blast.BLASTModule;
 
 import java.util.Arrays;
-import java.util.LinkedHashSet;
 
 /**
  * User: bimber
@@ -17,6 +16,6 @@ public class BlastOligosButton extends SimpleButtonConfigFactory
 {
     public BlastOligosButton()
     {
-        super(ModuleLoader.getInstance().getModule(BLASTModule.class), "BLAST Oligos", "BLAST.window.BlastOligosWindow.buttonHandler(dataRegionName);", new LinkedHashSet<>(Arrays.asList(ClientDependency.fromPath("laboratory.context"), ClientDependency.fromPath("blast/window/BlastOligosWindow.js"))));
+        super(ModuleLoader.getInstance().getModule(BLASTModule.class), "BLAST Oligos", "BLAST.window.BlastOligosWindow.buttonHandler(dataRegionName);", Arrays.asList(ClientDependency.supplierFromPath("laboratory.context"), ClientDependency.supplierFromPath("blast/window/BlastOligosWindow.js")));
     }
 }
diff --git a/blast/src/org/labkey/blast/button/CreateDatabaseButton.java b/blast/src/org/labkey/blast/button/CreateDatabaseButton.java
@@ -6,7 +6,6 @@
 import org.labkey.blast.BLASTModule;
 
 import java.util.Arrays;
-import java.util.LinkedHashSet;
 
 /**
  * User: bimber
@@ -17,6 +16,6 @@ public class CreateDatabaseButton extends SimpleButtonConfigFactory
 {
     public CreateDatabaseButton()
     {
-        super(ModuleLoader.getInstance().getModule(BLASTModule.class), "Create BLAST Database", "BLAST.window.DatabaseWindow.buttonHandler(dataRegionName);", new LinkedHashSet<>(Arrays.asList(ClientDependency.fromPath("blast/window/DatabaseWindow.js"))));
+        super(ModuleLoader.getInstance().getModule(BLASTModule.class), "Create BLAST Database", "BLAST.window.DatabaseWindow.buttonHandler(dataRegionName);", Arrays.asList(ClientDependency.supplierFromPath("blast/window/DatabaseWindow.js")));
     }
 }
diff --git a/blast/src/org/labkey/blast/button/ReprocessDatabaseButton.java b/blast/src/org/labkey/blast/button/ReprocessDatabaseButton.java
@@ -7,7 +7,6 @@
 import org.labkey.blast.BLASTModule;
 
 import java.util.Arrays;
-import java.util.LinkedHashSet;
 
 /**
  * User: bimber
@@ -18,7 +17,7 @@ public class ReprocessDatabaseButton extends SimpleButtonConfigFactory
 {
     public ReprocessDatabaseButton()
     {
-        super(ModuleLoader.getInstance().getModule(BLASTModule.class), "Re-process Selected", "BLAST.window.ReprocessDatabaseWindow.buttonHandler(dataRegionName);", new LinkedHashSet<>(Arrays.asList(ClientDependency.fromModuleName("ldk"), ClientDependency.fromPath("blast/window/ReprocessDatabaseWindow.js"))));
+        super(ModuleLoader.getInstance().getModule(BLASTModule.class), "Re-process Selected", "BLAST.window.ReprocessDatabaseWindow.buttonHandler(dataRegionName);", Arrays.asList(ClientDependency.supplierFromModuleName("ldk"), ClientDependency.supplierFromPath("blast/window/ReprocessDatabaseWindow.js")));
         setPermission(UpdatePermission.class);
     }
 }
diff --git a/jbrowse/src/org/labkey/jbrowse/button/AddDataButton.java b/jbrowse/src/org/labkey/jbrowse/button/AddDataButton.java
@@ -7,7 +7,6 @@
 import org.labkey.jbrowse.JBrowseModule;
 
 import java.util.Arrays;
-import java.util.LinkedHashSet;
 
 /**
  * User: bimber
@@ -18,7 +17,7 @@ public class AddDataButton extends SimpleButtonConfigFactory
 {
     public AddDataButton()
     {
-        super(ModuleLoader.getInstance().getModule(JBrowseModule.class), "Add To JBrowse Session", "JBrowse.window.DatabaseWindow.outputFilesHandler(dataRegionName);", new LinkedHashSet<>(Arrays.asList(ClientDependency.fromPath("jbrowse/window/DatabaseWindow.js"))));
+        super(ModuleLoader.getInstance().getModule(JBrowseModule.class), "Add To JBrowse Session", "JBrowse.window.DatabaseWindow.outputFilesHandler(dataRegionName);", Arrays.asList(ClientDependency.supplierFromPath("jbrowse/window/DatabaseWindow.js")));
         setPermission(UpdatePermission.class);
     }
 }
diff --git a/jbrowse/src/org/labkey/jbrowse/button/AddLibraryButton.java b/jbrowse/src/org/labkey/jbrowse/button/AddLibraryButton.java
@@ -7,7 +7,6 @@
 import org.labkey.jbrowse.JBrowseModule;
 
 import java.util.Arrays;
-import java.util.LinkedHashSet;
 
 /**
  * User: bimber
@@ -18,7 +17,7 @@ public class AddLibraryButton extends SimpleButtonConfigFactory
 {
     public AddLibraryButton()
     {
-        super(ModuleLoader.getInstance().getModule(JBrowseModule.class), "Create JBrowse Session", "JBrowse.window.DatabaseWindow.libraryHandler(dataRegionName);", new LinkedHashSet<>(Arrays.asList(ClientDependency.fromPath("jbrowse/window/DatabaseWindow.js"))));
+        super(ModuleLoader.getInstance().getModule(JBrowseModule.class), "Create JBrowse Session", "JBrowse.window.DatabaseWindow.libraryHandler(dataRegionName);", Arrays.asList(ClientDependency.supplierFromPath("jbrowse/window/DatabaseWindow.js")));
         setPermission(UpdatePermission.class);
     }
 }
diff --git a/jbrowse/src/org/labkey/jbrowse/button/AddTrackButton.java b/jbrowse/src/org/labkey/jbrowse/button/AddTrackButton.java
@@ -7,7 +7,6 @@
 import org.labkey.jbrowse.JBrowseModule;
 
 import java.util.Arrays;
-import java.util.LinkedHashSet;
 
 /**
  * User: bimber
@@ -18,7 +17,7 @@ public class AddTrackButton extends SimpleButtonConfigFactory
 {
     public AddTrackButton()
     {
-        super(ModuleLoader.getInstance().getModule(JBrowseModule.class), "Add To JBrowse Session", "JBrowse.window.DatabaseWindow.trackHandler(dataRegionName);", new LinkedHashSet<>(Arrays.asList(ClientDependency.fromPath("jbrowse/window/DatabaseWindow.js"))));
+        super(ModuleLoader.getInstance().getModule(JBrowseModule.class), "Add To JBrowse Session", "JBrowse.window.DatabaseWindow.trackHandler(dataRegionName);", Arrays.asList(ClientDependency.supplierFromPath("jbrowse/window/DatabaseWindow.js")));
         setPermission(UpdatePermission.class);
     }
 }
diff --git a/jbrowse/src/org/labkey/jbrowse/button/ModifyTrackConfigButton.java b/jbrowse/src/org/labkey/jbrowse/button/ModifyTrackConfigButton.java
@@ -7,7 +7,6 @@
 import org.labkey.jbrowse.JBrowseModule;
 
 import java.util.Arrays;
-import java.util.LinkedHashSet;
 
 /**
  * User: bimber
@@ -18,7 +17,7 @@ public class ModifyTrackConfigButton extends SimpleButtonConfigFactory
 {
     public ModifyTrackConfigButton()
     {
-        super(ModuleLoader.getInstance().getModule(JBrowseModule.class), "Modify Track Config", "JBrowse.window.ModifyJsonConfigWindow.buttonHandler(dataRegionName);", new LinkedHashSet<>(Arrays.asList(ClientDependency.fromPath("jbrowse/window/ModifyJsonConfigWindow.js"))));
+        super(ModuleLoader.getInstance().getModule(JBrowseModule.class), "Modify Track Config", "JBrowse.window.ModifyJsonConfigWindow.buttonHandler(dataRegionName);", Arrays.asList(ClientDependency.supplierFromPath("jbrowse/window/ModifyJsonConfigWindow.js")));
         setPermission(UpdatePermission.class);
     }
 }
diff --git a/jbrowse/src/org/labkey/jbrowse/button/ReprocessResourcesButton.java b/jbrowse/src/org/labkey/jbrowse/button/ReprocessResourcesButton.java
@@ -7,7 +7,6 @@
 import org.labkey.jbrowse.JBrowseModule;
 
 import java.util.Arrays;
-import java.util.LinkedHashSet;
 
 /**
  * User: bimber
@@ -18,7 +17,7 @@ public class ReprocessResourcesButton extends SimpleButtonConfigFactory
 {
     public ReprocessResourcesButton()
     {
-        super(ModuleLoader.getInstance().getModule(JBrowseModule.class), "Re-process Selected", "JBrowse.window.ReprocessResourcesWindow.buttonHandler(dataRegionName);", new LinkedHashSet<>(Arrays.asList(ClientDependency.fromPath("jbrowse/window/ReprocessResourcesWindow.js"))));
+        super(ModuleLoader.getInstance().getModule(JBrowseModule.class), "Re-process Selected", "JBrowse.window.ReprocessResourcesWindow.buttonHandler(dataRegionName);", Arrays.asList(ClientDependency.supplierFromPath("jbrowse/window/ReprocessResourcesWindow.js")));
         setPermission(UpdatePermission.class);
     }
 }
diff --git a/jbrowse/src/org/labkey/jbrowse/button/ReprocessSessionsButton.java b/jbrowse/src/org/labkey/jbrowse/button/ReprocessSessionsButton.java
@@ -7,7 +7,6 @@
 import org.labkey.jbrowse.JBrowseModule;
 
 import java.util.Arrays;
-import java.util.LinkedHashSet;
 
 /**
  * User: bimber
@@ -18,7 +17,7 @@ public class ReprocessSessionsButton extends SimpleButtonConfigFactory
 {
     public ReprocessSessionsButton()
     {
-        super(ModuleLoader.getInstance().getModule(JBrowseModule.class), "Re-process Selected", "JBrowse.window.ReprocessResourcesWindow.sessionHandler(dataRegionName);", new LinkedHashSet<>(Arrays.asList(ClientDependency.fromPath("jbrowse/window/ReprocessResourcesWindow.js"))));
+        super(ModuleLoader.getInstance().getModule(JBrowseModule.class), "Re-process Selected", "JBrowse.window.ReprocessResourcesWindow.sessionHandler(dataRegionName);", Arrays.asList(ClientDependency.supplierFromPath("jbrowse/window/ReprocessResourcesWindow.js")));
         setPermission(UpdatePermission.class);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`import org.labkey.sequenceanalysis.SequenceAnalysisModule;`
`8`	`8`
`9`	`9`	`import java.util.Arrays;`
`10`		`-import java.util.LinkedHashSet;`
`11`	`10`
`12`	`11`	`/**`
`13`	`12`	`* Created by bimber on 7/12/2017.`
`@@ -16,7 +15,7 @@ public class AddSraRunButton extends SimpleButtonConfigFactory`
`16`	`15`	`{`
`17`	`16`	`public AddSraRunButton()`
`18`	`17`	`{`
`19`		`- super(ModuleLoader.getInstance().getModule(SequenceAnalysisModule.class), "Add/Update SRA Run", "SequenceAnalysis.window.AddSraRunWindow.buttonHandler(dataRegionName);", new LinkedHashSet<>(Arrays.asList(ClientDependency.fromModuleName("ldk"), ClientDependency.fromModuleName("laboratory"), ClientDependency.fromPath("sequenceanalysis/window/AddSraRunWindow.js"))));`
	`18`	`+ super(ModuleLoader.getInstance().getModule(SequenceAnalysisModule.class), "Add/Update SRA Run", "SequenceAnalysis.window.AddSraRunWindow.buttonHandler(dataRegionName);", Arrays.asList(ClientDependency.supplierFromModuleName("ldk"), ClientDependency.supplierFromModuleName("laboratory"), ClientDependency.supplierFromPath("sequenceanalysis/window/AddSraRunWindow.js")));`
`20`	`19`	`setPermission(UpdatePermission.class);`
`21`	`20`	`}`
`22`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`import org.labkey.sequenceanalysis.analysis.CellHashingHandler;`
`9`	`9`
`10`	`10`	`import java.util.Arrays;`
`11`		`-import java.util.LinkedHashSet;`
`12`	`11`
`13`	`12`	`/**`
`14`	`13`	`* Created by bimber on 7/12/2017.`
`@@ -17,7 +16,7 @@ public class CellHashingButton extends SimpleButtonConfigFactory`
`17`	`16`	`{`
`18`	`17`	`public CellHashingButton()`
`19`	`18`	`{`
`20`		`- super(ModuleLoader.getInstance().getModule(SequenceAnalysisModule.class), "Generate Cell Hashing Calls", "SequenceAnalysis.window.OutputHandlerWindow.readsetButtonHandler(dataRegionName, '" + CellHashingHandler.class.getName() + "');", new LinkedHashSet<>(Arrays.asList(ClientDependency.fromModuleName("ldk"), ClientDependency.fromModuleName("laboratory"), ClientDependency.fromPath("sequenceanalysis/window/OutputHandlerWindow.js"))));`
	`19`	`+ super(ModuleLoader.getInstance().getModule(SequenceAnalysisModule.class), "Generate Cell Hashing Calls", "SequenceAnalysis.window.OutputHandlerWindow.readsetButtonHandler(dataRegionName, '" + CellHashingHandler.class.getName() + "');", Arrays.asList(ClientDependency.supplierFromModuleName("ldk"), ClientDependency.supplierFromModuleName("laboratory"), ClientDependency.supplierFromPath("sequenceanalysis/window/OutputHandlerWindow.js")));`
`21`	`20`	`setPermission(UpdatePermission.class);`
`22`	`21`	`}`
`23`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`import org.labkey.sequenceanalysis.SequenceAnalysisModule;`
`7`	`7`
`8`	`8`	`import java.util.Arrays;`
`9`		`-import java.util.LinkedHashSet;`
`10`	`9`
`11`	`10`	`/**`
`12`	`11`	`* User: bimber`
`@@ -17,6 +16,6 @@ public class ChangeReadsetStatusButton extends SimpleButtonConfigFactory`
`17`	`16`	`{`
`18`	`17`	`public ChangeReadsetStatusButton()`
`19`	`18`	`{`
`20`		`- super(ModuleLoader.getInstance().getModule(SequenceAnalysisModule.class), "Change Readset Status", "SequenceAnalysis.window.ChangeReadsetStatusWindow.buttonHandlerForReadsets(dataRegionName);", new LinkedHashSet<>(Arrays.asList(ClientDependency.fromPath("sequenceanalysis/window/ChangeReadsetStatusWindow.js"))));`
	`19`	`+ super(ModuleLoader.getInstance().getModule(SequenceAnalysisModule.class), "Change Readset Status", "SequenceAnalysis.window.ChangeReadsetStatusWindow.buttonHandlerForReadsets(dataRegionName);", Arrays.asList(ClientDependency.supplierFromPath("sequenceanalysis/window/ChangeReadsetStatusWindow.js")));`
`21`	`20`	`}`
`22`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,9 @@`
`5`	`5`	`import org.labkey.api.security.permissions.UpdatePermission;`
`6`	`6`	`import org.labkey.api.view.template.ClientDependency;`
`7`	`7`	`import org.labkey.sequenceanalysis.SequenceAnalysisModule;`
`8`		`-import org.labkey.sequenceanalysis.analysis.CellHashingHandler;`
`9`	`8`	`import org.labkey.sequenceanalysis.analysis.CiteSeqHandler;`
`10`	`9`
`11`	`10`	`import java.util.Arrays;`
`12`		`-import java.util.LinkedHashSet;`
`13`	`11`
`14`	`12`	`/**`
`15`	`13`	`* Created by bimber on 7/12/2017.`
`@@ -18,7 +16,11 @@ public class CiteSeqButton extends SimpleButtonConfigFactory`
`18`	`16`	`{`
`19`	`17`	`public CiteSeqButton()`
`20`	`18`	`{`
`21`		`- super(ModuleLoader.getInstance().getModule(SequenceAnalysisModule.class), "Generate CITE-seq Table", "SequenceAnalysis.window.OutputHandlerWindow.readsetButtonHandler(dataRegionName, '" + CiteSeqHandler.class.getName() + "');", new LinkedHashSet<>(Arrays.asList(ClientDependency.fromModuleName("ldk"), ClientDependency.fromModuleName("laboratory"), ClientDependency.fromPath("sequenceanalysis/window/OutputHandlerWindow.js"))));`
	`19`	`+ super(ModuleLoader.getInstance().getModule(SequenceAnalysisModule.class), "Generate CITE-seq Table", "SequenceAnalysis.window.OutputHandlerWindow.readsetButtonHandler(dataRegionName, '" + CiteSeqHandler.class.getName() + "');",`
	`20`	`+ Arrays.asList(`
	`21`	`+ ClientDependency.supplierFromModuleName("ldk"),`
	`22`	`+ ClientDependency.supplierFromModuleName("laboratory"),`
	`23`	`+ ClientDependency.supplierFromPath("sequenceanalysis/window/OutputHandlerWindow.js")));`
`22`	`24`	`setPermission(UpdatePermission.class);`
`23`	`25`	`}`
`24`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`import org.labkey.blast.BLASTModule;`
`7`	`7`
`8`	`8`	`import java.util.Arrays;`
`9`		`-import java.util.LinkedHashSet;`
`10`	`9`
`11`	`10`	`/**`
`12`	`11`	`* User: bimber`
`@@ -17,6 +16,6 @@ public class BlastOligosButton extends SimpleButtonConfigFactory`
`17`	`16`	`{`
`18`	`17`	`public BlastOligosButton()`
`19`	`18`	`{`
`20`		`- super(ModuleLoader.getInstance().getModule(BLASTModule.class), "BLAST Oligos", "BLAST.window.BlastOligosWindow.buttonHandler(dataRegionName);", new LinkedHashSet<>(Arrays.asList(ClientDependency.fromPath("laboratory.context"), ClientDependency.fromPath("blast/window/BlastOligosWindow.js"))));`
	`19`	`+ super(ModuleLoader.getInstance().getModule(BLASTModule.class), "BLAST Oligos", "BLAST.window.BlastOligosWindow.buttonHandler(dataRegionName);", Arrays.asList(ClientDependency.supplierFromPath("laboratory.context"), ClientDependency.supplierFromPath("blast/window/BlastOligosWindow.js")));`
`21`	`20`	`}`
`22`	`21`	`}`