Commit d3429417 authored by Andrey Filippov's avatar Andrey Filippov
Browse files

suppressed some warnings, some fixed

parent d93d350f

src/main/java/CalibrationHardwareInterface.java

+6 −3
Original line number Diff line number Diff line
@@ -3120,7 +3120,7 @@ public class CalibrationHardwareInterface { 
    	} catch (IOException e) {

    		String msg="Failed to write XML motor state file: "+path;

    		IJ.showMessage("Error",msg);

    		throw new IOException (msg);

    		extracted(msg);

    	}

    	try {

    		os.close();
@@ -3146,7 +3146,7 @@ public class CalibrationHardwareInterface { 
    	} catch (IOException e) {

    		String msg="Failed to read XML configuration file: "+path;

    		IJ.showMessage("Error",msg);

    		throw new IOException (msg);

    		extracted(msg);

    	}

    	try {

    		is.close();
@@ -3164,11 +3164,14 @@ public class CalibrationHardwareInterface { 
    		} else {

    			String msg="motor"+(i+1)+" is undefined in "+path+". If the file is corrupted you may delete it.";

    			IJ.showMessage("Error",msg);

    			throw new IOException (msg);

    			extracted(msg);

    		}

    	}

    	return savedPosition;

    }

	private void extracted(String msg) throws IOException {

		throw new IOException (msg);

	}

    public void checkEnabled(){

    	if (isEnabled()) return;

    	GenericDialog gd = new GenericDialog("Enable motors");

src/main/java/DebayerScissors.java

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
import ij.IJ;

import ij.ImageStack;



import java.lang.reflect.InvocationTargetException;

import java.util.concurrent.atomic.AtomicInteger;



import javax.swing.SwingUtilities;

src/main/java/DenseCorrespondence.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ public class DenseCorrespondence { 






	private void disparitySweepTile (

	public void disparitySweepTile ( // never used so far

			int tileX,

			int tileY,

			CyclopeanTile [][] allCyclopeanMap,

src/main/java/PixelMapping.java

+24 −12
Original line number Diff line number Diff line
@@ -9410,6 +9410,7 @@ public class PixelMapping { 
        		private BitSet innerMask=null;

        		private int []borderMask=null;

        		public int getNumberOfPlanes(){return this.maximums.length;}

        		@SuppressWarnings("unused")

				public int getForegroundPlane(){return this.foregroundIndex;}

        		public double getPlaneDisparity (int plane){return this.maximums[plane][0];}

        		public void setPlaneDisparity (double disparity, int plane){this.maximums[plane][0]=disparity;}
@@ -9448,6 +9449,7 @@ public class PixelMapping { 
        			this.auxData=new float[n][];

        			for (int i=0;i<n;i++) this.auxData[i]=null;

        		}

        		@SuppressWarnings("unused")

				public void resetAux(){

        			this.auxData=null;

        		}
@@ -9455,6 +9457,7 @@ public class PixelMapping { 
        			if (this.auxData==null) initAux(n+1);

        			this.auxData[n]=data;

        		}

        		@SuppressWarnings("unused")

				public float [][] getAux (){

        			return this.auxData;

        		}
@@ -9467,16 +9470,20 @@ public class PixelMapping { 
        			this.likely=new float[this.numPlanes][];

        			for (int i=0;i<this.numPlanes;i++) this.likely[i]=null;

        		}

        		@SuppressWarnings("unused")

				public void resetLikely(){

        			this.likely=null;

        		}

        		@SuppressWarnings("unused")

				public void setLikely(int n, float [] data){

        			if (this.likely==null) initLikely();

        			this.likely[n]=data;

        		}

        		@SuppressWarnings("unused")

				public float [][] getLikely (){

        			return this.likely;

        		}

        		@SuppressWarnings("unused")

				public float [] getLikely (int n){

        			if ((this.likely==null) || (this.likely.length<=n)) return null;

        			return this.likely[n];
@@ -9486,16 +9493,20 @@ public class PixelMapping { 
        			this.unlikely=new float[this.numPlanes][];

        			for (int i=0;i<this.numPlanes;i++) this.unlikely[i]=null;

        		}

        		@SuppressWarnings("unused")

				public void resetUnlikely(){

        			this.unlikely=null;

        		}

        		@SuppressWarnings("unused")

				public void setUnlikely(int n, float [] data){

        			if (this.unlikely==null) initUnlikely();

        			this.unlikely[n]=data;

        		}

        		@SuppressWarnings("unused")

				public float [][] getUnlikely(){

        			return this.unlikely;

        		}

        		@SuppressWarnings("unused")

				public float [] getUnlikely(int n){

        			if ((this.unlikely==null) || (this.unlikely.length<=n)) return null;

        			return this.unlikely[n];
@@ -9584,6 +9595,7 @@ public class PixelMapping { 
        		 * @param disparityTolerance - consider "this" as being withing disparityTolerance of disparity. NaN - do not filter by this

        		 * @return

        		 */

        		@SuppressWarnings("unused")

				public boolean [] getEnabledNonOccluded(

        				double disparityFG,

        				double disparity,