More cleanup

Author: labkey-jeckels

elisa/src/org/labkey/elisa/actions/ElisaUploadWizardAction.java

@@ -29,7 +29,6 @@
 import org.labkey.api.data.DataRegion;
 import org.labkey.api.exp.ExperimentException;
 import org.labkey.api.exp.api.ExpProtocol;
-import org.labkey.api.exp.api.ExpRun;
 import org.labkey.api.exp.api.ExperimentService;
 import org.labkey.api.exp.property.DomainProperty;
 import org.labkey.api.query.PropertyValidationError;
@@ -117,7 +116,7 @@ public boolean executeStep(ElisaRunUploadForm form, BindException errors) throws
             }
 
             @Override
-            public ModelAndView getNextStep(ElisaRunUploadForm form, BindException errors) throws ServletException, SQLException, ExperimentException
+            public ModelAndView getNextStep(ElisaRunUploadForm form, BindException errors) throws ExperimentException
             {
                 if (form.isResetDefaultValues() || errors.hasErrors())
                     return getRunPropertiesView(form, !form.isResetDefaultValues(), false, errors);
@@ -230,7 +229,6 @@ public void validateStep(ElisaRunUploadForm form, Errors errors)
         @Override
         public boolean executeStep(ElisaRunUploadForm form, BindException errors) throws ServletException, SQLException, ExperimentException
         {
-            ExpRun run;
             try
             {
                 PlateConcentrationPropertyHelper helper = createConcentrationPropertyHelper(form.getContainer(), form.getProtocol(), form.getProvider());
@@ -263,7 +261,7 @@ public boolean executeStep(ElisaRunUploadForm form, BindException errors) throws
         }
 
         @Override
-        public ModelAndView getNextStep(ElisaRunUploadForm form, BindException errors) throws ServletException, SQLException, ExperimentException
+        public ModelAndView getNextStep(ElisaRunUploadForm form, BindException errors) throws ExperimentException
         {
             if (form.isResetDefaultValues() || errors.hasErrors())
                 return getConcentrationsView(form, !form.isResetDefaultValues(), errors);

flow/enginesrc/org/labkey/flow/analysis/chart/DensityPlot.java

@@ -19,7 +19,6 @@
 import org.jfree.chart.plot.*;
 import org.jfree.chart.axis.ValueAxis;
 import org.jfree.chart.axis.ColorBar;
-import org.jfree.chart.axis.NumberAxis;
 import org.jfree.chart.entity.EntityCollection;
 import org.jfree.chart.entity.ContourEntity;
 import org.jfree.ui.RectangleEdge;
@@ -50,7 +49,7 @@ public PolygonData(String label, Polygon poly)
         Polygon _poly;
     }
 
-    List _polyDatas = new ArrayList();
+    List<PolygonData> _polyDatas = new ArrayList<>();
 
     public DensityPlot(DensityDataset dataset, ValueAxis domainAxis, ValueAxis rangeAxis, ColorBar colorBar)
     {
@@ -157,9 +156,8 @@ public void render(Graphics2D g2, Rectangle2D dataArea, PlotRenderingInfo info,
     {
         super.render(g2, dataArea, info, crosshairState);
         g2.setColor(PlotFactory.COLOR_GATE);
-        for (Iterator it = _polyDatas.iterator(); it.hasNext();)
+        for (PolygonData data : _polyDatas)
         {
-            PolygonData data = (PolygonData) it.next();
             drawPolygon(g2, dataArea, data);
         }
     }
@@ -248,14 +246,6 @@ public void contourRenderer(Graphics2D g2,
         Object antiAlias = g2.getRenderingHint(RenderingHints.KEY_ANTIALIASING);
         g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
 
-        int[] xIndex = data.indexX();
-        int[] indexX = data.getXIndices();
-        boolean vertInverted = verticalAxis.isInverted();
-        boolean horizInverted = false;
-        if (horizontalAxis instanceof NumberAxis)
-        {
-            horizontalAxis.isInverted();
-        }
         double[] arrX = data.getPossibleXValues();
         double[] arrY = data.getPossibleYValues();
         double[] arrTransX = getTranslatedValues(arrX, horizontalAxis, dataArea, RectangleEdge.BOTTOM);
@@ -338,8 +328,6 @@ else if (this.getMissingPaint() != null)
 
         g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, antiAlias);
 
-        return;
-
     }
 
     public void addPolygon(String label, Polygon poly)