From be5c22289e5a2eb80f2a213c9abe9a03fd13fcac Mon Sep 17 00:00:00 2001 From: Jean-Yves Tinevez Date: Thu, 7 Nov 2024 11:59:43 +0100 Subject: [PATCH] Fix javadoc errors. --- .../plugin/trackmate/gui/editor/LabkitImporter.java | 4 ++-- .../editor/TrackMateLabKitSegmentationComponent.java | 9 +++++++-- .../trackmate/gui/editor/TrackMateLabkitFrame.java | 12 ++++++++---- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/main/java/fiji/plugin/trackmate/gui/editor/LabkitImporter.java b/src/main/java/fiji/plugin/trackmate/gui/editor/LabkitImporter.java index aa1c28d94..51697fed7 100644 --- a/src/main/java/fiji/plugin/trackmate/gui/editor/LabkitImporter.java +++ b/src/main/java/fiji/plugin/trackmate/gui/editor/LabkitImporter.java @@ -85,8 +85,8 @@ public LabkitImporter( * @param currentTimePoint * the time-point in the TrackMate model that corresponds to the * index image. - * @param the - * map of spots (vs the label value in the previous labeling) + * @param previousSpotLabels + * the map of spots (vs the label value in the previous labeling) * that were written in the previous index image. */ public void reimport( diff --git a/src/main/java/fiji/plugin/trackmate/gui/editor/TrackMateLabKitSegmentationComponent.java b/src/main/java/fiji/plugin/trackmate/gui/editor/TrackMateLabKitSegmentationComponent.java index 10c7bc50e..c4d407694 100644 --- a/src/main/java/fiji/plugin/trackmate/gui/editor/TrackMateLabKitSegmentationComponent.java +++ b/src/main/java/fiji/plugin/trackmate/gui/editor/TrackMateLabKitSegmentationComponent.java @@ -6,13 +6,13 @@ * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -43,6 +43,7 @@ import sc.fiji.labkit.ui.BasicLabelingComponent; import sc.fiji.labkit.ui.DefaultExtensible; import sc.fiji.labkit.ui.MenuBar; +import sc.fiji.labkit.ui.SegmentationComponent; import sc.fiji.labkit.ui.actions.AddLabelingIoAction; import sc.fiji.labkit.ui.actions.LabelEditAction; import sc.fiji.labkit.ui.actions.LabelingIoAction; @@ -58,6 +59,10 @@ import sc.fiji.labkit.ui.segmentation.PredictionLayer; /** + * This class is copy/pasted and adapted from {@link SegmentationComponent} to + * control what is shown in the TrackMate UI. This could be revised to avoid + * class duplication. + * * {@link SegmentationComponent} is the central Labkit UI component. Provides UI * to display and modify a {@link SegmentationModel}. *

diff --git a/src/main/java/fiji/plugin/trackmate/gui/editor/TrackMateLabkitFrame.java b/src/main/java/fiji/plugin/trackmate/gui/editor/TrackMateLabkitFrame.java index 5d3014ba1..f76cf3c9c 100644 --- a/src/main/java/fiji/plugin/trackmate/gui/editor/TrackMateLabkitFrame.java +++ b/src/main/java/fiji/plugin/trackmate/gui/editor/TrackMateLabkitFrame.java @@ -6,13 +6,13 @@ * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -42,6 +42,7 @@ import net.imagej.Dataset; import sc.fiji.labkit.pixel_classification.utils.SingletonContext; import sc.fiji.labkit.ui.InitialLabeling; +import sc.fiji.labkit.ui.LabkitFrame; import sc.fiji.labkit.ui.inputimage.DatasetInputImage; import sc.fiji.labkit.ui.inputimage.InputImage; import sc.fiji.labkit.ui.models.DefaultSegmentationModel; @@ -49,10 +50,13 @@ import sc.fiji.labkit.ui.utils.Notifier; /** + * This class is copied and adapted from {@link LabkitFrame}. + *

* The main Labkit window. (This window allows to segment a single image. It has * to be distinguished from the LabkitProjectFrame, which allows to operation on - * multiple images.) The window only contains a {@link SegmentationComponent} - * and shows the associated main menu. + * multiple images.) The window only contains a + * {@link TrackMateLabKitSegmentationComponent} and shows the associated main + * menu. * * @author Matthias Arzt */