fixing conflict

src/main/java/Eyesis_Correction.java

@@ -25,18 +25,16 @@
 **
 */
 
-import ij.*;
-import ij.process.*;
-import ij.gui.*;
-import ij.io.FileInfo;
-import ij.io.FileSaver;
-import ij.io.OpenDialog;
-import ij.io.Opener;
-import ij.plugin.frame.*;
-import ij.plugin.PlugIn;
-
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.Button;
+import java.awt.Color;
+import java.awt.Frame;
+import java.awt.GraphicsEnvironment;
+import java.awt.GridLayout;
+import java.awt.Panel;
+import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowEvent;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -54,6 +52,28 @@ import java.util.concurrent.atomic.AtomicInteger;
 import javax.swing.JFileChooser;
 import javax.swing.filechooser.FileFilter;
 
+import ij.CompositeImage;
+import ij.IJ;
+import ij.ImageJ;
+import ij.ImagePlus;
+import ij.ImageStack;
+import ij.Macro;
+import ij.Prefs;
+import ij.WindowManager;
+import ij.gui.GUI;
+import ij.gui.GenericDialog;
+import ij.gui.Plot;
+import ij.gui.PlotWindow;
+import ij.gui.Roi;
+import ij.io.FileInfo;
+import ij.io.FileSaver;
+import ij.io.OpenDialog;
+import ij.io.Opener;
+import ij.plugin.PlugIn;
+import ij.plugin.frame.PlugInFrame;
+import ij.process.ColorProcessor;
+import ij.process.FloatProcessor;
+import ij.process.ImageProcessor;
 import loci.common.services.DependencyException;
 import loci.common.services.ServiceException;
 import loci.formats.FormatException;
@@ -346,6 +366,7 @@ private Panel panel1,
 	    public String  buttonLabel="";
 	}
 
+	@Override
 	public void run(String arg) {
 		String options=Macro.getOptions();
 		try {
@@ -378,7 +399,7 @@ private Panel panel1,
 		Color color_conf_process=  new Color(180, 240, 240);
 		Color color_restore=       new Color(180, 240, 180);
 		Color color_stop=          new Color(255, 160, 160);
-<<<<<<< HEAD
+//<<<<<<< HEAD
 		plugInFrame=new PlugInFrame("Eyesis_Correction") {
 			private static final long serialVersionUID = -4138832568507690332L;
 			@Override
@@ -389,11 +410,11 @@ private Panel panel1,
 				}
 			}
 		};
-		instance=(Frame)plugInFrame;
+		instance=plugInFrame;
 		plugInFrame.addKeyListener(IJ.getInstance());
 		int menuRows=4 + (ADVANCED_MODE?4:0) + (MODE_3D?3:0);
 		plugInFrame.setLayout(new GridLayout(menuRows, 1));
-=======
+/*=======
 
 
 		instance = this;
@@ -402,6 +423,7 @@ private Panel panel1,
 		setLayout(new GridLayout(menuRows, 1));
 
 >>>>>>> origin/dct
+*/
 		panel6 = new Panel();
 		panel6.setLayout(new GridLayout(1, 0, 5, 5));
 		addButton("Save",panel6);
@@ -497,9 +519,9 @@ private Panel panel1,
 			addButton("Plane Likely", panelPostProcessing3);
 			plugInFrame.add(panelPostProcessing3);
 		}
-<<<<<<< HEAD
+// <<<<<<< HEAD
 		plugInFrame.pack();
-=======
+/* =======
 		if (DCT_MODE) {
 			panelDct1 = new Panel();
 			panelDct1.setLayout(new GridLayout(1, 0, 5, 5)); // rows, columns, vgap, hgap
@@ -534,7 +556,7 @@ private Panel panel1,
 		}
 		pack();
 >>>>>>> origin/dct
-
+*/
 		GUI.center(plugInFrame);
 		plugInFrame.setVisible(true);
 		FHT_INSTANCE=       new DoubleFHT();
@@ -647,6 +669,7 @@ private Panel panel1,
 		b.addKeyListener(IJ.getInstance());
 		panel.add(b);
 	}
+	@Override
 	public void actionPerformed(ActionEvent e) {
 		String label = e.getActionCommand();
 		if        (label.equals("Abort")) {
@@ -2612,7 +2635,7 @@ private Panel panel1,
 
 
     	for (int ii = 0; ii<n; ii++) {
-    		dindex[ii] = (double) ii;
+    		dindex[ii] = ii;
     		x[ii] = 0.0;
     	}
 //    	x[1] = 1.0;
@@ -4306,6 +4329,7 @@ private Panel panel1,
 	  public MultipleExtensionsFileFilter (String [] patterns) {
 		  this.patterns=patterns.clone();
 	  }
+	  @Override
 	public boolean accept (File file) {
 		  int i;
 		  String name=file.getName();
@@ -4315,6 +4339,7 @@ private Panel panel1,
 		  }
 		  return false;
 	  }
+	  @Override
 	public String getDescription() {
 		  return description;
 	  }
@@ -5613,6 +5638,7 @@ private Panel panel1,
 	  final long startTime = System.nanoTime();
 	  for (int ithread = 0; ithread < threads.length; ithread++) {
 		  threads[ithread] = new Thread() {
+			  @Override
 			public void run() {
 				  float [] pixels=null;       // will be initialized at first use
 				  float [] kernelPixels=null; // will be initialized at first use
@@ -5755,6 +5781,7 @@ private Panel panel1,
 	  final long startTime = System.nanoTime();
 	  for (int ithread = 0; ithread < threads.length; ithread++) {
 		  threads[ithread] = new Thread() {
+			  @Override
 			public void run() {
 				  double [][] tile=        new double[nChn][debayerParameters.size * debayerParameters.size ];
 				  double [][] both_masks;
@@ -6002,6 +6029,7 @@ private Panel panel1,
 	  final long startTime = System.nanoTime();
 	  for (int ithread = 0; ithread < threads.length; ithread++) {
 		  threads[ithread] = new Thread() {
+			  @Override
 			public void run() {
 				  double [] tile=        new double[size * size ];
 				  int tileY,tileX;