inputFileImporters = ExtensionFileFilter.getImporters().stream()
.filter(importer -> importer.acceptFile(inputFileFile)).collect(Collectors.toList());
- final Stopwatch stopwatch = Stopwatch.createStarted();
+ final var stopwatch = Stopwatch.createStarted();
if (inputFileImporters.stream().noneMatch(fileImporter ->
fileImporter.importDataHandleExceptions(inputFileFile, progressMonitorFactory.get()))) {
@@ -263,24 +261,24 @@
.stream().filter(layer -> inputFileFile.equals(layer.getAssociatedFile()))
.findFirst().orElseThrow(() -> new JosmRuntimeException(tr("Could not find a layer for {0}", inputFile)));
- final DataSet dataSet = dataLayer.getDataSet();
+ final var dataSet = dataLayer.getDataSet();
if (this.changeFiles.containsKey(inputFile)) {
- ProgressMonitor changeFilesMonitor = progressMonitorFactory.get();
+ final var changeFilesMonitor = progressMonitorFactory.get();
for (String changeFile : this.changeFiles.getOrDefault(inputFile, Collections.emptyList())) {
- try (InputStream changeStream = Compression.getUncompressedFileInputStream(Paths.get(changeFile))) {
+ try (var changeStream = Compression.getUncompressedFileInputStream(Paths.get(changeFile))) {
dataSet.mergeFrom(OsmChangeReader.parseDataSet(changeStream, changeFilesMonitor));
}
}
}
- Path path = Paths.get(outputFile);
+ final var path = Paths.get(outputFile);
if (path.toFile().isFile() && !Files.deleteIfExists(path)) {
Logging.error("Could not delete {0}, attempting to append", outputFile);
}
- GeoJSONMapRouletteWriter geoJSONMapRouletteWriter = new GeoJSONMapRouletteWriter(dataSet);
+ final var geoJSONMapRouletteWriter = new GeoJSONMapRouletteWriter(dataSet);
OsmValidator.initializeTests();
- try (OutputStream fileOutputStream = Files.newOutputStream(path)) {
+ try (var fileOutputStream = Files.newOutputStream(path)) {
// The first writeErrors catches anything that was written, for whatever reason. This is probably never
// going to be called.
- ValidationTask validationTask = new ValidationTask(errors -> writeErrors(geoJSONMapRouletteWriter, fileOutputStream, errors),
+ final var validationTask = new ValidationTask(errors -> writeErrors(geoJSONMapRouletteWriter, fileOutputStream, errors),
progressMonitorFactory.get(), OsmValidator.getEnabledTests(false),
dataSet.allPrimitives(), Collections.emptyList(), false);
@@ -320,12 +318,12 @@
*/
private static String getDefaultOutputName(final String inputString) {
- final String extension = FileNameUtils.getExtension(inputString);
+ final String extension = FilenameUtils.getExtension(inputString);
if (!Arrays.asList("zip", "bz", "xz", "geojson").contains(extension)) {
- return FileNameUtils.getBaseName(inputString) + ".geojson";
+ return FilenameUtils.getBaseName(inputString) + ".geojson";
} else if ("geojson".equals(extension)) {
// Account for geojson input files
- return FileNameUtils.getBaseName(inputString) + ".validated.geojson";
- }
- return FileNameUtils.getBaseName(FileNameUtils.getBaseName(inputString)) + ".geojson";
+ return FilenameUtils.getBaseName(inputString) + ".validated.geojson";
+ }
+ return FilenameUtils.getBaseName(FilenameUtils.getBaseName(inputString)) + ".geojson";
}
@@ -348,5 +346,5 @@
/**
* Initialize everything that might be needed
- *
+ *
* Arguments may need to be parsed first.
*/
@@ -369,6 +367,6 @@
Logging.setLogLevel(Level.INFO);
- OptionParser parser = new OptionParser("JOSM validate");
- final AtomicReference currentInput = new AtomicReference<>(null);
+ final var parser = new OptionParser("JOSM validate");
+ final var currentInput = new AtomicReference(null);
for (Option o : Option.values()) {
if (o.requiresArgument()) {
@@ -425,7 +423,7 @@
break;
case LOAD_PREFERENCES:
- final Preferences tempPreferences = new Preferences();
+ final var tempPreferences = new Preferences();
tempPreferences.enableSaveOnPut(false);
- CustomConfigurator.XMLCommandProcessor config = new CustomConfigurator.XMLCommandProcessor(tempPreferences);
+ final var config = new CustomConfigurator.XMLCommandProcessor(tempPreferences);
try (InputStream is = Utils.openStream(new File(argument).toURI().toURL())) {
config.openAndReadXML(is);
@@ -435,5 +433,5 @@
final IPreferences pref = Config.getPref();
if (pref instanceof MemoryPreferences) {
- final MemoryPreferences memoryPreferences = (MemoryPreferences) pref;
+ final var memoryPreferences = (MemoryPreferences) pref;
tempPreferences.getAllSettings().forEach(memoryPreferences::putSetting);
} else {
@@ -454,5 +452,5 @@
private static String getHelp() {
- final String helpPadding = "\t ";
+ final var helpPadding = "\t ";
// CHECKSTYLE.OFF: SingleSpaceSeparator
return tr("JOSM Validation command line interface") + "\n\n" +
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java (revision 19047)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java (revision 19048)
@@ -48,5 +48,5 @@
* {@code type=associatedStreet} and {@code type=street} relations.
*/
- private static class AssociatedStreetRoleStreetSorter implements AdditionalSorter {
+ private static final class AssociatedStreetRoleStreetSorter implements AdditionalSorter {
@Override
@@ -65,5 +65,5 @@
* {@code type=associatedStreet} and {@code type=street} relations.
*/
- private static class AssociatedStreetRoleAddressHouseSorter implements AdditionalSorter {
+ private static final class AssociatedStreetRoleAddressHouseSorter implements AdditionalSorter {
@Override
@@ -93,5 +93,5 @@
* {@code type=public_transport} relations.
*/
- private static class PublicTransportRoleStopPlatformSorter implements AdditionalSorter {
+ private static final class PublicTransportRoleStopPlatformSorter implements AdditionalSorter {
@Override
@@ -140,5 +140,5 @@
* {@code type=restriction} relations.
*/
- private static class FromViaToSorter implements AdditionalSorter {
+ private static final class FromViaToSorter implements AdditionalSorter {
private static final List ROLES = Arrays.asList("from", "via", "to");
@@ -173,5 +173,5 @@
// Dispatch members to the first adequate sorter
for (RelationMember m : relationMembers) {
- boolean wasAdded = false;
+ var wasAdded = false;
for (AdditionalSorter sorter : ADDITIONAL_SORTERS) {
if (sorter.acceptsMember(relationMembers, m)) {
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (revision 19047)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (revision 19048)
@@ -141,5 +141,5 @@
ht("/Action/Upload#ChangesetFull")
);
- switch(ret) {
+ switch (ret) {
case 0: return MaxChangesetSizeExceededPolicy.AUTOMATICALLY_OPEN_NEW_CHANGESETS;
case 1: return MaxChangesetSizeExceededPolicy.FILL_ONE_CHANGESET_AND_RETURN_TO_UPLOAD_DIALOG;
@@ -168,7 +168,7 @@
strategy.setPolicy(promptUserForPolicy());
}
- switch(strategy.getPolicy()) {
+ switch (strategy.getPolicy()) {
case AUTOMATICALLY_OPEN_NEW_CHANGESETS:
- Changeset newChangeSet = new Changeset();
+ final var newChangeSet = new Changeset();
newChangeSet.setKeys(changeset.getKeys());
closeChangeset();
@@ -280,5 +280,5 @@
processedPrimitives.addAll(writer.getProcessedPrimitives()); // OsmPrimitive in => OsmPrimitive out
}
- switch(e.getSource()) {
+ switch (e.getSource()) {
case UPLOAD_DATA:
// Most likely the changeset is full. Try to recover and continue
@@ -319,5 +319,5 @@
}
} finally {
- if (MessageNotifier.PROP_NOTIFIER_ENABLED.get()) {
+ if (Boolean.TRUE.equals(MessageNotifier.PROP_NOTIFIER_ENABLED.get())) {
MessageNotifier.start();
}
@@ -372,5 +372,5 @@
if (uploadCanceled) return;
if (lastException == null) {
- HtmlPanel panel = new HtmlPanel(
+ final var panel = new HtmlPanel(
"");
@@ -393,5 +393,5 @@
return;
if (e.getSource() == ChangesetClosedException.Source.UPLOAD_DATA) {
- switch(strategy.getPolicy()) {
+ switch (strategy.getPolicy()) {
case ABORT:
break; /* do nothing - we return to map editing */
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 19047)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 19048)
@@ -67,5 +67,4 @@
import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
import org.openstreetmap.josm.gui.layer.geoimage.AdjustTimezoneAndOffsetDialog.AdjustListener;
-import org.openstreetmap.josm.gui.layer.geoimage.SynchronizeTimeFromPhotoDialog.TimeZoneItem;
import org.openstreetmap.josm.gui.layer.gpx.GpxDataHelper;
import org.openstreetmap.josm.gui.widgets.JosmComboBox;
@@ -173,8 +172,8 @@
// Search whether an other layer has yet defined some bounding box.
// If none, we'll zoom to the bounding box of the layer with the photos.
- boolean boundingBoxedLayerFound = false;
+ var boundingBoxedLayerFound = false;
for (Layer l: MainApplication.getLayerManager().getLayers()) {
if (l != yLayer) {
- BoundingXYVisitor bbox = new BoundingXYVisitor();
+ final var bbox = new BoundingXYVisitor();
l.visitBoundingBox(bbox);
if (bbox.getBounds() != null) {
@@ -185,5 +184,5 @@
}
if (!boundingBoxedLayerFound) {
- BoundingXYVisitor bbox = new BoundingXYVisitor();
+ final var bbox = new BoundingXYVisitor();
yLayer.visitBoundingBox(bbox);
MainApplication.getMap().mapView.zoomTo(bbox);
@@ -261,16 +260,16 @@
* been loaded yet. It displays a FileChooser dialog to select the GPX file to be loaded.
*/
- private class LoadGpxDataActionListener implements ActionListener {
+ private final class LoadGpxDataActionListener implements ActionListener {
@Override
public void actionPerformed(ActionEvent e) {
- File sel = GpxDataHelper.chooseGpxDataFile();
+ final var sel = GpxDataHelper.chooseGpxDataFile();
if (sel != null) {
try {
outerPanel.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
removeDuplicates(sel);
- GpxData data = GpxDataHelper.loadGpxData(sel);
+ final var data = GpxDataHelper.loadGpxData(sel);
if (data != null) {
- GpxDataWrapper elem = new GpxDataWrapper(sel.getName(), data, sel);
+ final var elem = new GpxDataWrapper(sel.getName(), data, sel);
gpxModel.addElement(elem);
gpxModel.setSelectedItem(elem);
@@ -284,5 +283,5 @@
}
- private class UseSupportLayerActionListener implements ActionListener {
+ private final class UseSupportLayerActionListener implements ActionListener {
@Override
@@ -296,9 +295,9 @@
}
- private class AdvancedSettingsActionListener implements ActionListener {
+ private final class AdvancedSettingsActionListener implements ActionListener {
@Override
public void actionPerformed(ActionEvent e) {
- AdvancedCorrelationSettingsDialog ed = new AdvancedCorrelationSettingsDialog(MainApplication.getMainFrame(), forceTags);
+ final var ed = new AdvancedCorrelationSettingsDialog(MainApplication.getMainFrame(), forceTags);
if (ed.showDialog().getValue() == 1) {
forceTags = ed.isForceTaggingSelected(); // This setting is not supposed to be saved permanently
@@ -317,12 +316,11 @@
* @author chris
*/
- private class SetOffsetActionListener implements ActionListener {
+ private final class SetOffsetActionListener implements ActionListener {
@Override
public void actionPerformed(ActionEvent e) {
- boolean isOk = false;
+ var isOk = false;
while (!isOk) {
- SynchronizeTimeFromPhotoDialog ed = new SynchronizeTimeFromPhotoDialog(
- MainApplication.getMainFrame(), yLayer.getImageData().getImages());
+ final var ed = new SynchronizeTimeFromPhotoDialog(MainApplication.getMainFrame(), yLayer.getImageData().getImages());
int answer = ed.showDialog().getValue();
if (answer != 1)
@@ -340,5 +338,5 @@
}
- TimeZoneItem selectedTz = ed.getTimeZoneItem();
+ final var selectedTz = ed.getTimeZoneItem();
Config.getPref().put("geoimage.timezoneid", selectedTz.getID());
@@ -354,13 +352,13 @@
}
- private static class GpxLayerAddedListener implements LayerChangeListener {
+ private static final class GpxLayerAddedListener implements LayerChangeListener {
@Override
public void layerAdded(LayerAddEvent e) {
- Layer layer = e.getAddedLayer();
+ final var layer = e.getAddedLayer();
if (layer instanceof GpxDataContainer) {
- GpxData gpx = ((GpxDataContainer) layer).getGpxData();
- File file = gpx.storageFile;
+ final var gpx = ((GpxDataContainer) layer).getGpxData();
+ final var file = gpx.storageFile;
removeDuplicates(file);
- GpxDataWrapper gdw = new GpxDataWrapper(layer.getName(), gpx, file);
+ final var gdw = new GpxDataWrapper(layer.getName(), gpx, file);
layer.addPropertyChangeListener(new GpxLayerRenamedListener(gdw));
gpxModel.addElement(gdw);
@@ -376,7 +374,7 @@
@Override
public void layerRemoving(LayerRemoveEvent e) {
- Layer layer = e.getRemovedLayer();
+ final var layer = e.getRemovedLayer();
if (layer instanceof GpxDataContainer) {
- GpxData removedGpxData = ((GpxDataContainer) layer).getGpxData();
+ final var removedGpxData = ((GpxDataContainer) layer).getGpxData();
for (int i = gpxModel.getSize() - 1; i >= 0; i--) {
GpxData data = gpxModel.getElementAt(i).data;
@@ -428,6 +426,6 @@
for (AbstractModifiableLayer cur : MainApplication.getLayerManager().getLayersOfType(AbstractModifiableLayer.class)) {
if (cur instanceof GpxDataContainer) {
- GpxData data = ((GpxDataContainer) cur).getGpxData();
- GpxDataWrapper gdw = new GpxDataWrapper(cur.getName(), data, data.storageFile);
+ final var data = ((GpxDataContainer) cur).getGpxData();
+ final var gdw = new GpxDataWrapper(cur.getName(), data, data.storageFile);
cur.addPropertyChangeListener(new GpxLayerRenamedListener(gdw));
gpxModel.addElement(gdw);
@@ -471,10 +469,10 @@
@Override
public void actionPerformed(ActionEvent ae) {
- NoGpxDataWrapper nogdw = new NoGpxDataWrapper();
+ final var nogdw = new NoGpxDataWrapper();
if (gpxModel == null) {
constructGpxModel(nogdw);
}
- JPanel panelCb = new JPanel();
+ final var panelCb = new JPanel();
panelCb.add(new JLabel(tr("GPX track: ")));
@@ -485,5 +483,5 @@
panelCb.add(cbGpx);
- JButton buttonOpen = new JButton(tr("Open another GPX trace"));
+ final var buttonOpen = new JButton(tr("Open another GPX trace"));
buttonOpen.addActionListener(new LoadGpxDataActionListener());
panelCb.add(buttonOpen);
@@ -493,5 +491,5 @@
panelCb.add(buttonSupport);
- JPanel panelTf = new JPanel(new GridBagLayout());
+ final var panelTf = new JPanel(new GridBagLayout());
timezone = loadTimezone();
@@ -505,19 +503,19 @@
tfOffset.setText(delta.formatOffset());
- JButton buttonViewGpsPhoto = new JButton(tr("Use photo of an accurate clock,
e.g. GPS receiver display"));
+ final var buttonViewGpsPhoto = new JButton(tr("Use photo of an accurate clock,
e.g. GPS receiver display"));
buttonViewGpsPhoto.setIcon(ImageProvider.get("clock"));
buttonViewGpsPhoto.addActionListener(new SetOffsetActionListener());
- JButton buttonAutoGuess = new JButton(tr("Auto-Guess"));
+ final var buttonAutoGuess = new JButton(tr("Auto-Guess"));
buttonAutoGuess.setToolTipText(tr("Matches first photo with first gpx point"));
buttonAutoGuess.addActionListener(new AutoGuessActionListener());
- JButton buttonAdjust = new JButton(tr("Manual adjust"));
+ final var buttonAdjust = new JButton(tr("Manual adjust"));
buttonAdjust.addActionListener(new AdjustActionListener());
- JButton buttonAdvanced = new JButton(tr("Advanced settings..."));
+ final var buttonAdvanced = new JButton(tr("Advanced settings..."));
buttonAdvanced.addActionListener(new AdvancedSettingsActionListener());
- JLabel labelPosition = new JLabel(tr("Override position for: "));
+ final var labelPosition = new JLabel(tr("Override position for: "));
int numAll = yLayer.getSortedImgList(true, true).size();
@@ -537,11 +535,11 @@
cbShowThumbs.setEnabled(!yLayer.thumbsLoaded);
- int y = 0;
- GBC gbc = GBC.eol();
+ var y = 0;
+ var gbc = GBC.eol();
gbc.gridx = 0;
gbc.gridy = y++;
panelTf.add(panelCb, gbc);
- gbc = GBC.eol().fill(GBC.HORIZONTAL).insets(0, 0, 0, 12);
+ gbc = GBC.eol().fill(GridBagConstraints.HORIZONTAL).insets(0, 0, 0, 12);
gbc.gridx = 0;
gbc.gridy = y++;
@@ -553,5 +551,5 @@
panelTf.add(new JLabel(tr("Timezone: ")), gbc);
- gbc = GBC.std().fill(GBC.HORIZONTAL);
+ gbc = GBC.std().fill(GridBagConstraints.HORIZONTAL);
gbc.gridx = 1;
gbc.gridy = y++;
@@ -564,5 +562,5 @@
panelTf.add(new JLabel(tr("Offset:")), gbc);
- gbc = GBC.std().fill(GBC.HORIZONTAL);
+ gbc = GBC.std().fill(GridBagConstraints.HORIZONTAL);
gbc.gridx = 1;
gbc.gridy = y++;
@@ -579,5 +577,5 @@
panelTf.add(buttonViewGpsPhoto, gbc);
- gbc = GBC.std().fill(GBC.BOTH).insets(5, 5, 5, 5);
+ gbc = GBC.std().fill(GridBagConstraints.BOTH).insets(5, 5, 5, 5);
gbc.gridx = 1;
gbc.gridy = y++;
@@ -591,5 +589,5 @@
panelTf.add(buttonAdjust, gbc);
- gbc = GBC.eol().fill(GBC.HORIZONTAL).insets(0, 12, 0, 0);
+ gbc = GBC.eol().fill(GridBagConstraints.HORIZONTAL).insets(0, 12, 0, 0);
gbc.gridx = 0;
gbc.gridy = y++;
@@ -616,5 +614,5 @@
panelTf.add(cbShowThumbs, gbc);
- gbc = GBC.eol().fill(GBC.HORIZONTAL).insets(0, 12, 0, 0);
+ gbc = GBC.eol().fill(GridBagConstraints.HORIZONTAL).insets(0, 12, 0, 0);
sepDirectionPosition = new JSeparator(SwingConstants.HORIZONTAL);
panelTf.add(sepDirectionPosition, gbc);
@@ -627,5 +625,5 @@
expertChanged(ExpertToggleAction.isExpert());
- final JPanel statusBar = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
+ final var statusBar = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
statusBar.setBorder(BorderFactory.createLoweredBevelBorder());
statusBarText = new JLabel(" ");
@@ -633,5 +631,5 @@
statusBar.add(statusBarText);
- RepaintTheMapListener repaintTheMap = new RepaintTheMapListener(yLayer);
+ final var repaintTheMap = new RepaintTheMapListener(yLayer);
pDirectionPosition.addFocusListenerOnComponent(repaintTheMap);
tfTimezone.addFocusListener(repaintTheMap);
@@ -808,10 +806,10 @@
* Presents dialog with sliders for manual adjust.
*/
- private class AdjustActionListener implements ActionListener {
+ private final class AdjustActionListener implements ActionListener {
@Override
public void actionPerformed(ActionEvent e) {
- final GpxTimeOffset offset = GpxTimeOffset.milliseconds(
+ final var offset = GpxTimeOffset.milliseconds(
delta.getMilliseconds() + Math.round(timezone.getHours() * TimeUnit.HOURS.toMillis(1)));
final int dayOffset = offset.getDayOffset();
@@ -895,5 +893,5 @@
}
- private class AutoGuessActionListener implements ActionListener {
+ private final class AutoGuessActionListener implements ActionListener {
@Override
@@ -943,5 +941,5 @@
}
- private GpxDataWrapper selectedGPX(boolean complain) {
+ private static GpxDataWrapper selectedGPX(boolean complain) {
Object item = gpxModel.getSelectedItem();
@@ -961,5 +959,5 @@
if (cbGpx != null) {
// Force the JCombobox to remove its eventListener from the static GpxDataWrapper
- cbGpx.setModel(new DefaultComboBoxModel());
+ cbGpx.setModel(new DefaultComboBoxModel<>());
cbGpx = null;
}
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/RemoteEntry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/RemoteEntry.java (revision 19047)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/RemoteEntry.java (revision 19048)
@@ -296,9 +296,9 @@
@Override
public InputStream getInputStream() throws IOException {
- URI u = getImageURI();
+ final var u = getImageURI();
if (u.getScheme().contains("file")) {
return Files.newInputStream(Paths.get(u));
}
- HttpClient client = HttpClient.create(u.toURL());
+ final var client = HttpClient.create(u.toURL());
InputStream actual = client.connect().getContent();
return new BufferedInputStream(actual) {
@@ -343,5 +343,5 @@
@Override
public boolean equals(Object obj) {
- if (super.equals(obj)) {
+ if (this == obj) {
return true;
}
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java (revision 19047)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java (revision 19048)
@@ -167,17 +167,15 @@
/* Is joining an array really that complicated in Java? */
private static String[] getDefaultNameTags() {
- ArrayList tags = new ArrayList(Arrays.asList(LanguageInfo.getOSMLocaleCodes("name:")));
- tags.addAll(Arrays.asList(new String[]{
- "name",
- "int_name",
- "distance",
- "railway:position",
- "ref",
- "operator",
- "brand",
- "addr:unit",
- "addr:flats",
- "addr:housenumber"
- }));
+ final var tags = new ArrayList(Arrays.asList(LanguageInfo.getOSMLocaleCodes("name:")));
+ tags.addAll(Arrays.asList("name",
+ "int_name",
+ "distance",
+ "railway:position",
+ "ref",
+ "operator",
+ "brand",
+ "addr:unit",
+ "addr:flats",
+ "addr:housenumber"));
return tags.toArray(String[]::new);
}
@@ -251,5 +249,5 @@
private String getPrimitiveName(IPrimitive n) {
- StringBuilder name = new StringBuilder();
+ final var name = new StringBuilder();
if (!n.hasKeys()) return null;
nameTags.stream().map(n::get).filter(Objects::nonNull).findFirst()
Index: trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java (revision 19047)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java (revision 19048)
@@ -5,5 +5,4 @@
import java.awt.ComponentOrientation;
import java.awt.Font;
-import java.awt.FontMetrics;
import java.awt.Graphics;
import java.awt.Graphics2D;
@@ -19,8 +18,8 @@
import javax.swing.Icon;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
import javax.swing.JTextField;
import javax.swing.RepaintManager;
-import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
import javax.swing.UIManager;
import javax.swing.text.BadLocationException;
@@ -30,4 +29,5 @@
import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.tools.Destroyable;
+import org.openstreetmap.josm.tools.Logging;
import org.openstreetmap.josm.tools.Utils;
@@ -254,5 +254,5 @@
*/
public static Color getHintTextColor() {
- Color color = UIManager.getColor("TextField[Disabled].textForeground"); // Nimbus?
+ var color = UIManager.getColor("TextField[Disabled].textForeground"); // Nimbus?
if (color == null)
color = UIManager.getColor("TextField.inactiveForeground");
@@ -290,6 +290,7 @@
int x;
try {
- x = modelToView(0).x;
+ x = (int) Math.round(modelToView2D(0).getX());
} catch (BadLocationException exc) {
+ Logging.trace(exc);
return; // can't happen
}
@@ -304,5 +305,5 @@
g.drawString(getHint(), x, getBaseline(getWidth(), getHeight()));
} else {
- FontMetrics metrics = g.getFontMetrics(g.getFont());
+ final var metrics = g.getFontMetrics(g.getFont());
int dx = metrics.stringWidth(getHint());
g.drawString(getHint(), x - dx, getBaseline(getWidth(), getHeight()));
Index: trunk/src/org/openstreetmap/josm/io/NoteReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/NoteReader.java (revision 19047)
+++ trunk/src/org/openstreetmap/josm/io/NoteReader.java (revision 19048)
@@ -52,5 +52,5 @@
* Reads both API style and planet dump style formats.
*/
- private class Parser extends DefaultHandler {
+ private final class Parser extends DefaultHandler {
private NoteParseMode parseMode;
@@ -73,5 +73,5 @@
public void startElement(String uri, String localName, String qName, Attributes attrs) throws SAXException {
buffer.setLength(0);
- switch(qName) {
+ switch (qName) {
case "osm":
parseMode = NoteParseMode.API;
@@ -92,5 +92,5 @@
//The rest only applies for dump mode
- switch(qName) {
+ switch (qName) {
case "note":
thisNote = parseNoteFull(attrs);
@@ -113,7 +113,9 @@
}
if ("comment".equals(qName)) {
- User commentUser = User.createOsmUser(commentUid, commentUsername);
+ final User commentUser;
if (commentUid == 0) {
commentUser = User.getAnonymous();
+ } else {
+ commentUser = User.createOsmUser(commentUid, commentUsername);
}
if (parseMode == NoteParseMode.API) {
@@ -177,6 +179,6 @@
static LatLon parseLatLon(UnaryOperator attrs) {
- double lat = Double.parseDouble(attrs.apply("lat"));
- double lon = Double.parseDouble(attrs.apply("lon"));
+ final var lat = Double.parseDouble(attrs.apply("lat"));
+ final var lon = Double.parseDouble(attrs.apply("lon"));
return new LatLon(lat, lon);
}
@@ -195,5 +197,5 @@
static Note parseNoteFull(UnaryOperator attrs) {
- Note note = parseNoteBasic(attrs);
+ final var note = parseNoteBasic(attrs);
String id = attrs.apply("id");
if (id != null) {
Index: trunk/src/org/openstreetmap/josm/io/OsmPbfReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmPbfReader.java (revision 19047)
+++ trunk/src/org/openstreetmap/josm/io/OsmPbfReader.java (revision 19048)
@@ -16,5 +16,5 @@
import java.util.Set;
-import org.apache.commons.compress.utils.CountingInputStream;
+import org.apache.commons.io.input.BoundedInputStream;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.DataSource;
@@ -88,12 +88,12 @@
private void parse(InputStream source) throws IllegalDataException, IOException {
- final CountingInputStream inputStream;
+ final BoundedInputStream inputStream;
if (source.markSupported()) {
- inputStream = new CountingInputStream(source);
+ inputStream = new BoundedInputStream(source);
} else {
- inputStream = new CountingInputStream(new BufferedInputStream(source));
- }
- try (ProtobufParser parser = new ProtobufParser(inputStream)) {
- final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ inputStream = new BoundedInputStream(new BufferedInputStream(source));
+ }
+ try (var parser = new ProtobufParser(inputStream)) {
+ final var baos = new ByteArrayOutputStream();
HeaderBlock headerBlock = null;
BlobHeader blobHeader = null;
@@ -106,5 +106,5 @@
}
// OSM PBF is fun -- it has *nested* pbf data
- Blob blob = parseBlob(blobHeader, inputStream, parser, baos);
+ final var blob = parseBlob(blobHeader, inputStream, parser, baos);
headerBlock = parseHeaderBlock(blob, baos);
checkRequiredFeatures(headerBlock);
@@ -114,5 +114,5 @@
throw new IllegalStateException("A header block must occur before the first data block");
}
- Blob blob = parseBlob(blobHeader, inputStream, parser, baos);
+ final var blob = parseBlob(blobHeader, inputStream, parser, baos);
parseDataBlock(baos, headerBlock, blob);
blobHeader = null;
@@ -133,13 +133,13 @@
*/
@Nonnull
- private static BlobHeader parseBlobHeader(CountingInputStream cis, ByteArrayOutputStream baos, ProtobufParser parser)
+ private static BlobHeader parseBlobHeader(BoundedInputStream cis, ByteArrayOutputStream baos, ProtobufParser parser)
throws IOException, IllegalDataException {
String type = null;
byte[] indexData = null;
int datasize = Integer.MIN_VALUE;
- int length = 0;
- long start = cis.getBytesRead();
- while (parser.hasNext() && (length == 0 || cis.getBytesRead() - start < length)) {
- final ProtobufRecord current = new ProtobufRecord(baos, parser);
+ var length = 0;
+ long start = cis.getCount();
+ while (parser.hasNext() && (length == 0 || cis.getCount() - start < length)) {
+ final var current = new ProtobufRecord(baos, parser);
switch (current.getField()) {
case 1:
@@ -153,5 +153,5 @@
break;
default:
- start = cis.getBytesRead();
+ start = cis.getCount();
length += current.asUnsignedVarInt().intValue();
if (length > MAX_BLOBHEADER_SIZE) { // There is a hard limit of 64 KiB for the BlobHeader. It *should* be less than 32 KiB.
@@ -181,7 +181,7 @@
*/
@Nonnull
- private static Blob parseBlob(BlobHeader header, CountingInputStream cis, ProtobufParser parser, ByteArrayOutputStream baos)
+ private static Blob parseBlob(BlobHeader header, BoundedInputStream cis, ProtobufParser parser, ByteArrayOutputStream baos)
throws IOException {
- long start = cis.getBytesRead();
+ long start = cis.getCount();
int size = Integer.MIN_VALUE;
Blob.CompressionType type = null;
@@ -189,5 +189,5 @@
// Needed since size and compression type + compression data may be in a different order
byte[] bytes = null;
- while (parser.hasNext() && cis.getBytesRead() - start < header.dataSize()) {
+ while (parser.hasNext() && cis.getCount() - start < header.dataSize()) {
current = new ProtobufRecord(baos, parser);
switch (current.getField()) {
@@ -239,9 +239,9 @@
@Nonnull
private static HeaderBlock parseHeaderBlock(Blob blob, ByteArrayOutputStream baos) throws IOException {
- try (InputStream blobInput = blob.inputStream();
- ProtobufParser parser = new ProtobufParser(blobInput)) {
+ try (var blobInput = blob.inputStream();
+ var parser = new ProtobufParser(blobInput)) {
BBox bbox = null;
- List required = new ArrayList<>();
- List optional = new ArrayList<>();
+ final var required = new ArrayList();
+ final var optional = new ArrayList();
String program = null;
String source = null;
@@ -250,5 +250,5 @@
String osmosisReplicationBaseUrl = null;
while (parser.hasNext()) {
- final ProtobufRecord current = new ProtobufRecord(baos, parser);
+ final var current = new ProtobufRecord(baos, parser);
switch (current.getField()) {
case 1: // bbox
@@ -311,13 +311,13 @@
String[] stringTable = null; // field 1, note that stringTable[0] is a delimiter, so it is always blank and unused
// field 2 -- we cannot parse these live just in case the following fields come later
- List primitiveGroups = new ArrayList<>();
- int granularity = 100; // field 17
+ final var primitiveGroups = new ArrayList();
+ var granularity = 100; // field 17
long latOffset = 0; // field 19
long lonOffset = 0; // field 20
- int dateGranularity = 1000; // field 18, default is milliseconds since the 1970 epoch
- try (InputStream inputStream = blob.inputStream();
- ProtobufParser parser = new ProtobufParser(inputStream)) {
+ var dateGranularity = 1000; // field 18, default is milliseconds since the 1970 epoch
+ try (var inputStream = blob.inputStream();
+ var parser = new ProtobufParser(inputStream)) {
while (parser.hasNext()) {
- ProtobufRecord protobufRecord = new ProtobufRecord(baos, parser);
+ final var protobufRecord = new ProtobufRecord(baos, parser);
switch (protobufRecord.getField()) {
case 1:
@@ -343,7 +343,7 @@
}
}
- final PrimitiveBlockRecord primitiveBlockRecord = new PrimitiveBlockRecord(stringTable, granularity, latOffset, lonOffset,
+ final var primitiveBlockRecord = new PrimitiveBlockRecord(stringTable, granularity, latOffset, lonOffset,
dateGranularity);
- final DataSet ds = getDataSet();
+ final var ds = getDataSet();
if (!primitiveGroups.isEmpty() && headerBlock.bbox() != null) {
try {
@@ -375,6 +375,6 @@
@Nullable
private static BBox parseBBox(ByteArrayOutputStream baos, ProtobufRecord current) throws IOException {
- try (ByteArrayInputStream bboxInputStream = new ByteArrayInputStream(current.getBytes());
- ProtobufParser bboxParser = new ProtobufParser(bboxInputStream)) {
+ try (var bboxInputStream = new ByteArrayInputStream(current.getBytes());
+ var bboxParser = new ProtobufParser(bboxInputStream)) {
double left = Double.NaN;
double right = Double.NaN;
@@ -382,5 +382,5 @@
double bottom = Double.NaN;
while (bboxParser.hasNext()) {
- ProtobufRecord protobufRecord = new ProtobufRecord(baos, bboxParser);
+ final var protobufRecord = new ProtobufRecord(baos, bboxParser);
if (protobufRecord.getType() == WireType.VARINT) {
double value = protobufRecord.asSignedVarInt().longValue() * NANO_DEGREES;
@@ -419,9 +419,9 @@
@Nonnull
private static String[] parseStringTable(ByteArrayOutputStream baos, byte[] bytes) throws IOException {
- try (ByteArrayInputStream is = new ByteArrayInputStream(bytes);
- ProtobufParser parser = new ProtobufParser(is)) {
- List list = new ArrayList<>();
+ try (var is = new ByteArrayInputStream(bytes);
+ var parser = new ProtobufParser(is)) {
+ final var list = new ArrayList();
while (parser.hasNext()) {
- ProtobufRecord protobufRecord = new ProtobufRecord(baos, parser);
+ final var protobufRecord = new ProtobufRecord(baos, parser);
if (protobufRecord.getField() == 1) {
list.add(protobufRecord.asString().intern()); // field is technically repeated bytes
@@ -444,8 +444,8 @@
private void parsePrimitiveGroup(ByteArrayOutputStream baos, byte[] bytes, PrimitiveBlockRecord primitiveBlockRecord)
throws IllegalDataException, IOException {
- try (ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
- ProtobufParser parser = new ProtobufParser(bais)) {
+ try (var bais = new ByteArrayInputStream(bytes);
+ var parser = new ProtobufParser(bais)) {
while (parser.hasNext()) {
- ProtobufRecord protobufRecord = new ProtobufRecord(baos, parser);
+ final var protobufRecord = new ProtobufRecord(baos, parser);
switch (protobufRecord.getField()) {
case 1: // Nodes, repeated
@@ -480,14 +480,14 @@
private void parseNode(ByteArrayOutputStream baos, byte[] bytes, PrimitiveBlockRecord primitiveBlockRecord)
throws IllegalDataException, IOException {
- try (ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
- ProtobufParser parser = new ProtobufParser(bais)) {
+ try (var bais = new ByteArrayInputStream(bytes);
+ var parser = new ProtobufParser(bais)) {
long id = Long.MIN_VALUE;
- List keys = new ArrayList<>();
- List values = new ArrayList<>();
+ final var keys = new ArrayList();
+ final var values = new ArrayList();
Info info = null;
long lat = Long.MIN_VALUE;
long lon = Long.MIN_VALUE;
while (parser.hasNext()) {
- ProtobufRecord protobufRecord = new ProtobufRecord(baos, parser);
+ final var protobufRecord = new ProtobufRecord(baos, parser);
switch (protobufRecord.getField()) {
case 1:
@@ -519,5 +519,5 @@
throw new IllegalDataException("OSM PBF did not provide all the required node information");
}
- NodeData node = new NodeData(id);
+ final var node = new NodeData(id);
node.setCoor(calculateLatLon(primitiveBlockRecord, lat, lon));
addTags(node, keys, values);
@@ -547,8 +547,8 @@
long[] keyVals = EMPTY_LONG; // technically can be int
Info[] denseInfo = null;
- try (ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
- ProtobufParser parser = new ProtobufParser(bais)) {
+ try (var bais = new ByteArrayInputStream(bytes);
+ var parser = new ProtobufParser(bais)) {
while (parser.hasNext()) {
- ProtobufRecord protobufRecord = new ProtobufRecord(baos, parser);
+ final var protobufRecord = new ProtobufRecord(baos, parser);
switch (protobufRecord.getField()) {
case 1: // packed node ids, DELTA encoded
@@ -576,15 +576,15 @@
}
- int keyValIndex = 0; // This index must not reset between nodes, and must always increment
+ var keyValIndex = 0; // This index must not reset between nodes, and must always increment
if (ids.length == lats.length && lats.length == lons.length && (denseInfo == null || denseInfo.length == lons.length)) {
long id = 0;
long lat = 0;
long lon = 0;
- for (int i = 0; i < ids.length; i++) {
+ for (var i = 0; i < ids.length; i++) {
final NodeData node;
id += ids[i];
node = new NodeData(id);
if (denseInfo != null) {
- Info info = denseInfo[i];
+ final var info = denseInfo[i];
setOsmPrimitiveData(primitiveBlockRecord, node, info);
} else {
@@ -638,8 +638,8 @@
// We don't do live drawing, so we don't care about lats and lons (we essentially throw them away with the current parser)
// This is for the optional feature "LocationsOnWays"
- try (ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
- ProtobufParser parser = new ProtobufParser(bais)) {
+ try (var bais = new ByteArrayInputStream(bytes);
+ var parser = new ProtobufParser(bais)) {
while (parser.hasNext()) {
- ProtobufRecord protobufRecord = new ProtobufRecord(baos, parser);
+ final var protobufRecord = new ProtobufRecord(baos, parser);
switch (protobufRecord.getField()) {
case 1:
@@ -672,6 +672,6 @@
throw new IllegalDataException("A way with either no id or no nodes was found");
}
- WayData wayData = new WayData(id);
- List nodeIds = new ArrayList<>(refs.length);
+ final var wayData = new WayData(id);
+ final var nodeIds = new ArrayList(refs.length);
long ref = 0;
for (long tRef : refs) {
@@ -701,14 +701,14 @@
throws IllegalDataException, IOException {
long id = Long.MIN_VALUE;
- List keys = new ArrayList<>();
- List values = new ArrayList<>();
+ final var keys = new ArrayList();
+ final var values = new ArrayList();
Info info = null;
long[] rolesStringId = EMPTY_LONG; // Technically int
long[] memids = EMPTY_LONG;
long[] types = EMPTY_LONG; // Technically an enum
- try (ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
- ProtobufParser parser = new ProtobufParser(bais)) {
+ try (var bais = new ByteArrayInputStream(bytes);
+ var parser = new ProtobufParser(bais)) {
while (parser.hasNext()) {
- ProtobufRecord protobufRecord = new ProtobufRecord(baos, parser);
+ final var protobufRecord = new ProtobufRecord(baos, parser);
switch (protobufRecord.getField()) {
case 1:
@@ -747,5 +747,5 @@
throw new IllegalDataException("OSM PBF contains a bad relation definition");
}
- RelationData data = new RelationData(id);
+ final var data = new RelationData(id);
if (info != null) {
setOsmPrimitiveData(primitiveBlockRecord, data, info);
@@ -757,5 +757,5 @@
List members = new ArrayList<>(rolesStringId.length);
long memberId = 0;
- for (int i = 0; i < rolesStringId.length; i++) {
+ for (var i = 0; i < rolesStringId.length; i++) {
String role = primitiveBlockRecord.stringTable[(int) rolesStringId[i]];
memberId += memids[i];
@@ -777,6 +777,6 @@
@Nonnull
private static Info parseInfo(ByteArrayOutputStream baos, byte[] bytes) throws IOException {
- try (ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
- ProtobufParser parser = new ProtobufParser(bais)) {
+ try (var bais = new ByteArrayInputStream(bytes);
+ var parser = new ProtobufParser(bais)) {
int version = -1;
Long timestamp = null;
@@ -784,7 +784,7 @@
Integer uid = null;
Integer userSid = null;
- boolean visible = true;
+ var visible = true;
while (parser.hasNext()) {
- ProtobufRecord protobufRecord = new ProtobufRecord(baos, parser);
+ final var protobufRecord = new ProtobufRecord(baos, parser);
switch (protobufRecord.getField()) {
case 1:
@@ -839,5 +839,5 @@
}
Map tagMap = new HashMap<>(keys.size());
- for (int i = 0; i < keys.size(); i++) {
+ for (var i = 0; i < keys.size(); i++) {
tagMap.put(keys.get(i), values.get(i));
}
@@ -879,5 +879,5 @@
@Nonnull
private static long[] decodePackedSInt64(long[] numbers) {
- for (int i = 0; i < numbers.length; i++) {
+ for (var i = 0; i < numbers.length; i++) {
numbers[i] = ProtobufParser.decodeZigZag(numbers[i]);
}
@@ -922,8 +922,8 @@
long[] userSid = EMPTY_LONG; // technically int
long[] visible = EMPTY_LONG; // optional, true if not set, technically booleans
- try (ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
- ProtobufParser parser = new ProtobufParser(bais)) {
+ try (var bais = new ByteArrayInputStream(bytes);
+ var parser = new ProtobufParser(bais)) {
while (parser.hasNext()) {
- ProtobufRecord protobufRecord = new ProtobufRecord(baos, parser);
+ final var protobufRecord = new ProtobufRecord(baos, parser);
switch (protobufRecord.getField()) {
case 1:
@@ -956,10 +956,10 @@
}
if (version.length > 0) {
- Info[] infos = new Info[version.length];
+ final var infos = new Info[version.length];
long lastTimestamp = 0; // delta encoded
long lastChangeset = 0; // delta encoded
long lastUid = 0; // delta encoded,
long lastUserSid = 0; // delta encoded, string id for username
- for (int i = 0; i < version.length; i++) {
+ for (var i = 0; i < version.length; i++) {
if (timestamp.length > i)
lastTimestamp += timestamp[i];
Index: trunk/src/org/openstreetmap/josm/tools/ImageResizeMode.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ImageResizeMode.java (revision 19047)
+++ trunk/src/org/openstreetmap/josm/tools/ImageResizeMode.java (revision 19048)
@@ -87,6 +87,6 @@
*/
BufferedImage createBufferedImage(Dimension dim, Dimension icon, Consumer renderer, Image sourceIcon) {
- final Dimension real = computeDimension(dim, icon);
- final BufferedImage bufferedImage = new BufferedImage(real.width, real.height, BufferedImage.TYPE_INT_ARGB);
+ final var real = computeDimension(dim, icon);
+ final var bufferedImage = new BufferedImage(real.width, real.height, BufferedImage.TYPE_INT_ARGB);
final Graphics2D g = bufferedImage.createGraphics();
g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
@@ -119,4 +119,5 @@
* @return a cache key
*/
+ @SuppressWarnings("EnumOrdinal")
int cacheKey(Dimension dim) {
return (ordinal() << 28) | ((dim.width & 0xfff) << 16) | (dim.height & 0xfff);
Index: trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 19047)
+++ trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 19048)
@@ -30,5 +30,4 @@
import java.nio.file.StandardCopyOption;
import java.nio.file.attribute.BasicFileAttributes;
-import java.nio.file.attribute.FileTime;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -153,6 +152,6 @@
*/
public static int indexOf(Iterable collection, Predicate predicate) {
- int i = 0;
- for (T item : collection) {
+ var i = 0;
+ for (var item : collection) {
if (predicate.test(item))
return i;
@@ -186,5 +185,5 @@
if (n <= 0)
throw new IllegalArgumentException("n must be <= 0 but is " + n);
- int res = a % n;
+ var res = a % n;
if (res < 0) {
res += n;
@@ -304,8 +303,8 @@
Logging.warn("Unable to create directory "+out.getPath());
}
- File[] files = in.listFiles();
+ var files = in.listFiles();
if (files != null) {
- for (File f : files) {
- File target = new File(out, f.getName());
+ for (var f : files) {
+ var target = new File(out, f.getName());
if (f.isDirectory()) {
copyDirectory(f, target);
@@ -325,7 +324,7 @@
public static boolean deleteDirectory(File path) {
if (path.exists()) {
- File[] files = path.listFiles();
+ var files = path.listFiles();
if (files != null) {
- for (File file : files) {
+ for (var file : files) {
if (file.isDirectory()) {
deleteDirectory(file);
@@ -372,5 +371,5 @@
*/
public static boolean deleteFile(File file, String warnMsg) {
- boolean result = file.delete();
+ var result = file.delete();
if (!result) {
Logging.warn(tr(warnMsg, file.getPath()));
@@ -398,5 +397,5 @@
*/
public static boolean mkDirs(File dir, String warnMsg) {
- boolean result = dir.mkdirs();
+ var result = dir.mkdirs();
if (!result) {
Logging.warn(tr(warnMsg, dir.getPath()));
@@ -498,6 +497,6 @@
throw new JosmRuntimeException(e);
}
- byte[] byteData = data.getBytes(StandardCharsets.UTF_8);
- byte[] byteDigest = md.digest(byteData);
+ var byteData = data.getBytes(StandardCharsets.UTF_8);
+ var byteDigest = md.digest(byteData);
return toHexString(byteDigest);
}
@@ -518,11 +517,11 @@
}
- final int len = bytes.length;
+ final var len = bytes.length;
if (len == 0) {
return "";
}
- char[] hexChars = new char[len * 2];
- int j = 0;
+ var hexChars = new char[len * 2];
+ var j = 0;
for (final int v : bytes) {
hexChars[j++] = HEX_ARRAY[(v & 0xf0) >> 4];
@@ -542,8 +541,8 @@
*/
public static List topologicalSort(final MultiMap dependencies) {
- MultiMap deps = new MultiMap<>();
- for (T key : dependencies.keySet()) {
+ var deps = new MultiMap();
+ for (var key : dependencies.keySet()) {
deps.putVoid(key);
- for (T val : dependencies.get(key)) {
+ for (var val : dependencies.get(key)) {
deps.putVoid(val);
deps.put(key, val);
@@ -551,8 +550,8 @@
}
- int size = deps.size();
+ var size = deps.size();
List sorted = new ArrayList<>();
- for (int i = 0; i < size; ++i) {
- T parentless = deps.keySet().stream()
+ for (var i = 0; i < size; ++i) {
+ var parentless = deps.keySet().stream()
.filter(key -> deps.get(key).isEmpty())
.findFirst().orElse(null);
@@ -560,5 +559,5 @@
sorted.add(parentless);
deps.remove(parentless);
- for (T key : deps.keySet()) {
+ for (var key : deps.keySet()) {
deps.remove(key, parentless);
}
@@ -680,5 +679,5 @@
return Collections.emptyMap();
} else if (map.size() == 1) {
- final Map.Entry entry = map.entrySet().iterator().next();
+ final var entry = map.entrySet().iterator().next();
return Collections.singletonMap(entry.getKey(), entry.getValue());
} else if (mapOfEntries != null) {
@@ -796,7 +795,7 @@
}
- int start = 0;
- int end = str.length();
- boolean leadingSkipChar = true;
+ var start = 0;
+ var end = str.length();
+ var leadingSkipChar = true;
while (leadingSkipChar && start < end) {
leadingSkipChar = isStrippedChar(str.charAt(start), skipChars);
@@ -805,5 +804,5 @@
}
}
- boolean trailingSkipChar = true;
+ var trailingSkipChar = true;
while (trailingSkipChar && end > start) {
trailingSkipChar = isStrippedChar(str.charAt(end - 1), skipChars);
@@ -867,7 +866,7 @@
Logging.debug(String.join(" ", command));
}
- Path out = Files.createTempFile("josm_exec_" + command.get(0) + "_", ".txt");
+ var out = Files.createTempFile("josm_exec_" + command.get(0) + "_", ".txt");
try {
- Process p = new ProcessBuilder(command).redirectErrorStream(true).redirectOutput(out.toFile()).start();
+ var p = new ProcessBuilder(command).redirectErrorStream(true).redirectOutput(out.toFile()).start();
if (!p.waitFor(timeout, unit) || p.exitValue() != 0) {
throw new ExecutionException(command.toString(), null);
@@ -889,9 +888,9 @@
*/
public static File getJosmTempDir() {
- String tmpDir = getSystemProperty("java.io.tmpdir");
+ var tmpDir = getSystemProperty("java.io.tmpdir");
if (tmpDir == null) {
return null;
}
- File josmTmpDir = new File(tmpDir, "JOSM");
+ final var josmTmpDir = new File(tmpDir, "JOSM");
if (!josmTmpDir.exists() && !josmTmpDir.mkdirs()) {
Logging.warn("Unable to create temp directory " + josmTmpDir);
@@ -921,13 +920,13 @@
// Is it less than 1 hour ?
if (elapsedTime < MILLIS_OF_HOUR) {
- final long min = elapsedTime / MILLIS_OF_MINUTE;
+ final var min = elapsedTime / MILLIS_OF_MINUTE;
return String.format("%d %s %d %s", min, tr("min"), (elapsedTime - min * MILLIS_OF_MINUTE) / MILLIS_OF_SECOND, tr("s"));
}
// Is it less than 1 day ?
if (elapsedTime < MILLIS_OF_DAY) {
- final long hour = elapsedTime / MILLIS_OF_HOUR;
+ final var hour = elapsedTime / MILLIS_OF_HOUR;
return String.format("%d %s %d %s", hour, tr("h"), (elapsedTime - hour * MILLIS_OF_HOUR) / MILLIS_OF_MINUTE, tr("min"));
}
- long days = elapsedTime / MILLIS_OF_DAY;
+ var days = elapsedTime / MILLIS_OF_DAY;
return String.format("%d %s %d %s", days, trn("day", "days", days), (elapsedTime - days * MILLIS_OF_DAY) / MILLIS_OF_HOUR, tr("h"));
}
@@ -944,5 +943,5 @@
throw new IllegalArgumentException("bytes must be >= 0");
}
- int unitIndex = 0;
+ var unitIndex = 0;
double value = bytes;
while (value >= 1024 && unitIndex < SIZE_UNITS.length) {
@@ -968,9 +967,9 @@
public static String getPositionListString(List positionList) {
Collections.sort(positionList);
- final StringBuilder sb = new StringBuilder(32);
+ final var sb = new StringBuilder(32);
sb.append(positionList.get(0));
- int cnt = 0;
+ var cnt = 0;
int last = positionList.get(0);
- for (int i = 1; i < positionList.size(); ++i) {
+ for (var i = 1; i < positionList.size(); ++i) {
int cur = positionList.get(i);
if (cur == last + 1) {
@@ -1031,7 +1030,7 @@
*/
public static Throwable getRootCause(Throwable t) {
- Throwable result = t;
+ var result = t;
if (result != null) {
- Throwable cause = result.getCause();
+ var cause = result.getCause();
while (cause != null && !cause.equals(result)) {
result = cause;
@@ -1051,5 +1050,5 @@
*/
public static T[] addInArrayCopy(T[] array, T item) {
- T[] biggerCopy = Arrays.copyOf(array, array.length + 1);
+ var biggerCopy = Arrays.copyOf(array, array.length + 1);
biggerCopy[array.length] = item;
return biggerCopy;
@@ -1064,5 +1063,5 @@
*/
public static String shortenString(String s, int maxLength) {
- final String ellipses = "...";
+ final var ellipses = "...";
CheckParameterUtil.ensureThat(maxLength >= ellipses.length(), "maxLength is shorter than " + ellipses.length());
if (s != null && s.length() > maxLength) {
@@ -1102,5 +1101,5 @@
if (elements.size() > maxElements) {
final Collection r = new ArrayList<>(maxElements);
- final Iterator it = elements.iterator();
+ final var it = elements.iterator();
while (r.size() < maxElements - 1) {
r.add(it.next());
@@ -1127,10 +1126,10 @@
return url;
- String query = url.substring(url.indexOf('?') + 1);
-
- StringBuilder sb = new StringBuilder(url.substring(0, url.indexOf('?') + 1));
-
- for (int i = 0; i < query.length(); i++) {
- String c = query.substring(i, i + 1);
+ final var query = url.substring(url.indexOf('?') + 1);
+
+ final var sb = new StringBuilder(url.substring(0, url.indexOf('?') + 1));
+
+ for (var i = 0; i < query.length(); i++) {
+ final var c = query.substring(i, i + 1);
if (URL_CHARS.contains(c)) {
sb.append(c);
@@ -1153,5 +1152,5 @@
*/
public static String encodeUrl(String s) {
- final String enc = StandardCharsets.UTF_8.name();
+ final var enc = StandardCharsets.UTF_8.name();
try {
return URLEncoder.encode(s, enc);
@@ -1173,5 +1172,5 @@
*/
public static String decodeUrl(String s) {
- final String enc = StandardCharsets.UTF_8.name();
+ final var enc = StandardCharsets.UTF_8.name();
try {
return URLDecoder.decode(s, enc);
@@ -1221,5 +1220,5 @@
@Override
public Thread newThread(final Runnable runnable) {
- final Thread thread = new Thread(runnable, String.format(Locale.ENGLISH, nameFormat, count.getAndIncrement()));
+ final var thread = new Thread(runnable, String.format(Locale.ENGLISH, nameFormat, count.getAndIncrement()));
thread.setPriority(threadPriority);
return thread;
@@ -1299,5 +1298,5 @@
public static boolean isSimilar(String string1, String string2) {
// check plain strings
- int distance = getLevenshteinDistance(string1, string2);
+ var distance = getLevenshteinDistance(string1, string2);
// check if only the case differs, so we don't consider large distance as different strings
@@ -1340,5 +1339,5 @@
}
- for (double length : values) {
+ for (var length : values) {
standardDeviation += Math.pow(length - mean, 2);
}
@@ -1361,7 +1360,7 @@
}
List groups = new ArrayList<>();
- int[] current = {Integer.MIN_VALUE, Integer.MIN_VALUE};
+ var current = new int[]{Integer.MIN_VALUE, Integer.MIN_VALUE};
groups.add(current);
- for (int row : integers) {
+ for (var row : integers) {
if (current[0] == Integer.MIN_VALUE) {
current[0] = row;
@@ -1398,5 +1397,5 @@
@SuppressWarnings("ThreadPriorityCheck")
public static ForkJoinPool newForkJoinPool(String pref, final String nameFormat, final int threadPriority) {
- int noThreads = Config.getPref().getInt(pref, Runtime.getRuntime().availableProcessors());
+ final var noThreads = Config.getPref().getInt(pref, Runtime.getRuntime().availableProcessors());
return new ForkJoinPool(noThreads, new ForkJoinPool.ForkJoinWorkerThreadFactory() {
final AtomicLong count = new AtomicLong(0);
@@ -1468,5 +1467,5 @@
if (value != null) {
try {
- String old = System.setProperty(key, value);
+ var old = System.setProperty(key, value);
if (Logging.isDebugEnabled() && !value.equals(old)) {
if (!key.toLowerCase(Locale.ENGLISH).contains("password")) {
@@ -1494,5 +1493,5 @@
*/
public static boolean hasExtension(String filename, String... extensions) {
- String name = filename.toLowerCase(Locale.ENGLISH).replace("?format=raw", "");
+ var name = filename.toLowerCase(Locale.ENGLISH).replace("?format=raw", "");
return Arrays.stream(extensions)
.anyMatch(ext -> name.endsWith('.' + ext.toLowerCase(Locale.ENGLISH)));
@@ -1523,9 +1522,9 @@
return new byte[0];
}
- try (ByteArrayOutputStream bout = new ByteArrayOutputStream(stream.available())) {
- byte[] buffer = new byte[8192];
- boolean finished = false;
+ try (stream; var bout = new ByteArrayOutputStream(stream.available())) {
+ final var buffer = new byte[8192];
+ var finished = false;
do {
- int read = stream.read(buffer);
+ var read = stream.read(buffer);
if (read >= 0) {
bout.write(buffer, 0, read);
@@ -1537,6 +1536,4 @@
return new byte[0];
return bout.toByteArray();
- } finally {
- stream.close();
}
}
@@ -1603,17 +1600,17 @@
*/
public static List getGlyphVectorsBidi(String string, Font font, FontRenderContext frc) {
- List gvs = new ArrayList<>();
- Bidi bidi = new Bidi(string, Bidi.DIRECTION_DEFAULT_LEFT_TO_RIGHT);
- byte[] levels = new byte[bidi.getRunCount()];
- DirectionString[] dirStrings = new DirectionString[levels.length];
- for (int i = 0; i < levels.length; ++i) {
+ final var gvs = new ArrayList();
+ final var bidi = new Bidi(string, Bidi.DIRECTION_DEFAULT_LEFT_TO_RIGHT);
+ final var levels = new byte[bidi.getRunCount()];
+ final var dirStrings = new DirectionString[levels.length];
+ for (var i = 0; i < levels.length; ++i) {
levels[i] = (byte) bidi.getRunLevel(i);
- String substr = string.substring(bidi.getRunStart(i), bidi.getRunLimit(i));
- int dir = levels[i] % 2 == 0 ? Bidi.DIRECTION_LEFT_TO_RIGHT : Bidi.DIRECTION_RIGHT_TO_LEFT;
+ final var substr = string.substring(bidi.getRunStart(i), bidi.getRunLimit(i));
+ final var dir = levels[i] % 2 == 0 ? Bidi.DIRECTION_LEFT_TO_RIGHT : Bidi.DIRECTION_RIGHT_TO_LEFT;
dirStrings[i] = new DirectionString(dir, substr);
}
Bidi.reorderVisually(levels, 0, dirStrings, 0, levels.length);
- for (DirectionString dirString : dirStrings) {
- char[] chars = dirString.str.toCharArray();
+ for (var dirString : dirStrings) {
+ var chars = dirString.str.toCharArray();
gvs.add(font.layoutGlyphVector(frc, chars, 0, chars.length, dirString.direction));
}
@@ -1712,5 +1709,5 @@
public static int getJavaVersion() {
// Switch to Runtime.version() once we move past Java 8
- String version = Objects.requireNonNull(getSystemProperty("java.version"));
+ var version = Objects.requireNonNull(getSystemProperty("java.version"));
if (version.startsWith("1.")) {
version = version.substring(2);
@@ -1721,6 +1718,6 @@
// 9
// 9.0.1
- int dotPos = version.indexOf('.');
- int dashPos = version.indexOf('-');
+ var dotPos = version.indexOf('.');
+ var dashPos = version.indexOf('-');
return Integer.parseInt(version.substring(0,
dotPos > -1 ? dotPos : dashPos > -1 ? dashPos : version.length()));
@@ -1734,5 +1731,5 @@
public static int getJavaUpdate() {
// Switch to Runtime.version() once we move past Java 8
- String version = Objects.requireNonNull(getSystemProperty("java.version"));
+ var version = Objects.requireNonNull(getSystemProperty("java.version"));
if (version.startsWith("1.")) {
version = version.substring(2);
@@ -1745,12 +1742,12 @@
// 17.0.4.1+1-LTS
// $MAJOR.$MINOR.$SECURITY.$PATCH
- int undePos = version.indexOf('_');
- int dashPos = version.indexOf('-');
+ var undePos = version.indexOf('_');
+ var dashPos = version.indexOf('-');
if (undePos > -1) {
return Integer.parseInt(version.substring(undePos + 1,
dashPos > -1 ? dashPos : version.length()));
}
- int firstDotPos = version.indexOf('.');
- int secondDotPos = version.indexOf('.', firstDotPos + 1);
+ var firstDotPos = version.indexOf('.');
+ var secondDotPos = version.indexOf('.', firstDotPos + 1);
if (firstDotPos == secondDotPos) {
return 0;
@@ -1767,7 +1764,7 @@
public static int getJavaBuild() {
// Switch to Runtime.version() once we move past Java 8
- String version = Objects.requireNonNull(getSystemProperty("java.runtime.version"));
- int bPos = version.indexOf('b');
- int pPos = version.indexOf('+');
+ var version = Objects.requireNonNull(getSystemProperty("java.runtime.version"));
+ var bPos = version.indexOf('b');
+ var pPos = version.indexOf('+');
try {
return Integer.parseInt(version.substring(bPos > -1 ? bPos + 1 : pPos + 1));
@@ -1786,5 +1783,5 @@
try {
Object value;
- Class c = Class.forName("com.sun.deploy.config.BuiltInProperties");
+ var c = Class.forName("com.sun.deploy.config.BuiltInProperties");
try {
value = c.getDeclaredField("JRE_EXPIRATION_DATE").get(null);
@@ -1810,5 +1807,5 @@
public static String getJavaLatestVersion() {
try {
- String[] versions = HttpClient.create(
+ var versions = HttpClient.create(
new URL(Config.getPref().get(
"java.baseline.version.url",
@@ -1816,5 +1813,5 @@
.connect().fetchContent().split("\n", -1);
if (getJavaVersion() <= 11 && isRunningWebStart()) { // OpenWebStart currently only has Java 11
- for (String version : versions) {
+ for (var version : versions) {
if (version.startsWith("11")) {
return version;
@@ -1822,5 +1819,5 @@
}
} else if (getJavaVersion() <= 17) {
- for (String version : versions) {
+ for (var version : versions) {
if (version.startsWith("17")) { // Use current Java LTS
return version;
@@ -1945,5 +1942,5 @@
return url.openStream();
} catch (FileNotFoundException | InvalidPathException e) {
- URL betterUrl = betterJarUrl(url);
+ final var betterUrl = betterJarUrl(url);
if (betterUrl != null) {
try {
@@ -1982,13 +1979,13 @@
public static URL betterJarUrl(URL jarUrl, URL defaultUrl) throws IOException {
// Workaround to https://bugs.openjdk.java.net/browse/JDK-4523159
- String urlPath = jarUrl.getPath().replace("%20", " ");
+ var urlPath = jarUrl.getPath().replace("%20", " ");
if (urlPath.startsWith("file:/") && urlPath.split("!", -1).length > 2) {
// Locate jar file
- int index = urlPath.lastIndexOf("!/");
- Path jarFile = Paths.get(urlPath.substring("file:/".length(), index));
- Path filename = jarFile.getFileName();
- FileTime jarTime = Files.readAttributes(jarFile, BasicFileAttributes.class).lastModifiedTime();
+ var index = urlPath.lastIndexOf("!/");
+ final var jarFile = Paths.get(urlPath.substring("file:/".length(), index));
+ var filename = jarFile.getFileName();
+ var jarTime = Files.readAttributes(jarFile, BasicFileAttributes.class).lastModifiedTime();
// Copy it to temp directory (hopefully free of exclamation mark) if needed (missing or older jar)
- Path jarCopy = Paths.get(getSystemProperty("java.io.tmpdir")).resolve(filename);
+ final var jarCopy = Paths.get(getSystemProperty("java.io.tmpdir")).resolve(filename);
if (!jarCopy.toFile().exists() ||
Files.readAttributes(jarCopy, BasicFileAttributes.class).lastModifiedTime().compareTo(jarTime) < 0) {
@@ -2029,5 +2026,5 @@
Logging.trace(e);
try {
- URL betterUrl = betterJarUrl(cl.getResource(path));
+ final var betterUrl = betterJarUrl(cl.getResource(path));
if (betterUrl != null) {
return betterUrl.openStream();
Index: trunk/tools/eclipse/JOSM (Java 8).launch
===================================================================
--- trunk/tools/eclipse/JOSM (Java 8).launch (revision 19047)
+++ (revision )
@@ -1,18 +1,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: trunk/tools/ivy.xml
===================================================================
--- trunk/tools/ivy.xml (revision 19047)
+++ trunk/tools/ivy.xml (revision 19048)
@@ -17,8 +17,9 @@
-
+
+
@@ -28,10 +29,8 @@