Skip to content

Commit 36c78f3

Browse files
mfl28mfl28
committed
Reformat code.
1 parent ef23ba6 commit 36c78f3

40 files changed

+1256
-764
lines changed

‎src/main/java/boundingboxeditor/BoundingBoxEditorApp.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ public void start(Stage primaryStage) {
4545
private Scene createSceneFromParent(Parent parent) {
4646
final Rectangle2D screenBounds = Screen.getPrimary().getVisualBounds();
4747
return new Scene(parent, INITIAL_WINDOW_SCALE * screenBounds.getWidth(),
48-
INITIAL_WINDOW_SCALE * screenBounds.getHeight());
48+
INITIAL_WINDOW_SCALE * screenBounds.getHeight());
4949
}
5050
}

‎src/main/java/boundingboxeditor/controller/Controller.java‎

Lines changed: 182 additions & 115 deletions
Large diffs are not rendered by default.

‎src/main/java/boundingboxeditor/model/ImageMetaData.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public ImageMetaData(String fileName) {
4444
public static ImageMetaData fromFile(File imageFile) throws IOException {
4545
ImageDimensions imageDimensions = readImageDimensionsFromFile(imageFile);
4646
return new ImageMetaData(imageFile.getName(), imageFile.toPath().getParent().toFile().getName(),
47-
imageDimensions.getWidth(), imageDimensions.getHeight(), imageDimensions.getDepth());
47+
imageDimensions.getWidth(), imageDimensions.getHeight(), imageDimensions.getDepth());
4848
}
4949

5050
/**
@@ -113,7 +113,8 @@ public boolean equals(Object obj) {
113113
@Override
114114
public String toString() {
115115
return "ImageMetaData[fileName=" + getFileName() + ", folderName=" + getFolderName()
116-
+ ", image-width=" + getImageWidth() + ", image-height=" + getImageHeight() + ", image-depth=" + getImageDepth();
116+
+ ", image-width=" + getImageWidth() + ", image-height=" + getImageHeight() + ", image-depth=" +
117+
getImageDepth();
117118
}
118119

119120
public String getDimensionsString() {

‎src/main/java/boundingboxeditor/model/Model.java‎

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@ public void updateBoundingShapeDataAtFileIndex(int fileIndex, List<BoundingShape
117117
String fileName = imageFileNameToFile.get(fileIndex);
118118

119119
ImageAnnotation imageAnnotation = imageFileNameToAnnotation.getOrDefault(fileName,
120-
new ImageAnnotation(imageFileNameToMetaData.get(fileName)));
120+
new ImageAnnotation(
121+
imageFileNameToMetaData
122+
.get(fileName)));
121123

122124
if(!boundingShapeData.isEmpty()) {
123125
imageAnnotation.setBoundingShapeData(boundingShapeData);
@@ -150,23 +152,27 @@ public void updateImageAnnotations(List<ImageAnnotation> imageAnnotations) {
150152

151153
public ImageMetaData createOrGetCurrentImageMetaData() {
152154
return imageFileNameToMetaData.computeIfAbsent(getCurrentImageFileName(),
153-
key -> {
154-
ImageMetaData newMetaData;
155+
key -> {
156+
ImageMetaData newMetaData;
155157

156-
try {
157-
newMetaData = ImageMetaData.fromFile(getCurrentImageFile());
158-
} catch(IOException e) {
159-
throw new UncheckedIOException(e);
160-
}
158+
try {
159+
newMetaData =
160+
ImageMetaData.fromFile(getCurrentImageFile());
161+
} catch(IOException e) {
162+
throw new UncheckedIOException(e);
163+
}
161164

162-
ImageAnnotation currentImageAnnotation = getCurrentImageAnnotation();
165+
ImageAnnotation currentImageAnnotation =
166+
getCurrentImageAnnotation();
163167

164-
if(currentImageAnnotation != null && !currentImageAnnotation.getImageMetaData().hasDetails()) {
165-
currentImageAnnotation.setImageMetaData(newMetaData);
166-
}
168+
if(currentImageAnnotation != null &&
169+
!currentImageAnnotation.getImageMetaData()
170+
.hasDetails()) {
171+
currentImageAnnotation.setImageMetaData(newMetaData);
172+
}
167173

168-
return newMetaData;
169-
});
174+
return newMetaData;
175+
});
170176
}
171177

172178
/**
@@ -356,7 +362,8 @@ public List<File> getImageFiles() {
356362

357363
public void setImageFiles(Collection<File> imageFiles) {
358364
imageFileNameToFile = ListOrderedMap.listOrderedMap(imageFiles.parallelStream()
359-
.collect(LinkedHashMap::new, (map, item) -> map.put(item.getName(), item), Map::putAll));
365+
.collect(LinkedHashMap::new, (map, item) -> map
366+
.put(item.getName(), item), Map::putAll));
360367

361368
nrImageFiles.set(imageFileNameToFile.size());
362369
fileIndex.set(0);
@@ -397,7 +404,7 @@ private void setUpInternalListeners() {
397404
while(c.next()) {
398405
if(c.wasAdded()) {
399406
c.getAddedSubList().forEach(item ->
400-
categoryToAssignedBoundingShapesCount.put(item.getName(), 0));
407+
categoryToAssignedBoundingShapesCount.put(item.getName(), 0));
401408
}
402409

403410
if(c.wasRemoved()) {

‎src/main/java/boundingboxeditor/model/io/BoundingBoxData.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public BoundingBoxData(ObjectCategory category, Bounds relativeBoundsInImage, Li
5050
double xMaxRelative, double yMaxRelative, List<String> tags) {
5151
super(category, tags);
5252
this.relativeBoundsInImage = new BoundingBox(xMinRelative, yMinRelative,
53-
xMaxRelative - xMinRelative, yMaxRelative - yMinRelative);
53+
xMaxRelative - xMinRelative, yMaxRelative - yMinRelative);
5454
}
5555

5656
/**

‎src/main/java/boundingboxeditor/model/io/BoundingPolygonData.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ public List<Double> getRelativePointsInImage() {
5454

5555
public List<Double> getAbsolutePointsInImage(ImageMetaData imageMetaData) {
5656
return BoundingPolygonData.relativeToAbsolutePoints(relativePointsInImage,
57-
imageMetaData.getImageWidth(), imageMetaData.getImageHeight());
57+
imageMetaData.getImageWidth(),
58+
imageMetaData.getImageHeight());
5859
}
5960

6061
@Override

‎src/main/java/boundingboxeditor/model/io/FileChangeWatcher.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,12 @@ public void run() {
3333
WatchService watchService = FileSystems.getDefault().newWatchService();
3434

3535
directoryToWatch.register(watchService, StandardWatchEventKinds.ENTRY_DELETE,
36-
StandardWatchEventKinds.ENTRY_MODIFY);
36+
StandardWatchEventKinds.ENTRY_MODIFY);
3737

3838
WatchKey key;
3939
while((key = watchService.take()) != null) {
40-
if(key.pollEvents().stream().anyMatch(watchEvent -> fileNamesToWatch.contains(watchEvent.context().toString()))) {
40+
if(key.pollEvents().stream()
41+
.anyMatch(watchEvent -> fileNamesToWatch.contains(watchEvent.context().toString()))) {
4142
Platform.runLater(onFilesChangedHandler);
4243
} else {
4344
key.reset();

‎src/main/java/boundingboxeditor/model/io/JSONSaveStrategy.java‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
import java.util.concurrent.atomic.AtomicInteger;
1919

2020
public class JSONSaveStrategy implements ImageAnnotationSaveStrategy {
21-
private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#.######", DecimalFormatSymbols.getInstance(Locale.ENGLISH));
21+
private static final DecimalFormat DECIMAL_FORMAT =
22+
new DecimalFormat("#.######", DecimalFormatSymbols.getInstance(Locale.ENGLISH));
2223
private static final String OBJECT_CATEGORY_SERIALIZED_NAME = "name";
2324
private static final String OBJECT_COLOR_SERIALIZED_NAME = "color";
2425
private static final String BOUNDS_MIN_X_SERIALIZED_NAME = "minX";
@@ -33,24 +34,29 @@ public IOResult save(ImageAnnotationData annotations, Path destination, DoublePr
3334

3435
final Gson gson = new GsonBuilder()
3536
.setPrettyPrinting()
36-
.registerTypeAdapter(ImageAnnotationData.class, (JsonSerializer<ImageAnnotationData>) (src, typeOfSrc, context) -> {
37-
JsonArray serializedAnnotations = new JsonArray();
37+
.registerTypeAdapter(ImageAnnotationData.class,
38+
(JsonSerializer<ImageAnnotationData>) (src, typeOfSrc, context) -> {
39+
JsonArray serializedAnnotations = new JsonArray();
3840

39-
for(ImageAnnotation annotation : src.getImageAnnotations()) {
40-
serializedAnnotations.add(context.serialize(annotation));
41-
progress.set(1.0 * nrProcessedAnnotations.incrementAndGet() / totalNrAnnotations);
42-
}
41+
for(ImageAnnotation annotation : src.getImageAnnotations()) {
42+
serializedAnnotations.add(context.serialize(annotation));
43+
progress.set(1.0 * nrProcessedAnnotations.incrementAndGet() /
44+
totalNrAnnotations);
45+
}
4346

44-
return serializedAnnotations;
45-
})
46-
.registerTypeAdapter(ObjectCategory.class, (JsonSerializer<ObjectCategory>) (src, typeOfSrc, context) -> {
47-
JsonObject categoryObject = new JsonObject();
48-
categoryObject.add(OBJECT_CATEGORY_SERIALIZED_NAME, context.serialize(src.getName()));
49-
categoryObject.add(OBJECT_COLOR_SERIALIZED_NAME,
50-
context.serialize(ColorUtils.colorToHexString(src.getColor())));
47+
return serializedAnnotations;
48+
})
49+
.registerTypeAdapter(ObjectCategory.class,
50+
(JsonSerializer<ObjectCategory>) (src, typeOfSrc, context) -> {
51+
JsonObject categoryObject = new JsonObject();
52+
categoryObject.add(OBJECT_CATEGORY_SERIALIZED_NAME,
53+
context.serialize(src.getName()));
54+
categoryObject.add(OBJECT_COLOR_SERIALIZED_NAME,
55+
context.serialize(
56+
ColorUtils.colorToHexString(src.getColor())));
5157

52-
return categoryObject;
53-
})
58+
return categoryObject;
59+
})
5460
.registerTypeHierarchyAdapter(Bounds.class, (JsonSerializer<Bounds>) (src, typeOfSrc, context) -> {
5561
JsonObject boundsObject = new JsonObject();
5662
boundsObject.add(BOUNDS_MIN_X_SERIALIZED_NAME, context.serialize(src.getMinX()));

0 commit comments

Comments
 (0)