Index: /applications/editors/josm/plugins/piclayer/.settings/org.eclipse.jdt.core.prefs =================================================================== --- /applications/editors/josm/plugins/piclayer/.settings/org.eclipse.jdt.core.prefs (revision 34169) +++ /applications/editors/josm/plugins/piclayer/.settings/org.eclipse.jdt.core.prefs (revision 34170) @@ -3,10 +3,15 @@ org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.doc.comment.support=enabled +org.eclipse.jdt.core.compiler.problem.APILeak=warning org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error @@ -32,4 +37,9 @@ org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning +org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning @@ -38,7 +48,15 @@ org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning @@ -46,4 +64,5 @@ org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error org.eclipse.jdt.core.compiler.problem.nullReference=warning @@ -52,4 +71,5 @@ org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore @@ -68,4 +88,5 @@ org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled @@ -74,4 +95,7 @@ org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled +org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore @@ -81,4 +105,5 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=warning org.eclipse.jdt.core.compiler.problem.unusedLabel=warning Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java (revision 34169) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java (revision 34170) @@ -49,6 +49,8 @@ JosmAction newLayerFromFileAction = new NewLayerFromFileAction(); JosmAction newLayerFromClipboardAction = new NewLayerFromClipboardAction(); + /** - * Constructor... + * Constructor. + * @param info plugin info */ public PicLayerPlugin(PluginInformation info) { @@ -73,14 +75,14 @@ if (newFrame != null) { // Create plugin map modes - MovePictureAction movePictureAction = new MovePictureAction(newFrame); - MovePointAction movePointAction = new MovePointAction(newFrame); - TransformPointAction transformPointAction = new TransformPointAction(newFrame); - RemovePointAction removePointAction = new RemovePointAction(newFrame); + MovePictureAction movePictureAction = new MovePictureAction(); + MovePointAction movePointAction = new MovePointAction(); + TransformPointAction transformPointAction = new TransformPointAction(); + RemovePointAction removePointAction = new RemovePointAction(); - RotatePictureAction rotatePictureAction = new RotatePictureAction(newFrame); - ScaleXYPictureAction scaleXYPictureAction = new ScaleXYPictureAction(newFrame); - ScaleXPictureAction scaleXPictureAction = new ScaleXPictureAction(newFrame); - ScaleYPictureAction scaleYPictureAction = new ScaleYPictureAction(newFrame); - ShearPictureAction shearPictureAction = new ShearPictureAction(newFrame); + RotatePictureAction rotatePictureAction = new RotatePictureAction(); + ScaleXYPictureAction scaleXYPictureAction = new ScaleXYPictureAction(); + ScaleXPictureAction scaleXPictureAction = new ScaleXPictureAction(); + ScaleYPictureAction scaleYPictureAction = new ScaleYPictureAction(); + ShearPictureAction shearPictureAction = new ShearPictureAction(); // Create plugin buttons and add them to the toolbar Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/GenericPicTransformAction.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/GenericPicTransformAction.java (revision 34169) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/GenericPicTransformAction.java (revision 34170) @@ -18,5 +18,7 @@ import org.openstreetmap.josm.tools.Shortcut; -@SuppressWarnings("serial") +/** + * Superclass of transformation actions. + */ public abstract class GenericPicTransformAction extends MapMode implements MouseListener, MouseMotionListener { @@ -35,6 +37,5 @@ } - public GenericPicTransformAction(String name, String actionName, String iconName, - String tooltip, MapFrame mapFrame, Cursor cursor) { + public GenericPicTransformAction(String name, String actionName, String iconName, String tooltip, Cursor cursor) { super(name, iconName, tooltip, cursor); this.actionName = actionName; Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/LoadPictureCalibrationAction.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/LoadPictureCalibrationAction.java (revision 34169) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/LoadPictureCalibrationAction.java (revision 34170) @@ -20,5 +20,4 @@ * */ -@SuppressWarnings("serial") public class LoadPictureCalibrationAction extends JosmAction { @@ -31,4 +30,5 @@ /** * Constructor + * @param owner Owner layer of the action */ public LoadPictureCalibrationAction(PicLayerAbstract owner) { Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/LoadPictureCalibrationFromWorldAction.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/LoadPictureCalibrationFromWorldAction.java (revision 34169) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/LoadPictureCalibrationFromWorldAction.java (revision 34170) @@ -14,5 +14,7 @@ import org.openstreetmap.josm.plugins.piclayer.layer.PicLayerAbstract; -@SuppressWarnings("serial") +/** + * Action to import World File Calibration. + */ public class LoadPictureCalibrationFromWorldAction extends JosmAction { Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/ResetCalibrationAction.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/ResetCalibrationAction.java (revision 34169) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/ResetCalibrationAction.java (revision 34170) @@ -11,5 +11,7 @@ import org.openstreetmap.josm.plugins.piclayer.transform.PictureTransform; -@SuppressWarnings("serial") +/** + * Action to reset Calibration. + */ public class ResetCalibrationAction extends JosmAction { Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/SavePictureCalibrationAction.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/SavePictureCalibrationAction.java (revision 34169) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/SavePictureCalibrationAction.java (revision 34170) @@ -22,5 +22,4 @@ * TODO Four almost identical classes. Refactoring needed. */ -@SuppressWarnings("serial") public class SavePictureCalibrationAction extends JosmAction { @@ -30,4 +29,5 @@ /** * Constructor + * @param owner Owner layer of the action */ public SavePictureCalibrationAction(PicLayerAbstract owner) { Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/SavePictureCalibrationToWorldAction.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/SavePictureCalibrationToWorldAction.java (revision 34169) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/SavePictureCalibrationToWorldAction.java (revision 34170) @@ -17,4 +17,7 @@ import org.openstreetmap.josm.plugins.piclayer.layer.PicLayerAbstract; +/** + * Action to export World file Calibration. + */ public class SavePictureCalibrationToWorldAction extends JosmAction { @@ -55,5 +58,5 @@ } } - + // Save dialog final JFileChooser fc = new JFileChooser(); @@ -73,5 +76,5 @@ for (int i = 0; i < 6; i++) { bw.write(Double.toString(values[i])); - if (i<5) { + if (i < 5) { bw.newLine(); } Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/newlayer/NewLayerFromClipboardAction.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/newlayer/NewLayerFromClipboardAction.java (revision 34169) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/newlayer/NewLayerFromClipboardAction.java (revision 34170) @@ -17,5 +17,4 @@ * the content of the clipboard. */ -@SuppressWarnings("serial") public class NewLayerFromClipboardAction extends JosmAction { Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/newlayer/NewLayerFromFileAction.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/newlayer/NewLayerFromFileAction.java (revision 34169) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/newlayer/NewLayerFromFileAction.java (revision 34170) @@ -29,5 +29,4 @@ * Action responsible for creation of new layers based on image files. */ -@SuppressWarnings("serial") public class NewLayerFromFileAction extends JosmAction { Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/MovePictureAction.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/MovePictureAction.java (revision 34169) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/MovePictureAction.java (revision 34170) @@ -8,5 +8,4 @@ import org.openstreetmap.josm.data.coor.EastNorth; import org.openstreetmap.josm.gui.MainApplication; -import org.openstreetmap.josm.gui.MapFrame; import org.openstreetmap.josm.plugins.piclayer.actions.GenericPicTransformAction; import org.openstreetmap.josm.tools.ImageProvider; @@ -15,5 +14,4 @@ * This class handles the input during moving the picture. */ -@SuppressWarnings("serial") public class MovePictureAction extends GenericPicTransformAction { @@ -21,7 +19,7 @@ * Constructor */ - public MovePictureAction(MapFrame frame) { + public MovePictureAction() { super(tr("PicLayer move"), tr("Moved"), "move", tr("Drag to move the picture"), - frame, ImageProvider.getCursor("crosshair", null)); + ImageProvider.getCursor("crosshair", null)); } Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/RotatePictureAction.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/RotatePictureAction.java (revision 34169) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/RotatePictureAction.java (revision 34170) @@ -9,5 +9,4 @@ import org.openstreetmap.josm.gui.MainApplication; -import org.openstreetmap.josm.gui.MapFrame; import org.openstreetmap.josm.plugins.piclayer.actions.GenericPicTransformAction; import org.openstreetmap.josm.tools.ImageProvider; @@ -16,5 +15,4 @@ * This class handles the input during rotating the picture. */ -@SuppressWarnings("serial") public class RotatePictureAction extends GenericPicTransformAction { @@ -22,7 +20,7 @@ * Constructor */ - public RotatePictureAction(MapFrame frame) { + public RotatePictureAction() { super(tr("PicLayer rotate"), tr("Rotated"), "rotate", tr("Drag to rotate the picture"), - frame, ImageProvider.getCursor("crosshair", null)); + ImageProvider.getCursor("crosshair", null)); } Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ScaleXPictureAction.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ScaleXPictureAction.java (revision 34169) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ScaleXPictureAction.java (revision 34170) @@ -7,5 +7,4 @@ import org.openstreetmap.josm.gui.MainApplication; -import org.openstreetmap.josm.gui.MapFrame; import org.openstreetmap.josm.plugins.piclayer.actions.GenericPicTransformAction; import org.openstreetmap.josm.tools.ImageProvider; @@ -14,5 +13,4 @@ * This class handles the input during scaling the picture. */ -@SuppressWarnings("serial") public class ScaleXPictureAction extends GenericPicTransformAction { @@ -20,7 +18,7 @@ * Constructor */ - public ScaleXPictureAction(MapFrame frame) { + public ScaleXPictureAction() { super(tr("PicLayer scale X"), tr("Scaled by X"), "scale_x", tr("Drag to scale the picture in the X Axis"), - frame, ImageProvider.getCursor("crosshair", null)); + ImageProvider.getCursor("crosshair", null)); } Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ScaleXYPictureAction.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ScaleXYPictureAction.java (revision 34169) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ScaleXYPictureAction.java (revision 34170) @@ -9,5 +9,4 @@ import org.openstreetmap.josm.gui.MainApplication; -import org.openstreetmap.josm.gui.MapFrame; import org.openstreetmap.josm.plugins.piclayer.actions.GenericPicTransformAction; import org.openstreetmap.josm.tools.ImageProvider; @@ -16,5 +15,4 @@ * This class handles the input during scaling the picture. */ -@SuppressWarnings("serial") public class ScaleXYPictureAction extends GenericPicTransformAction { @@ -22,7 +20,7 @@ * Constructor */ - public ScaleXYPictureAction(MapFrame frame) { + public ScaleXYPictureAction() { super(tr("PicLayer scale"), tr("Scaled"), "scale", tr("Drag to scale the picture in the X and Y Axis"), - frame, ImageProvider.getCursor("crosshair", null)); + ImageProvider.getCursor("crosshair", null)); } Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ScaleYPictureAction.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ScaleYPictureAction.java (revision 34169) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ScaleYPictureAction.java (revision 34170) @@ -7,5 +7,4 @@ import org.openstreetmap.josm.gui.MainApplication; -import org.openstreetmap.josm.gui.MapFrame; import org.openstreetmap.josm.plugins.piclayer.actions.GenericPicTransformAction; import org.openstreetmap.josm.tools.ImageProvider; @@ -14,5 +13,4 @@ * This class handles the input during scaling the picture. */ -@SuppressWarnings("serial") public class ScaleYPictureAction extends GenericPicTransformAction { @@ -20,7 +18,7 @@ * Constructor */ - public ScaleYPictureAction(MapFrame frame) { + public ScaleYPictureAction() { super(tr("PicLayer scale Y"), tr("Scaled by Y"), "scale_y", tr("Drag to scale the picture in the Y Axis"), - frame, ImageProvider.getCursor("crosshair", null)); + ImageProvider.getCursor("crosshair", null)); } Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ShearPictureAction.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ShearPictureAction.java (revision 34169) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ShearPictureAction.java (revision 34170) @@ -8,5 +8,4 @@ import org.openstreetmap.josm.data.coor.EastNorth; import org.openstreetmap.josm.gui.MainApplication; -import org.openstreetmap.josm.gui.MapFrame; import org.openstreetmap.josm.plugins.piclayer.actions.GenericPicTransformAction; import org.openstreetmap.josm.tools.ImageProvider; @@ -15,5 +14,4 @@ * This class handles the input during shearing of the picture. */ -@SuppressWarnings("serial") public class ShearPictureAction extends GenericPicTransformAction { @@ -21,6 +19,6 @@ * Constructor */ - public ShearPictureAction(MapFrame frame) { - super(tr("PicLayer shear"), tr("Sheared"), "shear", tr("Drag to shear the picture"), frame, ImageProvider.getCursor("crosshair", null)); + public ShearPictureAction() { + super(tr("PicLayer shear"), tr("Sheared"), "shear", tr("Drag to shear the picture"), ImageProvider.getCursor("crosshair", null)); } Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/affine/MovePointAction.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/affine/MovePointAction.java (revision 34169) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/affine/MovePointAction.java (revision 34170) @@ -8,15 +8,15 @@ import java.awt.geom.Point2D; -import org.openstreetmap.josm.gui.MapFrame; import org.openstreetmap.josm.plugins.piclayer.actions.GenericPicTransformAction; import org.openstreetmap.josm.tools.ImageProvider; -// old version - ctrl move point (not transforming picture) -@SuppressWarnings("serial") +/** + * old version - ctrl move point (not transforming picture) + */ public class MovePointAction extends GenericPicTransformAction { - public MovePointAction(MapFrame frame) { + public MovePointAction() { super(tr("PicLayer Move point"), tr("Point added/moved"), "movepoint", tr("Drag or create point on the picture"), - frame, ImageProvider.getCursor("crosshair", null)); + ImageProvider.getCursor("crosshair", null)); } Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/affine/RemovePointAction.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/affine/RemovePointAction.java (revision 34169) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/affine/RemovePointAction.java (revision 34170) @@ -6,14 +6,15 @@ import java.awt.event.MouseEvent; -import org.openstreetmap.josm.gui.MapFrame; import org.openstreetmap.josm.plugins.piclayer.actions.GenericPicTransformAction; import org.openstreetmap.josm.tools.ImageProvider; -@SuppressWarnings("serial") +/** + * Remove point on the picture + */ public class RemovePointAction extends GenericPicTransformAction { - public RemovePointAction(MapFrame frame) { + public RemovePointAction() { super(tr("PicLayer Remove point"), tr("Point removed"), "removepoint", tr("Remove point on the picture"), - frame, ImageProvider.getCursor("crosshair", null)); + ImageProvider.getCursor("crosshair", null)); } Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/affine/TransformPointAction.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/affine/TransformPointAction.java (revision 34169) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/affine/TransformPointAction.java (revision 34170) @@ -8,14 +8,15 @@ import java.awt.geom.Point2D; -import org.openstreetmap.josm.gui.MapFrame; import org.openstreetmap.josm.plugins.piclayer.actions.GenericPicTransformAction; import org.openstreetmap.josm.tools.ImageProvider; -@SuppressWarnings("serial") +/** + * Transform point on the picture + */ public class TransformPointAction extends GenericPicTransformAction { - public TransformPointAction(MapFrame frame) { + public TransformPointAction() { super(tr("PicLayer Transform point"), tr("Point transformed"), "transformpoint", tr("Transform point on the picture"), - frame, ImageProvider.getCursor("crosshair", null)); + ImageProvider.getCursor("crosshair", null)); } @@ -26,8 +27,9 @@ if (selectedPoint != null) { /*if (currentLayer.getTransformer().getOriginPoints().size() < 3) - JOptionPane.showMessageDialog(null, tr("You should have 3 checkpoints to transform the image!"), tr("PicLayer"), JOptionPane.ERROR_MESSAGE, null); + JOptionPane.showMessageDialog(null, + tr("You should have 3 checkpoints to transform the image!"), tr("PicLayer"), JOptionPane.ERROR_MESSAGE, null); else*/ //{ - currentLayer.getTransformer().updatePair(selectedPoint, pressed); + currentLayer.getTransformer().updatePair(selectedPoint, pressed); //} } Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerAbstract.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerAbstract.java (revision 34169) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerAbstract.java (revision 34170) @@ -59,5 +59,5 @@ // Initial position of the image in the real world -// protected EastNorth initialImagePosition; + // protected EastNorth initialImagePosition; // Position of the image in the real world @@ -133,4 +133,5 @@ * Initializes the image. Gets the image from a subclass and stores some * initial parameters. Throws exception if something fails. + * @throws IOException in case of error */ public void initialize() throws IOException { @@ -169,4 +170,6 @@ * * TODO: Replace the IOException by our own exception. + * @return created image + * @throws IOException in case of error */ protected abstract Image createImage() throws IOException; @@ -176,4 +179,5 @@ /** * To be overridden by subclasses. Returns the user readable name of the layer. + * @return the user readable name of the layer */ public abstract String getPicLayerName(); @@ -294,9 +298,9 @@ /** - * Returns the distance in meter, that corresponds to one unit in east north - * space. For normal projections, it is about 1 (but usually changing with - * latitude). - * For EPSG:4326, it is the distance from one meridian of full degree to the - * next (a couple of kilometers). + * Returns the distance in meter, that corresponds to one unit in east north space. + * For normal projections, it is about 1 (but usually changing with latitude). + * For EPSG:4326, it is the distance from one meridian of full degree to the next (a couple of kilometers). + * @param en east/north + * @return the distance in meter, that corresponds to one unit in east north space */ protected double getMetersPerEasting(EastNorth en) { @@ -398,5 +402,6 @@ /** * Loads calibration data from file - * @param file The file to read from + * @param is The input stream to read from + * @throws IOException in case of error */ public void loadCalibration(InputStream is) throws IOException { @@ -550,4 +555,6 @@ /** * Moves the picture. Scaled in EastNorth... + * @param x The offset to add in east direction + * @param y The offset to add in north direction */ public void movePictureBy(double x, double y) { Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/transform/PictureTransform.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/transform/PictureTransform.java (revision 34169) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/transform/PictureTransform.java (revision 34170) @@ -55,5 +55,5 @@ /** - * updates pair of points (suppose that other pairs are (origin=>origin) points are the same), + * updates pair of points (suppose that other pairs are (origin=>origin) points are the same), * solves equation, * applies transform matrix to the existing cachedTransform