Index: /applications/editors/josm/plugins/imagewaypoint/.settings/org.eclipse.jdt.ui.prefs =================================================================== --- /applications/editors/josm/plugins/imagewaypoint/.settings/org.eclipse.jdt.ui.prefs (revision 32915) +++ /applications/editors/josm/plugins/imagewaypoint/.settings/org.eclipse.jdt.ui.prefs (revision 32915) @@ -0,0 +1,59 @@ +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=true +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_functional_interfaces=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=false +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.insert_inferred_type_arguments=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=false +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=true +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_redundant_type_arguments=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_anonymous_class_creation=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_lambda=true +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true 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 32914) +++ /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntries.java (revision 32915) @@ -22,4 +22,5 @@ } + @Override public final void onImageReady(final ImageEntry imageEntry, final Image image) { 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 32914) +++ /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java (revision 32915) @@ -23,30 +23,31 @@ public final class ImageEntry implements Comparable { public interface IImageReadyListener { - void onImageReady(ImageEntry imageEntry, Image image); + void onImageReady(ImageEntry imageEntry, Image image); } private static final class Observer implements ImageObserver { - private final ImageEntry imageEntry; - - public Observer(final ImageEntry imageEntry) { - this.imageEntry = imageEntry; - } - - /** - * @see java.awt.image.ImageObserver#imageUpdate(java.awt.Image, int, - * int, int, int, int) - * @return true if this ImageObserver still wants to be updates about - * image loading progress - */ - public final boolean imageUpdate(final Image image, - final int infoflags, final int x, final int y, final int width, - final int height) { - final boolean complete = ImageObserver.ALLBITS == (infoflags | ImageObserver.ALLBITS); - if (complete) { - this.imageEntry.imageLoaded(image); - } - - return !complete; - } + private final ImageEntry imageEntry; + + public Observer(final ImageEntry imageEntry) { + this.imageEntry = imageEntry; + } + + /** + * @see java.awt.image.ImageObserver#imageUpdate(java.awt.Image, int, + * int, int, int, int) + * @return true if this ImageObserver still wants to be updates about + * image loading progress + */ + @Override + public final boolean imageUpdate(final Image image, + final int infoflags, final int x, final int y, final int width, + final int height) { + final boolean complete = ImageObserver.ALLBITS == (infoflags | ImageObserver.ALLBITS); + if (complete) { + this.imageEntry.imageLoaded(image); + } + + return !complete; + } } @@ -119,4 +120,5 @@ } + @Override public final int compareTo(final ImageEntry image) { return this.fileName.compareTo(image.fileName); 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 32914) +++ /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java (revision 32915) @@ -22,77 +22,79 @@ public final class ImageWayPointDialog { private static final class ImageComponent extends JComponent { - private static final long serialVersionUID = -5207198660736375133L; - - private Image image; - - public ImageComponent() { - this.image = null; - } - - @Override - public final void paint(final Graphics g) { - if (null == this.image || 0 >= this.image.getWidth(null) - || 0 >= this.image.getHeight(null)) { - g.setColor(Color.white); - g.fillRect(0, 0, this.getSize().width, this.getSize().height); - } else { - final int maxWidth = this.getSize().width; - final int maxHeight = this.getSize().height; - final int imageWidth = this.image.getWidth(null); - final int imageHeight = this.image.getHeight(null); - - final double aspect = 1.0 * imageWidth / imageHeight; - - // what's the width if the height is 100%? - final int widthIfHeightIsMax = (int) (aspect * maxHeight); - - // now find the real width and height - final int resizedWidth; - final int resizedHeight; - if (widthIfHeightIsMax > maxWidth) { - // oops - burst the width - so width should be the max, and - // work out the resulting height - resizedWidth = maxWidth; - resizedHeight = (int) (resizedWidth / aspect); - } else { - // that'll do... - resizedWidth = widthIfHeightIsMax; - resizedHeight = maxHeight; - } - - g.drawImage(this.image, - (maxWidth - resizedWidth) / 2, - (maxHeight - resizedHeight) / 2, - resizedWidth, - resizedHeight, - Color.black, - null); - } - } - - public final void setImage(final Image image) { - this.image = image; - this.repaint(); - } + private static final long serialVersionUID = -5207198660736375133L; + + private Image image; + + public ImageComponent() { + this.image = null; + } + + @Override + public final void paint(final Graphics g) { + if (null == this.image || 0 >= this.image.getWidth(null) + || 0 >= this.image.getHeight(null)) { + g.setColor(Color.white); + g.fillRect(0, 0, this.getSize().width, this.getSize().height); + } else { + final int maxWidth = this.getSize().width; + final int maxHeight = this.getSize().height; + final int imageWidth = this.image.getWidth(null); + final int imageHeight = this.image.getHeight(null); + + final double aspect = 1.0 * imageWidth / imageHeight; + + // what's the width if the height is 100%? + final int widthIfHeightIsMax = (int) (aspect * maxHeight); + + // now find the real width and height + final int resizedWidth; + final int resizedHeight; + if (widthIfHeightIsMax > maxWidth) { + // oops - burst the width - so width should be the max, and + // work out the resulting height + resizedWidth = maxWidth; + resizedHeight = (int) (resizedWidth / aspect); + } else { + // that'll do... + resizedWidth = widthIfHeightIsMax; + resizedHeight = maxHeight; + } + + g.drawImage(this.image, + (maxWidth - resizedWidth) / 2, + (maxHeight - resizedHeight) / 2, + resizedWidth, + resizedHeight, + Color.black, + null); + } + } + + public final void setImage(final Image image) { + this.image = image; + this.repaint(); + } } private static final class ImageChangeListener implements IImageChangeListener { - private final ImageWayPointDialog dialog; - - public ImageChangeListener(final ImageWayPointDialog dialog) { - this.dialog = dialog; - } - - public final void onAvailableImageEntriesChanged( - final ImageEntries entries) { - this.dialog.imageDisplay.setImage(entries.getCurrentImage()); - this.dialog.updateUI(); - } - - public final void onSelectedImageEntryChanged(final ImageEntries entries) { - this.dialog.imageDisplay.setImage(entries.getCurrentImage()); - this.dialog.updateUI(); - } + private final ImageWayPointDialog dialog; + + public ImageChangeListener(final ImageWayPointDialog dialog) { + this.dialog = dialog; + } + + @Override + public final void onAvailableImageEntriesChanged( + final ImageEntries entries) { + this.dialog.imageDisplay.setImage(entries.getCurrentImage()); + this.dialog.updateUI(); + } + + @Override + public final void onSelectedImageEntryChanged(final ImageEntries entries) { + this.dialog.imageDisplay.setImage(entries.getCurrentImage()); + this.dialog.updateUI(); + } } @@ -107,4 +109,5 @@ } + @Override public final void actionPerformed(final ActionEvent actionEvent) { if (ImageEntries.getInstance().hasPrevious()) { @@ -120,4 +123,5 @@ } + @Override public final void actionPerformed(final ActionEvent actionEvent) { if (ImageEntries.getInstance().hasNext()) { @@ -137,4 +141,5 @@ } + @Override public final void actionPerformed(final ActionEvent actionEvent) { ImageEntries.getInstance().rotateCurrentImageLeft(); @@ -152,4 +157,5 @@ } + @Override public final void actionPerformed(final ActionEvent actionEvent) { ImageEntries.getInstance().rotateCurrentImageRight(); 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 32914) +++ /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java (revision 32915) @@ -52,4 +52,5 @@ private static final class ImageChangeListener implements IImageChangeListener { + @Override public final void onAvailableImageEntriesChanged( final ImageEntries entries) { @@ -57,4 +58,5 @@ } + @Override public final void onSelectedImageEntryChanged(final ImageEntries entries) { Main.map.repaint();