Migrate to new JSONObject (#161)

Author: labkey-adam

GenotypeAssays/src/org/labkey/genotypeassays/assay/DefaultGenotypeAssaysImportMethod.java

@@ -27,6 +27,7 @@ public DefaultGenotypeAssaysImportMethod()
         super(GenotypeAssaysManager.GENOTYPE_ASSAY_PROVIDER);
     }
 
+    @Override
     public AssayParser getFileParser(Container c, User u, int assayId)
     {
         return new DefaultGenotypeAssayParser(this, c, u, assayId);

GenotypeAssays/src/org/labkey/genotypeassays/assay/SSPPivotingImportMethod.java

@@ -21,7 +21,6 @@
 import java.util.Map;
 
 /**
- * Created with IntelliJ IDEA.
  * User: bimber
  * Date: 12/9/12
  * Time: 7:58 AM
@@ -51,6 +50,7 @@ public JSONObject getMetadata(ViewContext ctx, ExpProtocol protocol)
         return _importMethod.getMetadata(ctx, protocol);
     }
 
+    @Override
     public String getTooltip()
     {
         return "Choose this option to upload data using a template with many allele typings per row";
@@ -62,7 +62,7 @@ public AssayParser getFileParser(Container c, User u, int assayId)
         return new Parser(this, c, u, assayId);
     }
 
-    private class Parser extends PivotingAssayParser
+    private static class Parser extends PivotingAssayParser
     {
         public Parser(PivotingImportMethod method, Container c, User u, int assayId)
         {

elispot_assay/src/org/labkey/elispot_assay/assay/AIDImportMethod.java

@@ -74,6 +74,7 @@ public String getTemplateInstructions()
         return super.getTemplateInstructions() + "<br><br>This import path assumes you prepared this run by creating/saving a template from this site, which defines your plate layout and sample information.  The results you enter below will be merged with that previously imported sample information using well.  When you select a saved plate template using the \'Saved Sample Information\' section above, you should see a list of the samples you uploaded.";
     }
 
+    @Override
     public AssayParser getFileParser(Container c, User u, int assayId)
     {
         return new Parser(this, c, u, assayId);

flowassays/src/org/labkey/flowassays/FlowAssaysDataProvider.java

@@ -51,6 +51,7 @@ public String getName()
         return FlowAssaysModule.NAME;
     }
 
+    @Override
     public ActionURL getInstructionsUrl(Container c, User u)
     {
         return null;
@@ -61,11 +62,13 @@ public boolean supportsTemplates()
         return false;
     }
 
+    @Override
     public List<NavItem> getDataNavItems(Container c, User u)
     {
         return Collections.emptyList();
     }
 
+    @Override
     public List<NavItem> getSampleNavItems(Container c, User u)
     {
         return Collections.emptyList();
@@ -87,26 +90,31 @@ public List<NavItem> getSettingsItems(Container c, User u)
         return items;
     }
 
+    @Override
     public JSONObject getTemplateMetadata(ViewContext ctx)
     {
         return null;
     }
 
+    @Override
     public Set<ClientDependency> getClientDependencies()
     {
         return Collections.emptySet();
     }
 
+    @Override
     public Module getOwningModule()
     {
         return _module;
     }
 
+    @Override
     public List<SummaryNavItem> getSummary(Container c, User u)
     {
         return Collections.emptyList();
     }
 
+    @Override
     public List<NavItem> getSubjectIdSummary(Container c, User u, String subjectId)
     {
         return Collections.emptyList();