Index: applications/editors/josm/plugins/imagewaypoint/.checkstyle =================================================================== --- applications/editors/josm/plugins/imagewaypoint/.checkstyle (revision 33086) +++ applications/editors/josm/plugins/imagewaypoint/.checkstyle (revision 33086) @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/imagewaypoint/.project =================================================================== --- applications/editors/josm/plugins/imagewaypoint/.project (revision 33085) +++ applications/editors/josm/plugins/imagewaypoint/.project (revision 33086) @@ -16,7 +16,13 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.jdt.core.javanature + net.sf.eclipsecs.core.CheckstyleNature Index: applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/IImageChangeListener.java =================================================================== --- applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/IImageChangeListener.java (revision 33085) +++ applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/IImageChangeListener.java (revision 33086) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.insignificant.josm.plugins.imagewaypoint; Index: applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntries.java =================================================================== --- applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntries.java (revision 33085) +++ applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntries.java (revision 33086) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.insignificant.josm.plugins.imagewaypoint; @@ -18,10 +19,10 @@ private final ImageEntries imageEntries; - public ImageReadyListener(final ImageEntries imageEntries) { + ImageReadyListener(final ImageEntries imageEntries) { this.imageEntries = imageEntries; } @Override - public final void onImageReady(final ImageEntry imageEntry, + public void onImageReady(final ImageEntry imageEntry, final Image image) { this.imageEntries.setCurrentImage(imageEntry, image); @@ -49,17 +50,17 @@ } - public static final ImageEntries getInstance() { + public static ImageEntries getInstance() { return ImageEntries.INSTANCE; } - public final void addListener(final IImageChangeListener listener) { + public void addListener(final IImageChangeListener listener) { this.listeners.add(listener); } - public final void removeListener(final IImageChangeListener listener) { + public void removeListener(final IImageChangeListener listener) { this.listeners.remove(listener); } - public final void add(final File[] imageFiles) { + public void add(final File[] imageFiles) { if (null != imageFiles) { for (int index = 0; index < imageFiles.length; index++) { @@ -70,5 +71,5 @@ } - public final void associateAllLayers() { + public void associateAllLayers() { for (int index = 0; index < this.images.size(); index++) { this.images.get(index).setWayPoint(null); @@ -92,5 +93,5 @@ } - private final void doAssociateLayer(final GpxLayer gpxLayer) { + private void doAssociateLayer(final GpxLayer gpxLayer) { if (null != gpxLayer && null != gpxLayer.data && !gpxLayer.data.fromServer) { @@ -109,15 +110,14 @@ } - private final List getTextContentsFromWayPoint( - final WayPoint wayPoint) { - final List texts = new ArrayList<>(); - for(String s : new String[]{"name", "cmt", "desc"}) - { - String t = wayPoint.getString(s); - if(null != t && 0 < t.length()) - texts.add(t); - } - - return texts; + private List getTextContentsFromWayPoint( + final WayPoint wayPoint) { + final List texts = new ArrayList<>(); + for (String s : new String[]{"name", "cmt", "desc"}) { + String t = wayPoint.getString(s); + if (null != t && 0 < t.length()) + texts.add(t); + } + + return texts; } @@ -132,5 +132,5 @@ // } - private final ImageEntry findImageEntryWithFileName(final String fileName) { + private ImageEntry findImageEntryWithFileName(final String fileName) { ImageEntry foundimage = null; @@ -146,6 +146,5 @@ } - private final void setCurrentImage(final ImageEntry imageEntry, - final Image image) { + private void setCurrentImage(final ImageEntry imageEntry, final Image image) { if (imageEntry == this.currentImageEntry) { this.currentImage = image; @@ -157,27 +156,27 @@ } - public final ImageEntry[] getImages() { + public ImageEntry[] getImages() { return this.locatedImages.toArray(new ImageEntry[this.locatedImages.size()]); } - public final ImageEntry getCurrentImageEntry() { + public ImageEntry getCurrentImageEntry() { return this.currentImageEntry; } - public final Image getCurrentImage() { + public Image getCurrentImage() { return this.currentImage; } - public final boolean hasNext() { + public boolean hasNext() { return null != this.currentImageEntry && this.locatedImages.indexOf(this.currentImageEntry) < this.locatedImages.size() - 1; } - public final boolean hasPrevious() { + public boolean hasPrevious() { return null != this.currentImageEntry && this.locatedImages.indexOf(this.currentImageEntry) > 0; } - public final void next() { + public void next() { if (null != this.currentImageEntry && this.locatedImages.indexOf(this.currentImageEntry) < this.locatedImages.size() - 1) { @@ -186,5 +185,5 @@ } - public final void previous() { + public void previous() { if (null != this.currentImageEntry && this.locatedImages.indexOf(this.currentImageEntry) > 0) { @@ -193,5 +192,5 @@ } - public final void rotateCurrentImageLeft() { + public void rotateCurrentImageLeft() { if (null != this.currentImageEntry) { this.currentImageEntry.setOrientation(this.currentImageEntry.getOrientation() @@ -202,5 +201,5 @@ } - public final void rotateCurrentImageRight() { + public void rotateCurrentImageRight() { if (null != this.currentImageEntry) { this.currentImageEntry.setOrientation(this.currentImageEntry.getOrientation() @@ -211,5 +210,5 @@ } - public final void setCurrentImageEntry(final ImageEntry imageEntry) { + public void setCurrentImageEntry(final ImageEntry imageEntry) { if (null == imageEntry || this.locatedImages.contains(imageEntry)) { if (null != this.currentImageEntry) @@ -219,8 +218,9 @@ this.currentImage = null; - for (IImageChangeListener listener : this.listeners) + for (IImageChangeListener listener : this.listeners) { listener.onSelectedImageEntryChanged(this); - - if(imageEntry != null) // now try to get the image + } + + if (imageEntry != null) // now try to get the image this.currentImageEntry.requestImage(this.listener); } Index: applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java =================================================================== --- applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java (revision 33085) +++ applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java (revision 33086) @@ -1,5 +1,3 @@ -/** - * - */ +// License: GPL. For details, see LICENSE file. package org.insignificant.josm.plugins.imagewaypoint; @@ -29,5 +27,5 @@ private final ImageEntry imageEntry; - public Observer(final ImageEntry imageEntry) { + Observer(final ImageEntry imageEntry) { this.imageEntry = imageEntry; } @@ -40,5 +38,5 @@ */ @Override - public final boolean imageUpdate(final Image image, + public boolean imageUpdate(final Image image, final int infoflags, final int x, final int y, final int width, final int height) { @@ -72,5 +70,5 @@ } - public final Orientation rotateRight() { + public Orientation rotateRight() { if (this.index < Orientation.orientations.length - 1) { return Orientation.orientations[this.index + 1]; @@ -80,5 +78,5 @@ } - public final Orientation rotateLeft() { + public Orientation rotateLeft() { if (this.index == 0) { return Orientation.orientations[Orientation.orientations.length - 1]; @@ -121,76 +119,76 @@ @Override - public final int compareTo(final ImageEntry image) { - return this.fileName.compareTo(image.fileName); - } - - public final String getFileName() { - return fileName; - } - - public final WayPoint getWayPoint() { - return wayPoint; - } - - public final void setWayPoint(final WayPoint wayPoint) { - this.wayPoint = wayPoint; - } - - public final Orientation getOrientation() { - return orientation; - } - - public final void setOrientation(final Orientation orientation) { - this.orientation = orientation; - this.normalImage = null; - this.rotatedImage = null; - } - - public final Rectangle getBounds(final MapView mapView) { - final Rectangle bounds; - - if (null == this.wayPoint) { - bounds = null; - } else { - final Point point = mapView.getPoint(this.getWayPoint().getCoor()); - bounds = new Rectangle(point.x - ImageEntry.ICON_WIDTH, - point.y - ImageEntry.ICON_HEIGHT, - ImageEntry.ICON_WIDTH, - ImageEntry.ICON_WIDTH); - } - - return bounds; - } - - public final void requestImage(final IImageReadyListener imageReadyListener) { - this.listener = imageReadyListener; - - if (null == this.rotatedImage) { - final Image image = Toolkit.getDefaultToolkit() - .getImage(this.filePath); - if (Toolkit.getDefaultToolkit().prepareImage(image, - -1, - -1, - this.observer)) { - this.imageLoaded(image); - } - } else if (null != this.listener) { - this.listener.onImageReady(this, this.rotatedImage); - } - } - - public final void flush() { - if (null != this.normalImage) { - this.normalImage.flush(); + public int compareTo(final ImageEntry image) { + return this.fileName.compareTo(image.fileName); + } + + public String getFileName() { + return fileName; + } + + public WayPoint getWayPoint() { + return wayPoint; + } + + public void setWayPoint(final WayPoint wayPoint) { + this.wayPoint = wayPoint; + } + + public Orientation getOrientation() { + return orientation; + } + + public void setOrientation(final Orientation orientation) { + this.orientation = orientation; this.normalImage = null; - } - - if (null != this.rotatedImage) { - this.rotatedImage.flush(); this.rotatedImage = null; } - } - - private final void imageLoaded(final Image image) { + + public Rectangle getBounds(final MapView mapView) { + final Rectangle bounds; + + if (null == this.wayPoint) { + bounds = null; + } else { + final Point point = mapView.getPoint(this.getWayPoint().getCoor()); + bounds = new Rectangle(point.x - ImageEntry.ICON_WIDTH, + point.y - ImageEntry.ICON_HEIGHT, + ImageEntry.ICON_WIDTH, + ImageEntry.ICON_WIDTH); + } + + return bounds; + } + + public void requestImage(final IImageReadyListener imageReadyListener) { + this.listener = imageReadyListener; + + if (null == this.rotatedImage) { + final Image image = Toolkit.getDefaultToolkit() + .getImage(this.filePath); + if (Toolkit.getDefaultToolkit().prepareImage(image, + -1, + -1, + this.observer)) { + this.imageLoaded(image); + } + } else if (null != this.listener) { + this.listener.onImageReady(this, this.rotatedImage); + } + } + + public void flush() { + if (null != this.normalImage) { + this.normalImage.flush(); + this.normalImage = null; + } + + if (null != this.rotatedImage) { + this.rotatedImage.flush(); + this.rotatedImage = null; + } + } + + private void imageLoaded(final Image image) { if (Orientation.NORMAL == this.getOrientation()) { this.rotatedImage = image; Index: applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java =================================================================== --- applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java (revision 33085) +++ applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java (revision 33086) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.insignificant.josm.plugins.imagewaypoint; @@ -26,10 +27,10 @@ private Image image; - public ImageComponent() { + ImageComponent() { this.image = null; } @Override - public final void paint(final Graphics g) { + public void paint(final Graphics g) { if (null == this.image || 0 >= this.image.getWidth(null) || 0 >= this.image.getHeight(null)) { @@ -71,5 +72,5 @@ } - public final void setImage(final Image image) { + public void setImage(final Image image) { this.image = image; this.repaint(); @@ -81,10 +82,10 @@ private final ImageWayPointDialog dialog; - public ImageChangeListener(final ImageWayPointDialog dialog) { + ImageChangeListener(final ImageWayPointDialog dialog) { this.dialog = dialog; } @Override - public final void onAvailableImageEntriesChanged( + public void onAvailableImageEntriesChanged( final ImageEntries entries) { this.dialog.imageDisplay.setImage(entries.getCurrentImage()); @@ -93,5 +94,5 @@ @Override - public final void onSelectedImageEntryChanged(final ImageEntries entries) { + public void onSelectedImageEntryChanged(final ImageEntries entries) { this.dialog.imageDisplay.setImage(entries.getCurrentImage()); this.dialog.updateUI(); @@ -101,64 +102,64 @@ private static final class PreviousAction extends JosmAction { - public PreviousAction() { - super(tr("Previous"), - null, - tr("Previous image"), - null, - false); - } - - @Override - public final void actionPerformed(final ActionEvent actionEvent) { - if (ImageEntries.getInstance().hasPrevious()) { - ImageEntries.getInstance().previous(); - } - } + PreviousAction() { + super(tr("Previous"), + null, + tr("Previous image"), + null, + false); + } + + @Override + public void actionPerformed(final ActionEvent actionEvent) { + if (ImageEntries.getInstance().hasPrevious()) { + ImageEntries.getInstance().previous(); + } + } } private static final class NextAction extends JosmAction { - public NextAction() { - super(tr("Next"), null, tr("Next image"), null, false); - } - - @Override - public final void actionPerformed(final ActionEvent actionEvent) { - if (ImageEntries.getInstance().hasNext()) { - ImageEntries.getInstance().next(); - } - } + NextAction() { + super(tr("Next"), null, tr("Next image"), null, false); + } + + @Override + public void actionPerformed(final ActionEvent actionEvent) { + if (ImageEntries.getInstance().hasNext()) { + ImageEntries.getInstance().next(); + } + } } private static final class RotateLeftAction extends JosmAction { - public RotateLeftAction() { - super(tr("Rotate left"), - null, - tr("Rotate image left"), - null, - false); - } - - @Override - public final void actionPerformed(final ActionEvent actionEvent) { - ImageEntries.getInstance().rotateCurrentImageLeft(); - } + RotateLeftAction() { + super(tr("Rotate left"), + null, + tr("Rotate image left"), + null, + false); + } + + @Override + public void actionPerformed(final ActionEvent actionEvent) { + ImageEntries.getInstance().rotateCurrentImageLeft(); + } } private static final class RotateRightAction extends JosmAction { - public RotateRightAction() { - super(tr("Rotate right"), - null, - tr("Rotate image right"), - null, - false); - } - - @Override - public final void actionPerformed(final ActionEvent actionEvent) { - ImageEntries.getInstance().rotateCurrentImageRight(); - } + RotateRightAction() { + super(tr("Rotate right"), + null, + tr("Rotate image right"), + null, + false); + } + + @Override + public void actionPerformed(final ActionEvent actionEvent) { + ImageEntries.getInstance().rotateCurrentImageRight(); + } } @@ -212,23 +213,23 @@ } - private final void updateUI() { - this.previousAction.setEnabled(ImageEntries.getInstance().hasPrevious()); - this.nextAction.setEnabled(ImageEntries.getInstance().hasNext()); - this.rotateLeftAction.setEnabled(null != ImageEntries.getInstance() - .getCurrentImageEntry()); - this.rotateRightAction.setEnabled(null != ImageEntries.getInstance() - .getCurrentImageEntry()); - - if (null != Main.map) { - Main.map.repaint(); - } + private void updateUI() { + this.previousAction.setEnabled(ImageEntries.getInstance().hasPrevious()); + this.nextAction.setEnabled(ImageEntries.getInstance().hasNext()); + this.rotateLeftAction.setEnabled(null != ImageEntries.getInstance() + .getCurrentImageEntry()); + this.rotateRightAction.setEnabled(null != ImageEntries.getInstance() + .getCurrentImageEntry()); + + if (null != Main.map) { + Main.map.repaint(); + } } public static ImageWayPointDialog getInstance() { - return ImageWayPointDialog.INSTANCE; - } - - public final ToggleDialog getDisplayComponent() { - return this.dialog; + return ImageWayPointDialog.INSTANCE; + } + + public ToggleDialog getDisplayComponent() { + return this.dialog; } } Index: applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java =================================================================== --- applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java (revision 33085) +++ applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java (revision 33086) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.insignificant.josm.plugins.imagewaypoint; @@ -23,10 +24,10 @@ private final ImageWayPointLayer layer; - public ImageWayPointMouseListener(final ImageWayPointLayer layer) { + ImageWayPointMouseListener(final ImageWayPointLayer layer) { this.layer = layer; } @Override - public final void mouseClicked(final MouseEvent event) { + public void mouseClicked(final MouseEvent event) { if (MouseEvent.BUTTON1 == event.getButton() && this.layer.isVisible()) { final ImageEntry[] images = ImageEntries.getInstance() @@ -53,11 +54,10 @@ private static final class ImageChangeListener implements IImageChangeListener { @Override - public final void onAvailableImageEntriesChanged( - final ImageEntries entries) { + public void onAvailableImageEntriesChanged(final ImageEntries entries) { Main.map.repaint(); } @Override - public final void onSelectedImageEntryChanged(final ImageEntries entries) { + public void onSelectedImageEntryChanged(final ImageEntries entries) { Main.map.repaint(); } @@ -80,20 +80,20 @@ @Override - public final Icon getIcon() { + public Icon getIcon() { return ImageProvider.get("dialogs/imagewaypoint"); } @Override - public final Object getInfoComponent() { + public Object getInfoComponent() { return null; } @Override - public final Action[] getMenuEntries() { + public Action[] getMenuEntries() { return new Action[0]; } @Override - public final String getToolTipText() { + public String getToolTipText() { // TODO return ""; @@ -101,5 +101,5 @@ @Override - public final boolean isMergable(final Layer other) { + public boolean isMergable(final Layer other) { // TODO return false; @@ -107,10 +107,10 @@ @Override - public final void mergeFrom(final Layer from) { + public void mergeFrom(final Layer from) { // TODO not supported yet } @Override - public final void paint(final Graphics2D graphics, final MapView mapView, Bounds box) { + public void paint(final Graphics2D graphics, final MapView mapView, Bounds box) { final ImageEntry[] images = ImageEntries.getInstance().getImages(); @@ -139,5 +139,5 @@ @Override - public final void visitBoundingBox(final BoundingXYVisitor visitor) { + public void visitBoundingBox(final BoundingXYVisitor visitor) { final ImageEntry[] images = ImageEntries.getInstance().getImages(); @@ -153,5 +153,5 @@ @Override - public final void destroy() { + public void destroy() { super.destroy(); Index: applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java =================================================================== --- applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java (revision 33085) +++ applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java (revision 33086) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.insignificant.josm.plugins.imagewaypoint; @@ -21,5 +22,5 @@ private final class ImageWaypointImporter extends FileImporter { - public ImageWaypointImporter() { + ImageWaypointImporter() { super(new ExtensionFileFilter("jpg,jpeg,png,gif", "jpg", "Image files [by ImageWayPoint plugin] (*.jpg, *.jpeg, *.png, *.gif)")); } @@ -38,5 +39,5 @@ public void importData(List files, ProgressMonitor progressMonitor) throws IOException, IllegalDataException { if (null != files && !files.isEmpty()) { - + // recursively find all files final List allFiles = new ArrayList<>(); @@ -72,10 +73,9 @@ public ImageWayPointPlugin(PluginInformation info) { super(info); - ExtensionFileFilter.addImporter(new ImageWaypointImporter()); + ExtensionFileFilter.addImporter(new ImageWaypointImporter()); } @Override - public final void mapFrameInitialized(final MapFrame oldFrame, - final MapFrame newFrame) { + public void mapFrameInitialized(final MapFrame oldFrame, final MapFrame newFrame) { if (newFrame != null) { newFrame.addToggleDialog(ImageWayPointDialog.getInstance()