Skip to content

Commit 6514509

Browse files
authored
Merge pull request #116 from lquenti/master
Fixed bugs found by static code analyzer. And reported on github.
2 parents 1e258a6 + e3001ca commit 6514509

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/main/java/sc/fiji/labkit/ui/inputimage/SpimDataToImgPlus.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,6 @@ static boolean transformationEquals(AffineTransform3D a, AffineTransform3D b) {
280280
max_difference = Math.max(max_difference, Math.abs(va - vb));
281281
}
282282
}
283-
return max_difference == 0.0 | max_difference < max_abs_value * 1e-6;
283+
return max_difference == 0.0 || max_difference < max_abs_value * 1e-6;
284284
}
285285
}

src/main/java/sc/fiji/labkit/ui/models/ImageLabelingModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ private AffineTransform3D getScaling(Interval inputImage,
195195
private long[] get3dDimensions(Interval interval) {
196196
long[] result = new long[3];
197197
int n = interval.numDimensions();
198-
for (int i = 0; i < n & i < 3; i++)
198+
for (int i = 0; i < n && i < 3; i++)
199199
result[i] = interval.dimension(i);
200200
for (int i = n; i < 3; i++)
201201
result[i] = 1;

src/main/java/sc/fiji/labkit/ui/panel/GuiUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public static JButton createActionIconButton(String name, final Action action,
5555
{
5656
JButton button = new JButton(action);
5757
button.setText(name);
58-
if (icon != "") {
58+
if (icon.isEmpty()) {
5959
button.setIcon(loadIcon(icon));
6060
button.setIconTextGap(5);
6161
button.setMargin(new Insets(button.getMargin().top, 3, button

0 commit comments

Comments
 (0)