Index: /trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (revision 15586) @@ -71,5 +71,5 @@ + "This may both clutter your screen with browser windows
" + "and take some time to finish.", numBrowsers, numBrowsers); - ButtonSpec[] spec = new ButtonSpec[] { + ButtonSpec[] spec = { new ButtonSpec( tr("Continue"), Index: /trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 15586) @@ -220,5 +220,5 @@ waysToDelete.add(w); } else { - ButtonSpec[] options = new ButtonSpec[] { + ButtonSpec[] options = { new ButtonSpec( tr("Abort Merging"), Index: /trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java (revision 15586) @@ -81,5 +81,5 @@ protected boolean confirmSimplifyManyWays(int numWays) { - ButtonSpec[] options = new ButtonSpec[] { + ButtonSpec[] options = { new ButtonSpec( tr("Yes"), Index: /trunk/src/org/openstreetmap/josm/actions/corrector/TagCorrector.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/corrector/TagCorrector.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/actions/corrector/TagCorrector.java (revision 15586) @@ -59,5 +59,5 @@ public abstract Collection execute(P oldprimitive, P primitive) throws UserCancelException; - private static final String[] APPLICATION_OPTIONS = new String[] { + private static final String[] APPLICATION_OPTIONS = { tr("Apply selected changes"), tr("Do not apply changes"), Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java (revision 15586) @@ -169,5 +169,5 @@ */ protected void handlePotentiallyDeletedPrimitives(Set potentiallyDeleted) { - ButtonSpec[] options = new ButtonSpec[] { + ButtonSpec[] options = { new ButtonSpec( tr("Check on the server"), Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 15586) @@ -995,5 +995,4 @@ } - /** * Gets a node index from selected way after given index. Index: /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 15586) @@ -168,5 +168,4 @@ } - /** * Builds and shows the search dialog. Index: /trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java (revision 15586) @@ -280,5 +280,4 @@ return !redoCommands.isEmpty(); } - /** Index: /trunk/src/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelper.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelper.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelper.java (revision 15586) @@ -145,5 +145,4 @@ } - /** * Moves reader to first occurrence of the structure equivalent of Xpath tags[0]/tags[1]../tags[n]. If fails to find Index: /trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (revision 15586) @@ -446,5 +446,4 @@ return output.toString(); } - /** @@ -1077,5 +1076,4 @@ } - /** * @return set of projection codes that this TileSource supports Index: /trunk/src/org/openstreetmap/josm/data/osm/DataSelectionListener.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/DataSelectionListener.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/data/osm/DataSelectionListener.java (revision 15586) @@ -113,5 +113,4 @@ } } - /** Index: /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 15586) @@ -312,5 +312,4 @@ } - /* ------- /* FLAGS Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java (revision 15586) @@ -230,5 +230,4 @@ } - /** *

Unregisters a map renderer class.

Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 15586) @@ -791,5 +791,4 @@ } - /** * Draw the icon for a given area. Normally, the icon is drawn around the center of the area. Index: /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java (revision 15586) @@ -290,10 +290,10 @@ // WARNING: this array MUST be sorted, otherwise it cannot be searched reliably using binary search - private static final String[] INFRASTRUCTURE_TLDS = new String[] { + private static final String[] INFRASTRUCTURE_TLDS = { "arpa", // internet infrastructure }; // WARNING: this array MUST be sorted, otherwise it cannot be searched reliably using binary search - private static final String[] GENERIC_TLDS = new String[] { + private static final String[] GENERIC_TLDS = { // Taken from Version 2019120700, Last Updated Sat Dec 7 07:07:01 2019 UTC "aaa", // aaa American Automobile Association, Inc. @@ -1524,5 +1524,5 @@ // WARNING: this array MUST be sorted, otherwise it cannot be searched reliably using binary search - private static final String[] COUNTRY_CODE_TLDS = new String[] { + private static final String[] COUNTRY_CODE_TLDS = { "ac", // Ascension Island "ad", // Andorra @@ -1822,5 +1822,5 @@ // WARNING: this array MUST be sorted, otherwise it cannot be searched reliably using binary search - private static final String[] LOCAL_TLDS = new String[] { + private static final String[] LOCAL_TLDS = { "localdomain", // Also widely used as localhost.localdomain "localhost", // RFC2606 defined Index: /trunk/src/org/openstreetmap/josm/data/validation/routines/RegexValidator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/routines/RegexValidator.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/data/validation/routines/RegexValidator.java (revision 15586) @@ -180,5 +180,4 @@ } - /** * Validate a value against the set of regular expressions Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/InternetTags.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/InternetTags.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/InternetTags.java (revision 15586) @@ -36,5 +36,5 @@ * List of keys subject to URL validation. */ - private static final String[] URL_KEYS = new String[] { + private static final String[] URL_KEYS = { "url", "source:url", "website", "contact:website", "heritage:website", "source:website" @@ -44,5 +44,5 @@ * List of keys subject to email validation. */ - private static final String[] EMAIL_KEYS = new String[] { + private static final String[] EMAIL_KEYS = { "email", "contact:email" }; Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (revision 15586) @@ -95,5 +95,4 @@ final Set tested = new HashSet<>(); - /** * A grouped MapCSSRule with multiple selectors for a single declaration. Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (revision 15586) @@ -519,5 +519,4 @@ } - /** * Determine multipolygon ways which are intersecting (crossing without a common node) or sharing one or more way segments. @@ -633,5 +632,4 @@ } - /** * Find ways which are crossing without sharing a node. Index: /trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java (revision 15586) @@ -42,5 +42,4 @@ private final JosmTextArea taLog = new JosmTextArea(5, 50); private final JScrollPane spLog = new JScrollPane(taLog); - /** Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java (revision 15586) @@ -39,5 +39,5 @@ */ public class TagMerger extends AbstractMergePanel implements IConflictResolver { - private static final String[] KEY_VALUE = new String[] {tr("Key"), tr("Value")}; + private static final String[] KEY_VALUE = {tr("Key"), tr("Value")}; private final TagMergeModel model = new TagMergeModel(); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java (revision 15586) @@ -31,5 +31,5 @@ private String value; - private static final String[] SUMMABLE_KEYS = new String[] { + private static final String[] SUMMABLE_KEYS = { "capacity(:.+)?", "step_count" }; Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (revision 15586) @@ -368,5 +368,5 @@ static final class StatisticsTableModel extends DefaultTableModel { - private static final String[] HEADERS = new String[] {tr("Paste ..."), tr("From ..."), tr("To ...") }; + private static final String[] HEADERS = {tr("Paste ..."), tr("From ..."), tr("To ...") }; private final transient List data = new ArrayList<>(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 15586) @@ -616,5 +616,5 @@ sb.append("").append(msg1).append(""); if (numNewConflicts > 0) { - final ButtonSpec[] options = new ButtonSpec[] { + final ButtonSpec[] options = { new ButtonSpec( tr("OK"), Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (revision 15586) @@ -325,5 +325,5 @@ // ask if the whole set should be ignored if (asked == JOptionPane.DEFAULT_OPTION) { - String[] a = new String[] {tr("Whole group"), tr("Single elements"), tr("Nothing")}; + String[] a = {tr("Whole group"), tr("Single elements"), tr("Nothing")}; asked = JOptionPane.showOptionDialog(MainApplication.getMainFrame(), tr("Ignore whole group or individual elements?"), tr("Ignoring elements"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, null, Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorListManagementDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorListManagementDialog.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorListManagementDialog.java (revision 15586) @@ -38,5 +38,4 @@ import org.openstreetmap.josm.tools.ImageProvider; import org.openstreetmap.josm.tools.Logging; - /** @@ -214,5 +213,4 @@ tree.updateUI(); } - /** Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java (revision 15586) @@ -559,5 +559,5 @@ // TODO: Nicer color palette - private static final Color[] COLORS = new Color[] { + private static final Color[] COLORS = { Color.RED, Color.ORANGE, Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 15586) @@ -202,5 +202,5 @@ private final EditAction editAction = new EditAction(); private final DeleteAction deleteAction = new DeleteAction(); - private final JosmAction[] josmActions = new JosmAction[]{addAction, editAction, deleteAction}; + private final JosmAction[] josmActions = {addAction, editAction, deleteAction}; private final transient HighlightHelper highlightHelper = new HighlightHelper(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CancelAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CancelAction.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CancelAction.java (revision 15586) @@ -61,5 +61,5 @@ protected int confirmClosingByCancel() { - ButtonSpec[] options = new ButtonSpec[] { + ButtonSpec[] options = { new ButtonSpec( tr("Yes, save the changes and close"), Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/RefreshAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/RefreshAction.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/RefreshAction.java (revision 15586) @@ -77,5 +77,5 @@ protected int confirmDiscardDirtyData() { - ButtonSpec[] options = new ButtonSpec[] { + ButtonSpec[] options = { new ButtonSpec( tr("Yes, discard changes and reload"), @@ -106,5 +106,5 @@ protected int confirmCloseDeletedRelation() { - ButtonSpec[] options = new ButtonSpec[] { + ButtonSpec[] options = { new ButtonSpec( tr("Yes"), Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java (revision 15586) @@ -107,5 +107,5 @@ protected boolean confirmClosingBecauseOfDirtyState() { - ButtonSpec[] options = new ButtonSpec[] { + ButtonSpec[] options = { new ButtonSpec( tr("Yes, create a conflict and close"), Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SetRoleAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SetRoleAction.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SetRoleAction.java (revision 15586) @@ -55,5 +55,5 @@ "
" + tr("Do you really want to apply the new role?") + ""; - String[] options = new String[] { + String[] options = { tr("Yes, apply it"), tr("No, do not apply") Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java (revision 15586) @@ -342,5 +342,4 @@ } - /** * Free resources. Index: /trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 15586) @@ -74,5 +74,5 @@ private JTable tblSearchResults; private DownloadDialog parent; - private static final Server[] SERVERS = new Server[] { + private static final Server[] SERVERS = { new Server("Nominatim", NameFinder.NOMINATIM_URL, tr("Class Type"), tr("Bounds")) }; Index: /trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java (revision 15586) @@ -128,5 +128,5 @@ default: throw new AssertionError(); } - ButtonSpec[] spec = new ButtonSpec[] { + ButtonSpec[] spec = { new ButtonSpec( lbl, @@ -176,5 +176,5 @@ */ protected void handleUploadConflictForUnknownConflict() { - ButtonSpec[] spec = new ButtonSpec[] { + ButtonSpec[] spec = { new ButtonSpec( tr("Synchronize entire dataset"), @@ -235,5 +235,5 @@ */ protected void handleUploadPreconditionFailedConflict(OsmApiException e, Pair> conflict) { - ButtonSpec[] options = new ButtonSpec[] { + ButtonSpec[] options = { new ButtonSpec( tr("Prepare conflict resolution"), Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (revision 15586) @@ -84,5 +84,5 @@ protected MaxChangesetSizeExceededPolicy askMaxChangesetSizeExceedsPolicy() { - ButtonSpec[] specs = new ButtonSpec[] { + ButtonSpec[] specs = { new ButtonSpec( tr("Continue uploading"), Index: /trunk/src/org/openstreetmap/josm/gui/layer/AbstractCachedTileSourceLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/AbstractCachedTileSourceLayer.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/layer/AbstractCachedTileSourceLayer.java (revision 15586) @@ -39,5 +39,4 @@ private ICacheAccess cache; private volatile TileLoaderFactory loaderFactory; - /** @@ -89,5 +88,4 @@ } - /** * Plugins that wish to set custom tile loader should call this method Index: /trunk/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java (revision 15586) @@ -72,5 +72,5 @@ Color cl = colorLayers.stream().filter(Objects::nonNull).map(Layer::getColor).filter(Objects::nonNull).findAny().orElse(Color.GRAY); JColorChooser c = new JColorChooser(cl); - Object[] options = new Object[]{tr("OK"), tr("Cancel"), tr("Default")}; + Object[] options = {tr("OK"), tr("Cancel"), tr("Default")}; int answer = JOptionPane.showOptionDialog( MainApplication.getMainFrame(), Index: /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java (revision 15586) @@ -138,5 +138,5 @@ .findAny().orElse(GpxDrawHelper.DEFAULT_COLOR_PROPERTY.get()); JColorChooser c = new JColorChooser(cl); - Object[] options = new Object[]{tr("OK"), tr("Cancel"), tr("Default")}; + Object[] options = {tr("OK"), tr("Cancel"), tr("Default")}; int answer = JOptionPane.showOptionDialog( MainApplication.getMainFrame(), Index: /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java (revision 15586) @@ -164,5 +164,5 @@ */ public int showInDownloadDialog(String title, String helpTopic) { - final ButtonSpec[] options = new ButtonSpec[] { + final ButtonSpec[] options = { new ButtonSpec( tr("Download"), Index: /trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java (revision 15586) @@ -180,5 +180,5 @@ private static Color[] heatMapLutColorJosmRed2Blue = createColorFromResource("red2blue"); - private static Color[] rtkLibQualityColors = new Color[] { + private static Color[] rtkLibQualityColors = { Color.GREEN, // Fixed, solution by carrier‐based relative positioning and the integer ambiguity is properly resolved. Color.ORANGE, // Float, solution by carrier‐based relative positioning but the integer ambiguity is not resolved. Index: /trunk/src/org/openstreetmap/josm/gui/layer/imagery/SharpenImageProcessor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/imagery/SharpenImageProcessor.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/layer/imagery/SharpenImageProcessor.java (revision 15586) @@ -27,5 +27,5 @@ private ConvolveOp op; - private static final float[] KERNEL_IDENTITY = new float[] { + private static final float[] KERNEL_IDENTITY = { 0, 0, 0, 0, 1, 0, @@ -33,5 +33,5 @@ }; - private static final float[] KERNEL_BLUR = new float[] { + private static final float[] KERNEL_BLUR = { 1f / 16, 2f / 16, 1f / 16, 2f / 16, 4f / 16, 2f / 16, @@ -39,5 +39,5 @@ }; - private static final float[] KERNEL_SHARPEN = new float[] { + private static final float[] KERNEL_SHARPEN = { -.5f, -1f, -.5f, -1f, 7, -1f, Index: /trunk/src/org/openstreetmap/josm/gui/layer/validation/PaintVisitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/validation/PaintVisitor.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/layer/validation/PaintVisitor.java (revision 15586) @@ -153,8 +153,8 @@ if (selected) { g.setColor(getHighlightColor(color)); - int[] x = new int[] {(int) (p1.x + cosT), (int) (p2.x + cosT), - (int) (p2.x - cosT), (int) (p1.x - cosT)}; - int[] y = new int[] {(int) (p1.y - sinT), (int) (p2.y - sinT), - (int) (p2.y + sinT), (int) (p1.y + sinT)}; + int[] x = {(int) (p1.x + cosT), (int) (p2.x + cosT), + (int) (p2.x - cosT), (int) (p1.x - cosT)}; + int[] y = {(int) (p1.y - sinT), (int) (p2.y - sinT), + (int) (p2.y + sinT), (int) (p1.y + sinT)}; g.fillPolygon(x, y, 4); g.fillArc(p1.x - 5, p1.y - 5, 10, 10, deg, 180); Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/CompletelyInsideAreaStrategy.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/CompletelyInsideAreaStrategy.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/CompletelyInsideAreaStrategy.java (revision 15586) @@ -72,5 +72,5 @@ // | 8 3 7 | // +-----------+ - Rectangle[] candidates = new Rectangle[] { + Rectangle[] candidates = { new Rectangle(x2, y1, nbw, nbh), new Rectangle(x3, y2, nbw, nbh), Index: /trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java (revision 15586) @@ -161,5 +161,5 @@ protected boolean confirmOverwriteCustomSettings() { - ButtonSpec[] buttons = new ButtonSpec[] { + ButtonSpec[] buttons = { new ButtonSpec( tr("Continue"), Index: /trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 15586) @@ -736,5 +736,5 @@ private class ActionTransferable implements Transferable { - private final DataFlavor[] flavors = new DataFlavor[] {ACTION_FLAVOR}; + private final DataFlavor[] flavors = {ACTION_FLAVOR}; private final List actions; Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (revision 15586) @@ -49,9 +49,8 @@ private static final int WAYPOINT_LABEL_CUSTOM = 6; - private static final String[] LABEL_PATTERN_TEMPLATE = new String[] {Marker.LABEL_PATTERN_AUTO, Marker.LABEL_PATTERN_NAME, + private static final String[] LABEL_PATTERN_TEMPLATE = {Marker.LABEL_PATTERN_AUTO, Marker.LABEL_PATTERN_NAME, Marker.LABEL_PATTERN_DESC, "{special:everything}", "?{ '{name}' | '{desc}' | '{formattedWaypointOffset}' }", " "}; - private static final String[] LABEL_PATTERN_DESC = new String[] {tr("Auto"), /* gpx data field name */ trc("gpx_field", "Name"), + private static final String[] LABEL_PATTERN_DESC = {tr("Auto"), /* gpx data field name */ trc("gpx_field", "Name"), /* gpx data field name */ trc("gpx_field", "Desc(ription)"), tr("Everything"), tr("Name or offset"), tr("None"), tr("Custom")}; - private final JRadioButton drawRawGpsLinesGlobal = new JRadioButton(tr("Use global settings")); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CommonSettingsPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CommonSettingsPanel.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CommonSettingsPanel.java (revision 15586) @@ -25,5 +25,4 @@ private final JosmComboBox sharpen; private final JSlider tilesZoom = new JSlider(-2, 2, 0); - /** Index: /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/HeadersTable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/HeadersTable.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/HeadersTable.java (revision 15586) @@ -72,5 +72,5 @@ } else if (row == headers.size()) { - String[] entry = new String[] {"", ""}; + String[] entry = {"", ""}; entry[col] = (String) value; headers.add(entry); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/TMSSettingsPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/TMSSettingsPanel.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/TMSSettingsPanel.java (revision 15586) @@ -33,5 +33,4 @@ private final JSpinner maxConcurrentDownloads; private final JSpinner maxDownloadsPerHost; - /** Index: /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (revision 15586) @@ -268,5 +268,5 @@ private void configureSites() { - ButtonSpec[] options = new ButtonSpec[] { + ButtonSpec[] options = { new ButtonSpec( tr("OK"), Index: /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 15586) @@ -123,5 +123,5 @@ private static class ScListModel extends AbstractTableModel { - private final String[] columnNames = new String[]{tr("Action"), tr("Shortcut")}; + private final String[] columnNames = {tr("Action"), tr("Shortcut")}; private final transient List data; Index: /trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java (revision 15586) @@ -74,5 +74,5 @@ /* Localization keys for file chooser (and color chooser). */ - private static final String[] JAVA_INTERNAL_MESSAGE_KEYS = new String[] { + private static final String[] JAVA_INTERNAL_MESSAGE_KEYS = { /* JFileChooser windows laf */ "FileChooser.detailsViewActionLabelText", Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java (revision 15586) @@ -188,5 +188,5 @@ label.setText(message.replaceFirst("
", "
")); } - Object[] choices = new Object[] {tr("Yes, always"), tr("Yes, once"), tr("No")}; + Object[] choices = {tr("Yes, always"), tr("Yes, once"), tr("No")}; int choice = JOptionPane.showOptionDialog(MainApplication.getMainFrame(), label, tr("Confirm Remote Control action"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, choices, choices[1]); Index: /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 15586) @@ -487,5 +487,5 @@ } - ButtonSpec[] options = new ButtonSpec[] { + ButtonSpec[] options = { new ButtonSpec( tr("Update plugins"), @@ -564,5 +564,5 @@ .append(Utils.joinAsHtmlUnorderedList(missingRequiredPlugin)) .append(""); - ButtonSpec[] specs = new ButtonSpec[] { + ButtonSpec[] specs = { new ButtonSpec( tr("Download and restart"), @@ -1207,5 +1207,5 @@ */ public static boolean confirmDisablePlugin(Component parent, String reason, String name) { - ButtonSpec[] options = new ButtonSpec[] { + ButtonSpec[] options = { new ButtonSpec( tr("Disable plugin"), @@ -1420,5 +1420,5 @@ private static int askUpdateDisableKeepPluginAfterException(PluginProxy plugin) { - final ButtonSpec[] options = new ButtonSpec[] { + final ButtonSpec[] options = { new ButtonSpec( tr("Update plugin"), Index: /trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java =================================================================== --- /trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (revision 15586) @@ -439,5 +439,5 @@ Collection locations = getPluginLocations(); - String[] nameCandidates = new String[] { + String[] nameCandidates = { pluginName, pluginName + "-" + PlatformManager.getPlatform().getPlatform().name().toLowerCase(Locale.ENGLISH)}; Index: /trunk/src/org/openstreetmap/josm/tools/ColorScale.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/ColorScale.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/tools/ColorScale.java (revision 15586) @@ -63,7 +63,7 @@ // CHECKSTYLE.OFF: SingleSpaceSeparator // red yellow green blue red - int[] h = new int[] {0, 59, 127, 244, 360}; - int[] s = new int[] {100, 84, 99, 100}; - int[] b = new int[] {90, 93, 74, 83}; + int[] h = {0, 59, 127, 244, 360}; + int[] s = {100, 84, 99, 100}; + int[] b = {90, 93, 74, 83}; // CHECKSTYLE.ON: SingleSpaceSeparator Index: /trunk/src/org/openstreetmap/josm/tools/Geometry.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/Geometry.java (revision 15585) +++ /trunk/src/org/openstreetmap/josm/tools/Geometry.java (revision 15586) @@ -1146,5 +1146,4 @@ } - /** * Data class to hold two double values (area and perimeter of a polygon). Index: /trunk/test/unit/org/openstreetmap/josm/data/cache/HostLimitQueueTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/cache/HostLimitQueueTest.java (revision 15585) +++ /trunk/test/unit/org/openstreetmap/josm/data/cache/HostLimitQueueTest.java (revision 15586) @@ -32,5 +32,4 @@ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") public JOSMTestRules test = new JOSMTestRules().preferences().timeout(20 * 1000); - /**