Index: /applications/editors/josm/plugins/piclayer/.checkstyle =================================================================== --- /applications/editors/josm/plugins/piclayer/.checkstyle (revision 32675) +++ /applications/editors/josm/plugins/piclayer/.checkstyle (revision 32675) @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + Index: /applications/editors/josm/plugins/piclayer/.project =================================================================== --- /applications/editors/josm/plugins/piclayer/.project (revision 32674) +++ /applications/editors/josm/plugins/piclayer/.project (revision 32675) @@ -16,7 +16,13 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.jdt.core.javanature + net.sf.eclipsecs.core.CheckstyleNature Index: /applications/editors/josm/plugins/piclayer/.settings/org.eclipse.jdt.ui.prefs =================================================================== --- /applications/editors/josm/plugins/piclayer/.settings/org.eclipse.jdt.ui.prefs (revision 32675) +++ /applications/editors/josm/plugins/piclayer/.settings/org.eclipse.jdt.ui.prefs (revision 32675) @@ -0,0 +1,60 @@ +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 +sp_cleanup.use_type_arguments=false 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 32674) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java (revision 32675) @@ -74,5 +74,5 @@ // Create menu entry - + // Add menu items MainMenu.add(Main.main.menu.imagerySubMenu, newLayerFromFileAction); @@ -89,5 +89,5 @@ @Override public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) { - if(newFrame != null) { + if (newFrame != null) { // Create plugin map modes MovePictureAction movePictureAction = new MovePictureAction(newFrame); @@ -114,5 +114,5 @@ buttonList.add(picLayerActionButtonFactory(shearPictureAction)); - for(IconToggleButton btn : buttonList) { + for (IconToggleButton btn : buttonList) { newFrame.addMapMode(btn); } 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 32674) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/GenericPicTransformAction.java (revision 32675) @@ -57,12 +57,12 @@ public void mousePressed(MouseEvent e) { // Start action - if ( Main.getLayerManager().getActiveLayer() instanceof PicLayerAbstract ) { - currentLayer = (PicLayerAbstract)Main.getLayerManager().getActiveLayer(); + if (Main.getLayerManager().getActiveLayer() instanceof PicLayerAbstract) { + currentLayer = (PicLayerAbstract) Main.getLayerManager().getActiveLayer(); - if ( currentLayer != null && e.getButton() == MouseEvent.BUTTON1 ) { + if (currentLayer != null && e.getButton() == MouseEvent.BUTTON1) { requestFocusInMapView(); isDragging = true; prevMousePoint = new Point(e.getPoint()); - prevEastNorth = Main.map.mapView.getEastNorth(e.getX(),e.getY()); + prevEastNorth = Main.map.mapView.getEastNorth(e.getX(), e.getY()); // try to find and fill selected point if possible selectedPoint = currentLayer.findSelectedPoint(e.getPoint()); @@ -75,8 +75,8 @@ public void mouseDragged(MouseEvent e) { // Call action performing - if(isDragging && currentLayer != null) { + if (isDragging && currentLayer != null) { doAction(e); prevMousePoint = new Point(e.getPoint()); - prevEastNorth = Main.map.mapView.getEastNorth(e.getX(),e.getY()); + prevEastNorth = Main.map.mapView.getEastNorth(e.getX(), e.getY()); Main.map.mapView.repaint(); } @@ -101,8 +101,7 @@ Layer active = Main.getLayerManager().getActiveLayer(); if (active instanceof PicLayerAbstract) { - ((PicLayerAbstract)active).setDrawPoints(value); + ((PicLayerAbstract) active).setDrawPoints(value); } Main.map.mapView.repaint(); } - } 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 32674) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/LoadPictureCalibrationAction.java (revision 32675) @@ -51,5 +51,5 @@ * Constructor */ - public LoadPictureCalibrationAction( PicLayerAbstract owner ) { + public LoadPictureCalibrationAction(PicLayerAbstract owner) { super(tr("Load Picture Calibration..."), null, tr("Loads calibration data from a file"), null, false); // Remember the owner... @@ -64,10 +64,10 @@ // Save dialog JFileChooser fc = new JFileChooser(); - fc.setAcceptAllFileFilterUsed( true ); - fc.setFileFilter( new CalibrationFileFilter() ); - fc.setSelectedFile( new File(m_owner.getPicLayerName() + CalibrationFileFilter.EXTENSION)); - int result = fc.showOpenDialog(Main.parent ); + fc.setAcceptAllFileFilterUsed(true); + fc.setFileFilter(new CalibrationFileFilter()); + fc.setSelectedFile(new File(m_owner.getPicLayerName() + CalibrationFileFilter.EXTENSION)); + int result = fc.showOpenDialog(Main.parent); - if ( result == JFileChooser.APPROVE_OPTION ) { + if (result == JFileChooser.APPROVE_OPTION) { // Load @@ -77,5 +77,6 @@ // Error e.printStackTrace(); - JOptionPane.showMessageDialog(Main.parent , tr("Loading file failed: {0}", e.getMessage()), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(Main.parent, + tr("Loading file failed: {0}", e.getMessage()), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE); } } 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 32674) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/LoadPictureCalibrationFromWorldAction.java (revision 32675) @@ -28,8 +28,8 @@ JFileChooser fc = new JFileChooser(); - fc.setAcceptAllFileFilterUsed( true ); - int result = fc.showOpenDialog(Main.parent ); + fc.setAcceptAllFileFilterUsed(true); + int result = fc.showOpenDialog(Main.parent); - if ( result == JFileChooser.APPROVE_OPTION ) { + if (result == JFileChooser.APPROVE_OPTION) { // Load @@ -39,5 +39,6 @@ // Error ex.printStackTrace(); - JOptionPane.showMessageDialog(Main.parent , tr("Loading file failed: {0}", ex.getMessage()), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(Main.parent, + tr("Loading file failed: {0}", ex.getMessage()), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE); } } 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 32674) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/SavePictureCalibrationAction.java (revision 32675) @@ -50,5 +50,5 @@ * Constructor */ - public SavePictureCalibrationAction( PicLayerAbstract owner ) { + public SavePictureCalibrationAction(PicLayerAbstract owner) { super(tr("Save Picture Calibration..."), null, tr("Saves calibration data to a file"), null, false); // Remember the owner... @@ -63,16 +63,16 @@ // Save dialog final JFileChooser fc = new JFileChooser(); - fc.setAcceptAllFileFilterUsed( true ); - fc.setFileFilter( new CalibrationFileFilter() ); - fc.setSelectedFile( new File(m_owner.getPicLayerName() + CalibrationFileFilter.EXTENSION)); - int result = fc.showSaveDialog( Main.parent ); + fc.setAcceptAllFileFilterUsed(true); + fc.setFileFilter(new CalibrationFileFilter()); + fc.setSelectedFile(new File(m_owner.getPicLayerName() + CalibrationFileFilter.EXTENSION)); + int result = fc.showSaveDialog(Main.parent); - if ( result == JFileChooser.APPROVE_OPTION ) { + if (result == JFileChooser.APPROVE_OPTION) { // Check file extension and force it to be valid File file = fc.getSelectedFile(); String path = file.getAbsolutePath(); - if ( path.length() < CalibrationFileFilter.EXTENSION.length() - || !path.substring( path.length() - 4 ).equals(CalibrationFileFilter.EXTENSION)) { - file = new File( path + CalibrationFileFilter.EXTENSION ); + if (path.length() < CalibrationFileFilter.EXTENSION.length() + || !path.substring(path.length() - 4).equals(CalibrationFileFilter.EXTENSION)) { + file = new File(path + CalibrationFileFilter.EXTENSION); } @@ -85,5 +85,6 @@ // Error e.printStackTrace(); - JOptionPane.showMessageDialog(Main.parent , tr("Saving file failed: {0}", e.getMessage()), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(Main.parent, + tr("Saving file failed: {0}", e.getMessage()), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE); } } 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 32674) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/newlayer/NewLayerFromClipboardAction.java (revision 32675) @@ -56,13 +56,12 @@ try { layer.initialize(); - } - catch (IOException e) { + } catch (IOException e) { // Failed - System.out.println( "NewLayerFromClipboardAction::actionPerformed - " + e.getMessage() ); + System.out.println("NewLayerFromClipboardAction::actionPerformed - " + e.getMessage()); JOptionPane.showMessageDialog(null, e.getMessage(), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE); return; } // Add layer - Main.getLayerManager().addLayer( layer ); + Main.getLayerManager().addLayer(layer); } } 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 32674) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/newlayer/NewLayerFromFileAction.java (revision 32675) @@ -59,10 +59,11 @@ private String[] supportedExtensions; - public ImageFileFilter() { + ImageFileFilter() { List extensions = new ArrayList<>(); extensions.add("zip"); extensions.add("kml"); - for (String ext : ImageIO.getReaderFormatNames()) + for (String ext : ImageIO.getReaderFormatNames()) { extensions.add(ext); + } supportedExtensions = extensions.toArray(new String[0]); } @@ -70,5 +71,5 @@ @Override public boolean accept(File f) { - if ( f.isDirectory() ) + if (f.isDirectory()) return true; @@ -77,12 +78,12 @@ // Unfortunately, getReaderFormatNames does not always return ALL extensions in // both lower and upper case, so we can not do a search in the array - for (String e: supportedExtensions) - if ( e.equalsIgnoreCase(fileExtension) ) { + for (String e: supportedExtensions) { + if (e.equalsIgnoreCase(fileExtension)) { return true; } + } return false; } - @Override @@ -90,5 +91,4 @@ return tr("Supported image files, *.zip, *.kml"); } - } @@ -108,22 +108,22 @@ // Choose a file JFileChooser fc = new JFileChooser(Main.pref.get(m_lastdirprefname)); - fc.setAcceptAllFileFilterUsed( true ); - fc.setFileFilter( new ImageFileFilter() ); + fc.setAcceptAllFileFilterUsed(true); + fc.setFileFilter(new ImageFileFilter()); fc.setMultiSelectionEnabled(true); - int result = fc.showOpenDialog( Main.parent ); + int result = fc.showOpenDialog(Main.parent); // Create a layer? - if ( result == JFileChooser.APPROVE_OPTION ) { + if (result == JFileChooser.APPROVE_OPTION) { // The first loaded layer will be placed at the top of any other layer of the same class, // or at the bottom of the stack if there is no such layer yet // The next layers we load will be placed one after the other after this first layer int newLayerPos = Main.getLayerManager().getLayers().size(); - for(Layer l : Main.getLayerManager().getLayersOfType(PicLayerAbstract.class)) { + for (Layer l : Main.getLayerManager().getLayersOfType(PicLayerAbstract.class)) { int pos = Main.getLayerManager().getLayers().indexOf(l); if (pos < newLayerPos) newLayerPos = pos; } - for(File file : fc.getSelectedFiles() ) { + for (File file : fc.getSelectedFiles()) { // TODO: we need a progress bar here, it can take quite some time @@ -150,12 +150,11 @@ private void addNewLayerFromFile(File file, int newLayerPos, boolean isZoomToLayer) { try { - PicLayerFromFile layer = new PicLayerFromFile( file ); + PicLayerFromFile layer = new PicLayerFromFile(file); layer.initialize(); placeLayer(layer, newLayerPos, isZoomToLayer); - } - catch (IOException e) { + } catch (IOException e) { // Failed - System.out.println( "NewLayerFromFileAction::actionPerformed - " + e.getMessage() ); + System.out.println("NewLayerFromFileAction::actionPerformed - " + e.getMessage()); JOptionPane.showMessageDialog(null, e.getMessage(), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE); } @@ -168,5 +167,5 @@ Main.map.mapView.moveLayer(layer, newLayerPos++); - if ( isZoomToLayer && Main.pref.getInteger("piclayer.zoom-on-load", 1) != 0 ) { + if (isZoomToLayer && Main.pref.getInteger("piclayer.zoom-on-load", 1) != 0) { // if we are loading a single picture file, zoom on it, so that the user can see something BoundingXYVisitor v = new BoundingXYVisitor(); @@ -175,4 +174,5 @@ } } + private void addNewLayerFromKML(File root, KMLGroundOverlay overlay, int newLayerPos) { try { @@ -183,5 +183,5 @@ } catch (IOException e) { // Failed - System.out.println( "NewLayerFromFileAction::actionPerformed - " + e.getMessage() ); + System.out.println("NewLayerFromFileAction::actionPerformed - " + e.getMessage()); JOptionPane.showMessageDialog(null, e.getMessage(), tr("Problem occurred"), JOptionPane.WARNING_MESSAGE); } 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 32674) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/MovePictureAction.java (revision 32675) @@ -46,5 +46,5 @@ @Override protected void doAction(MouseEvent e) { - EastNorth eastNorth = Main.map.mapView.getEastNorth(e.getX(),e.getY()); + EastNorth eastNorth = Main.map.mapView.getEastNorth(e.getX(), e.getY()); currentLayer.movePictureBy( eastNorth.east() - prevEastNorth.east(), 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 32674) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/RotatePictureAction.java (revision 32675) @@ -41,5 +41,6 @@ */ public RotatePictureAction(MapFrame frame) { - super(tr("PicLayer rotate"), tr("Rotated"), "rotate", tr("Drag to rotate the picture"), frame, ImageProvider.getCursor("crosshair", null)); + super(tr("PicLayer rotate"), tr("Rotated"), "rotate", tr("Drag to rotate the picture"), + frame, ImageProvider.getCursor("crosshair", null)); } @@ -47,11 +48,10 @@ protected void doAction(MouseEvent e) { double factor; - if ( ( e.getModifiersEx() & InputEvent.SHIFT_DOWN_MASK ) != 0 ) { + if ((e.getModifiersEx() & InputEvent.SHIFT_DOWN_MASK) != 0) { factor = Main.pref.getDouble("piclayer.rotatefactors.high_precision", 100.0); + } else { + factor = Main.pref.getDouble("piclayer.rotatefactors.low_precision", 10.0); } - else { - factor = Main.pref.getDouble("piclayer.rotatefactors.low_precision", 10.0 ); - } - currentLayer.rotatePictureBy( ( e.getY() - prevMousePoint.getY() ) / factor ); + currentLayer.rotatePictureBy((e.getY() - prevMousePoint.getY()) / factor); } } Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ScalePictureActionAbstract.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ScalePictureActionAbstract.java (revision 32674) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ScalePictureActionAbstract.java (revision 32675) @@ -38,5 +38,5 @@ * Constructor */ - public ScalePictureActionAbstract (String name, String actionName, String icon, String tooltip, MapFrame frame) { + public ScalePictureActionAbstract(String name, String actionName, String icon, String tooltip, MapFrame frame) { super(name, actionName, icon, tooltip, frame, ImageProvider.getCursor("crosshair", null)); } @@ -45,11 +45,10 @@ protected void doAction(MouseEvent e) { double factor; - if ( ( e.getModifiersEx() & InputEvent.SHIFT_DOWN_MASK ) != 0 ) { + if ((e.getModifiersEx() & InputEvent.SHIFT_DOWN_MASK) != 0) { factor = Main.pref.getDouble("piclayer.scalefactors.high_precision", 1.0005); - } - else { + } else { factor = Main.pref.getDouble("piclayer.scalefactors.low_precision", 1.015); } - doTheScale( Math.pow(factor, prevMousePoint.getY() - e.getY() ) ); + doTheScale(Math.pow(factor, prevMousePoint.getY() - e.getY())); } @@ -57,5 +56,5 @@ * Does the actual scaling in the inherited class. */ - protected abstract void doTheScale( double scale ); + protected abstract void doTheScale(double scale); } 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 32674) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ScaleXPictureAction.java (revision 32675) @@ -29,7 +29,7 @@ */ @SuppressWarnings("serial") -public class ScaleXPictureAction extends ScalePictureActionAbstract -{ - /* +public class ScaleXPictureAction extends ScalePictureActionAbstract { + + /** * Constructor */ @@ -39,6 +39,6 @@ @Override - public void doTheScale( double scale ) { - currentLayer.scalePictureBy( scale, 1.0 ); - } + public void doTheScale(double scale) { + currentLayer.scalePictureBy(scale, 1.0); + } } 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 32674) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ScaleXYPictureAction.java (revision 32675) @@ -29,7 +29,7 @@ */ @SuppressWarnings("serial") -public class ScaleXYPictureAction extends ScalePictureActionAbstract -{ - /* +public class ScaleXYPictureAction extends ScalePictureActionAbstract { + + /** * Constructor */ @@ -39,6 +39,6 @@ @Override - public void doTheScale( double scale ) { - currentLayer.scalePictureBy( scale, scale ); - } + public void doTheScale(double scale) { + currentLayer.scalePictureBy(scale, scale); + } } 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 32674) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ScaleYPictureAction.java (revision 32675) @@ -29,7 +29,7 @@ */ @SuppressWarnings("serial") -public class ScaleYPictureAction extends ScalePictureActionAbstract -{ - /* +public class ScaleYPictureAction extends ScalePictureActionAbstract { + + /** * Constructor */ @@ -39,6 +39,6 @@ @Override - public void doTheScale( double scale ) { - currentLayer.scalePictureBy( 1.0, scale ); + public void doTheScale(double scale) { + currentLayer.scalePictureBy(1.0, scale); } } 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 32674) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ShearPictureAction.java (revision 32675) @@ -48,5 +48,5 @@ @Override protected void doAction(MouseEvent e) { - EastNorth eastNorth = Main.map.mapView.getEastNorth(e.getX(),e.getY()); + EastNorth eastNorth = Main.map.mapView.getEastNorth(e.getX(), e.getY()); currentLayer.shearPictureBy( 1000* (eastNorth.east() - prevEastNorth.east()), @@ -54,4 +54,3 @@ ); } - } 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 32674) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/affine/RemovePointAction.java (revision 32675) @@ -44,5 +44,3 @@ updateDrawPoints(false); } - - } 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 32674) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/affine/TransformPointAction.java (revision 32675) @@ -26,7 +26,7 @@ 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); - } + //} } @@ -36,4 +36,5 @@ } } + @Override public void enterMode() { Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/command/TransformCommand.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/command/TransformCommand.java (revision 32674) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/command/TransformCommand.java (revision 32675) @@ -27,5 +27,4 @@ beforeTransform = extractTransform(); } - @Override Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/CalibrationFileFilter.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/CalibrationFileFilter.java (revision 32674) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/CalibrationFileFilter.java (revision 32675) @@ -36,10 +36,8 @@ @Override public boolean accept(File f) { - String ext3 = ( f.getName().length() > 4 ) ? f.getName().substring( f.getName().length() - 4 ).toLowerCase() : ""; + String ext3 = (f.getName().length() > 4) ? f.getName().substring(f.getName().length() - 4).toLowerCase() : ""; // TODO: check what is supported by Java :) - return ( f.isDirectory() - || ext3.equals( EXTENSION ) - ); + return (f.isDirectory() || ext3.equals(EXTENSION)); } 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 32674) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerAbstract.java (revision 32675) @@ -27,6 +27,6 @@ import java.awt.Image; import java.awt.Point; +import java.awt.RenderingHints; import java.awt.Toolkit; -import java.awt.RenderingHints; import java.awt.geom.AffineTransform; import java.awt.geom.NoninvertibleTransformException; @@ -155,5 +155,5 @@ // If the map does not exist - we're screwed. We should not get into this situation in the first place! - if ( Main.map != null && Main.map.mapView != null ) { + if (Main.map != null && Main.map.mapView != null) { EastNorth center = Main.map.mapView.getCenter(); @@ -170,5 +170,5 @@ // Create image image = createImage(); - if ( image == null ) { + if (image == null) { throw new IOException(tr("PicLayer failed to load or import the image.")); } @@ -188,4 +188,5 @@ protected abstract void lookForCalibration() throws IOException; + /** * To be overridden by subclasses. Returns the user readable name of the layer. @@ -194,8 +195,12 @@ @Override - public Icon getIcon() { return layerIcon; } - - @Override - public Object getInfoComponent() { return null; } + public Icon getIcon() { + return layerIcon; + } + + @Override + public Object getInfoComponent() { + return null; + } @Override @@ -209,5 +214,5 @@ new LoadPictureCalibrationFromWorldAction(this), SeparatorLayerAction.INSTANCE, - new RenameLayerAction(null,this), + new RenameLayerAction(null, this), }; } @@ -229,26 +234,26 @@ public void paint(Graphics2D g2, MapView mv, Bounds bounds) { - if ( image != null) { + if (image != null) { // Position image at the right graphical place EastNorth center = mv.getCenter(); - EastNorth leftop = mv.getEastNorth( 0, 0 ); + EastNorth leftop = mv.getEastNorth(0, 0); // Number of pixels for one unit in east north space. // This is the same in x- and y- direction. - double pixel_per_en = ( mv.getWidth() / 2.0 ) / ( center.east() - leftop.east() ); + double pixel_per_en = (mv.getWidth() / 2.0) / (center.east() - leftop.east()); // This is now the offset in screen pixels EastNorth imagePosition = transformer.getImagePosition(); - double pic_offset_x = (( imagePosition.east() - leftop.east() ) * pixel_per_en); - double pic_offset_y = (( leftop.north() - imagePosition.north() ) * pixel_per_en); - - Graphics2D g = (Graphics2D)g2.create(); + double pic_offset_x = ((imagePosition.east() - leftop.east()) * pixel_per_en); + double pic_offset_y = ((leftop.north() - imagePosition.north()) * pixel_per_en); + + Graphics2D g = (Graphics2D) g2.create(); // Move - g.translate( pic_offset_x, pic_offset_y ); + g.translate(pic_offset_x, pic_offset_y); // Scale double scalex = initialImageScale * pixel_per_en / getMetersPerEasting(imagePosition) / 100; double scaley = initialImageScale * pixel_per_en / getMetersPerNorthing(imagePosition) / 100; - g.scale( scalex, scaley ); + g.scale(scalex, scaley); g.transform(transformer.getTransform()); @@ -257,9 +262,9 @@ // Draw picture - g.drawImage( image, -image.getWidth(null) / 2, -image.getHeight(null) / 2, null ); + g.drawImage(image, -image.getWidth(null) / 2, -image.getHeight(null) / 2, null); // Draw additional rectangle for the active pic layer if (mv.getLayerManager().getActiveLayer() == this) { - g.setColor( new Color( 0xFF0000 ) ); + g.setColor(new Color(0xFF0000)); g.drawRect( -image.getWidth(null) / 2, @@ -269,7 +274,7 @@ ); } - if (drawMarkers ) { + if (drawMarkers) { // draw markers for selection - Graphics2D gPoints = (Graphics2D)g2.create(); + Graphics2D gPoints = (Graphics2D) g2.create(); gPoints.translate(pic_offset_x, pic_offset_y); @@ -282,14 +287,15 @@ for (int i = 0; i < transformer.getOriginPoints().size(); i++) { Point2D trP = tr.transform(transformer.getOriginPoints().get(i), null); - int x = (int)trP.getX(), y = (int)trP.getY(); + int x = (int) trP.getX(), y = (int) trP.getY(); int dstx = x-pinAnchorX; int dsty = y-pinAnchorY; - gPoints.drawImage(pinTiledImage, dstx, dsty, dstx+pinWidth, dsty+pinHeight, pinTileOffsetX[i], pinTileOffsetY[i], pinTileOffsetX[i]+pinWidth, pinTileOffsetY[i]+pinHeight, null); + gPoints.drawImage(pinTiledImage, dstx, dsty, dstx+pinWidth, dsty+pinHeight, + pinTileOffsetX[i], pinTileOffsetY[i], pinTileOffsetX[i]+pinWidth, pinTileOffsetY[i]+pinHeight, null); } } } else { // TODO: proper logging - System.out.println( "PicLayerAbstract::paint - general drawing error (image is null or Graphics not 2D" ); + System.out.println("PicLayerAbstract::paint - general drawing error (image is null or Graphics not 2D"); } } @@ -344,5 +350,5 @@ */ public void visitBoundingBox(BoundingXYVisitor arg0) { - if ( image == null ) + if (image == null) return; String projcode = projection.toCode(); @@ -354,5 +360,5 @@ // initial scale is in m/100pix // So for now, we support the bounding box only when everything is in meters - if (projcode.equals("EPSG:4326") ) + if (projcode.equals("EPSG:4326")) return; @@ -380,5 +386,5 @@ * @param props Properties to save to */ - public void saveCalibration( Properties props ) { + public void saveCalibration(Properties props) { // Save double[] matrix = new double[6]; @@ -401,5 +407,4 @@ * Loads calibration data from file * @param file The file to read from - * @return */ public void loadCalibration(InputStream is) throws IOException { @@ -412,7 +417,6 @@ * Loads calibration data from properties structure * @param props Properties to load from - * @return - */ - public void loadCalibration( Properties props ) { + */ + public void loadCalibration(Properties props) { // Load @@ -426,5 +430,5 @@ initialImageScale = Double.valueOf(props.getProperty(INITIAL_SCALE, "1")); //in_scale - if (props.containsKey(SCALEX)) {// old format + if (props.containsKey(SCALEX)) { // old format //double in_pos_x = Double.valueOf(props.getProperty(INITIAL_POS_X, "0")); //double in_pos_y = Double.valueOf(props.getProperty(INITIAL_POS_Y, "0")); @@ -459,15 +463,15 @@ public void loadWorldfile(InputStream is) throws IOException { - + try ( Reader reader = new InputStreamReader(is); BufferedReader br = new BufferedReader(reader) ) { - double e[] = new double[6]; - for (int i=0; i<6; ++i) { + double[] e = new double[6]; + for (int i = 0; i < 6; ++i) { String line = br.readLine(); e[i] = Double.parseDouble(line); } - double sx=e[0], ry=e[1], rx=e[2], sy=e[3], dx=e[4], dy=e[5]; + double sx = e[0], ry = e[1], rx = e[2], sy = e[3], dx = e[4], dy = e[5]; int w = image.getWidth(null); int h = image.getHeight(null); @@ -498,13 +502,13 @@ EastNorth center = Main.map.mapView.getCenter(); - EastNorth leftop = Main.map.mapView.getEastNorth( 0, 0 ); + EastNorth leftop = Main.map.mapView.getEastNorth(0, 0); // Number of pixels for one unit in east north space. // This is the same in x- and y- direction. - double pixel_per_en = ( Main.map.mapView.getWidth() / 2.0 ) / ( center.east() - leftop.east() ); + double pixel_per_en = (Main.map.mapView.getWidth() / 2.0) / (center.east() - leftop.east()); EastNorth imageCenter = transformer.getImagePosition(); // This is now the offset in screen pixels - double pic_offset_x = (( imageCenter.east() - leftop.east() ) * pixel_per_en); - double pic_offset_y = (( leftop.north() - imageCenter.north() ) * pixel_per_en); // something bad... + double pic_offset_x = ((imageCenter.east() - leftop.east()) * pixel_per_en); + double pic_offset_y = ((leftop.north() - imageCenter.north()) * pixel_per_en); // something bad... AffineTransform pointTrans = AffineTransform.getTranslateInstance(pic_offset_x, pic_offset_y); @@ -527,5 +531,4 @@ transformer.setImagePosition(transformer.getImagePosition().add(x, y)); } - public void rotatePictureBy(double angle) { @@ -572,9 +575,10 @@ Point2D pressed = transformPoint(point); double mindist = 10; - for (Point2D p : transformer.getOriginPoints()) + for (Point2D p : transformer.getOriginPoints()) { if (p.distance(pressed) < mindist) { // if user clicked to select some of origin point selected = p; mindist = p.distance(pressed); } + } return selected; } catch (NoninvertibleTransformException e) { Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerFromClipboard.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerFromClipboard.java (revision 32674) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerFromClipboard.java (revision 32675) @@ -42,5 +42,5 @@ Transferable t = Toolkit.getDefaultToolkit().getSystemClipboard().getContents(null); // Check result - if ( t == null ) { + if (t == null) { throw new IOException(tr("Nothing in clipboard")); } @@ -50,10 +50,10 @@ try { if (t.isDataFlavorSupported(DataFlavor.imageFlavor)) { - image = (Image)t.getTransferData(DataFlavor.imageFlavor); + image = (Image) t.getTransferData(DataFlavor.imageFlavor); } else { throw new IOException(tr("The clipboard data is not an image")); } } catch (UnsupportedFlavorException e) { - throw new IOException( e.getMessage() ); + throw new IOException(e.getMessage()); } Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerFromFile.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerFromFile.java (revision 32674) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerFromFile.java (revision 32675) @@ -53,5 +53,5 @@ private String m_tooltiptext; - public PicLayerFromFile( File file ) { + public PicLayerFromFile(File file) { // Remember the file m_file = file; @@ -102,5 +102,5 @@ } } else { - image = ImageIO.read( m_file ); + image = ImageIO.read(m_file); return image; } @@ -126,14 +126,14 @@ String[][] imgExtensions = new String[][] { - { ".jpg", ".jpeg" }, - { ".png" }, - { ".tif", ".tiff" }, - { ".bmp" }, + {".jpg", ".jpeg"}, + {".png"}, + {".tif", ".tiff"}, + {".bmp"}, }; String[][] wldExtensions = new String[][] { - { ".wld", ".jgw", ".jpgw" }, - { ".wld", ".pgw", ".pngw" }, - { ".wld", ".tfw", ".tifw" }, - { ".wld", ".bmpw", ".bpw"}, + {".wld", ".jgw", ".jpgw"}, + {".wld", ".pgw", ".pngw"}, + {".wld", ".tfw", ".tifw"}, + {".wld", ".bmpw", ".bpw"}, }; @@ -153,5 +153,5 @@ String extension = imgNameInZip.substring(dotIdx); String namepart = imgNameInZip.substring(0, dotIdx); - for (int i=0; i(); } Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/transform/Matrix3D.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/transform/Matrix3D.java (revision 32674) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/transform/Matrix3D.java (revision 32675) @@ -5,24 +5,23 @@ import java.util.List; - class Matrix3D { double[][] a; - - public Matrix3D() { + + Matrix3D() { a = new double[3][]; a[0] = new double[3]; a[1] = new double[3]; a[2] = new double[3]; } - - public Matrix3D(PictureTransform pictureTransform, double b11, double b12, double b13, double b21, double b22, double b23, double b31, double b32, double b33) { + + Matrix3D(PictureTransform pictureTransform, double b11, double b12, double b13, double b21, double b22, double b23, double b31, double b32, double b33) { this(); - + a[0][0] = b11; a[0][1] = b12; a[0][2] = b13; a[1][0] = b21; a[1][1] = b22; a[1][2] = b23; a[2][0] = b31; a[2][1] = b32; a[2][2] = b33; } - - public Matrix3D(List list) { + + Matrix3D(List list) { this(); - - for(int i=0; i<3; i++) { + + for (int i = 0; i < 3; i++) { Point2D p = list.get(i); a[0][i] = p.getX(); @@ -34,19 +33,21 @@ public Matrix3D multiply(Matrix3D m) { Matrix3D result = new Matrix3D(); - for(int i=0; i<3; i++) - for (int j=0; j<3; j++) { + for (int i = 0; i < 3; i++) { + for (int j = 0; j < 3; j++) { double sum = 0; - for (int k=0; k<3; k++) + for (int k = 0; k < 3; k++) { sum += a[i][k]*m.a[k][j]; + } result.a[i][j] = sum; - } + } + } return result; } - + private double determinant() { return a[0][0]*(a[1][1]*a[2][2]-a[1][2]*a[2][1])-a[0][1]*(a[1][0]*a[2][2]-a[1][2]*a[2][0]) +a[0][2]*(a[1][0]*a[2][1]-a[1][1]*a[2][0]); } - + public Matrix3D inverse() throws NoSolutionException { Matrix3D invert = new Matrix3D(); @@ -54,7 +55,7 @@ if (Math.abs(det) <= Double.MIN_VALUE) throw new NoSolutionException("Determinant = 0"); - + double s = 1/det; - + invert.a[0][0] = (s) * (a[1][1] * a[2][2] - a[1][2] * a[2][1]); invert.a[1][0] = (s) * (a[1][2] * a[2][0] - a[1][0] * a[2][2]); @@ -66,8 +67,8 @@ invert.a[1][2] = (s) * (a[0][2] * a[1][0] - a[0][0] * a[1][2]); invert.a[2][2] = (s) * (a[0][0] * a[1][1] - a[0][1] * a[1][0]); - + return invert; } - + public AffineTransform toAffineTransform() throws NoSolutionException { if (!(Math.abs(a[2][0]) <= 1e-2 && Math.abs(a[2][1]) <= 1e-2 && Math.abs(a[2][2]-1) <= 1e-2)) Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/transform/NoSolutionException.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/transform/NoSolutionException.java (revision 32674) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/transform/NoSolutionException.java (revision 32675) @@ -2,6 +2,6 @@ class NoSolutionException extends Exception { - - public NoSolutionException(String message) { + + NoSolutionException(String message) { super(message); }