Merge pull request #116 from lquenti/master

Fixed bugs found by static code analyzer. And reported on github.
juglab · Jul 22, 2024 · 6514509 · 6514509
2 parents 1e258a6 + e3001ca
commit 6514509
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/sc/fiji/labkit/ui/inputimage/SpimDataToImgPlus.java b/src/main/java/sc/fiji/labkit/ui/inputimage/SpimDataToImgPlus.java
@@ -280,6 +280,6 @@ static boolean transformationEquals(AffineTransform3D a, AffineTransform3D b) {
 				max_difference = Math.max(max_difference, Math.abs(va - vb));
 			}
 		}
-		return max_difference == 0.0 | max_difference < max_abs_value * 1e-6;
+		return max_difference == 0.0 || max_difference < max_abs_value * 1e-6;
 	}
 }
diff --git a/src/main/java/sc/fiji/labkit/ui/models/ImageLabelingModel.java b/src/main/java/sc/fiji/labkit/ui/models/ImageLabelingModel.java
@@ -195,7 +195,7 @@ private AffineTransform3D getScaling(Interval inputImage,
 	private long[] get3dDimensions(Interval interval) {
 		long[] result = new long[3];
 		int n = interval.numDimensions();
-		for (int i = 0; i < n & i < 3; i++)
+		for (int i = 0; i < n && i < 3; i++)
 			result[i] = interval.dimension(i);
 		for (int i = n; i < 3; i++)
 			result[i] = 1;

diff --git a/src/main/java/sc/fiji/labkit/ui/panel/GuiUtils.java b/src/main/java/sc/fiji/labkit/ui/panel/GuiUtils.java
@@ -55,7 +55,7 @@ public static JButton createActionIconButton(String name, final Action action,
 	{
 		JButton button = new JButton(action);
 		button.setText(name);
-		if (icon != "") {
+		if (icon.isEmpty()) {
 			button.setIcon(loadIcon(icon));
 			button.setIconTextGap(5);
 			button.setMargin(new Insets(button.getMargin().top, 3, button