merged

src/plugins/adufour/activecontours/DeformationProfiler.java

@@ -83,7 +83,7 @@ public class DeformationProfiler extends PluginTrackManagerProcessor implements
         }
     }
 
-    private JComboBox<Descriptors> jComboDescriptors = new JComboBox<Descriptors>(Descriptors.values());
+    private JComboBox jComboDescriptors = new JComboBox(Descriptors.values());
 
     private JButton jButtonSaveToVTK = new JButton("Export meshes to VTK files");
 
@@ -1102,10 +1102,11 @@ public class DeformationProfiler extends PluginTrackManagerProcessor implements
         return new Matrix(diag);
     }
 
-    private static Matrix ones(int m, int n) {
-		double[][] array = new double[m][n];
-		for (double[] row : array)
-			Arrays.fill(row, 1.0);
-		return new Matrix(array, m, n);
-	}>>>>>>>f5df793f8888f26b414aeecdb3fbc0732db1e1dc
+    private static Matrix ones(int m, int n)
+    {
+        double[][] array = new double[m][n];
+        for (double[] row : array)
+            Arrays.fill(row, 1.0);
+        return new Matrix(array, m, n);
+    }
 }