Changeset 19050 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

Timestamp:

2024-04-22T20:59:26+02:00 (4 weeks ago)

Author:

taylor.smock

Message:

Revert most var changes from r19048, fix most new compile warnings and checkstyle issues

Also, document why various ErrorProne checks were originally disabled and fix
generic SonarLint issues.

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (18 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -67 +67 @@
 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;
@@ -172 +173 @@
                 // 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.
-                var boundingBoxedLayerFound = false;
+                boolean boundingBoxedLayerFound = false;
                 for (Layer l: MainApplication.getLayerManager().getLayers()) {
                     if (l != yLayer) {
-                        final var bbox = new BoundingXYVisitor();
+                        BoundingXYVisitor bbox = new BoundingXYVisitor();
                         l.visitBoundingBox(bbox);
                         if (bbox.getBounds() != null) {
@@ -184 +185 @@
                 }
                 if (!boundingBoxedLayerFound) {
-                    final var bbox = new BoundingXYVisitor();
+                    BoundingXYVisitor bbox = new BoundingXYVisitor();
                     yLayer.visitBoundingBox(bbox);
                     MainApplication.getMap().mapView.zoomTo(bbox);
@@ -264 +265 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            final var sel = GpxDataHelper.chooseGpxDataFile();
+            File sel = GpxDataHelper.chooseGpxDataFile();
             if (sel != null) {
                 try {
                     outerPanel.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
                     removeDuplicates(sel);
-                    final var data = GpxDataHelper.loadGpxData(sel);
+                    GpxData data = GpxDataHelper.loadGpxData(sel);
                     if (data != null) {
-                        final var elem = new GpxDataWrapper(sel.getName(), data, sel);
+                        GpxDataWrapper elem = new GpxDataWrapper(sel.getName(), data, sel);
                         gpxModel.addElement(elem);
                         gpxModel.setSelectedItem(elem);
@@ -299 +300 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            final var ed = new AdvancedCorrelationSettingsDialog(MainApplication.getMainFrame(), forceTags);
+            AdvancedCorrelationSettingsDialog ed = new AdvancedCorrelationSettingsDialog(MainApplication.getMainFrame(), forceTags);
             if (ed.showDialog().getValue() == 1) {
                 forceTags = ed.isForceTaggingSelected(); // This setting is not supposed to be saved permanently
@@ -320 +321 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            var isOk = false;
+            boolean isOk = false;
             while (!isOk) {
-                final var ed = new SynchronizeTimeFromPhotoDialog(MainApplication.getMainFrame(), yLayer.getImageData().getImages());
+                SynchronizeTimeFromPhotoDialog ed = new SynchronizeTimeFromPhotoDialog(
+                        MainApplication.getMainFrame(), yLayer.getImageData().getImages());
                 int answer = ed.showDialog().getValue();
                 if (answer != 1)
@@ -338 +340 @@
                 }
 
-                final var selectedTz = ed.getTimeZoneItem();
+                TimeZoneItem selectedTz = ed.getTimeZoneItem();
 
                 Config.getPref().put("geoimage.timezoneid", selectedTz.getID());
@@ -355 +357 @@
         @Override
         public void layerAdded(LayerAddEvent e) {
-            final var layer = e.getAddedLayer();
+            Layer layer = e.getAddedLayer();
             if (layer instanceof GpxDataContainer) {
-                final var gpx = ((GpxDataContainer) layer).getGpxData();
-                final var file = gpx.storageFile;
+                GpxData gpx = ((GpxDataContainer) layer).getGpxData();
+                File file = gpx.storageFile;
                 removeDuplicates(file);
-                final var gdw = new GpxDataWrapper(layer.getName(), gpx, file);
+                GpxDataWrapper gdw = new GpxDataWrapper(layer.getName(), gpx, file);
                 layer.addPropertyChangeListener(new GpxLayerRenamedListener(gdw));
                 gpxModel.addElement(gdw);
@@ -374 +376 @@
         @Override
         public void layerRemoving(LayerRemoveEvent e) {
-            final var layer = e.getRemovedLayer();
+            Layer layer = e.getRemovedLayer();
             if (layer instanceof GpxDataContainer) {
-                final var removedGpxData = ((GpxDataContainer) layer).getGpxData();
+                GpxData removedGpxData = ((GpxDataContainer) layer).getGpxData();
                 for (int i = gpxModel.getSize() - 1; i >= 0; i--) {
                     GpxData data = gpxModel.getElementAt(i).data;
@@ -426 +428 @@
         for (AbstractModifiableLayer cur : MainApplication.getLayerManager().getLayersOfType(AbstractModifiableLayer.class)) {
             if (cur instanceof GpxDataContainer) {
-                final var data = ((GpxDataContainer) cur).getGpxData();
-                final var gdw = new GpxDataWrapper(cur.getName(), data, data.storageFile);
+                GpxData data = ((GpxDataContainer) cur).getGpxData();
+                GpxDataWrapper gdw = new GpxDataWrapper(cur.getName(), data, data.storageFile);
                 cur.addPropertyChangeListener(new GpxLayerRenamedListener(gdw));
                 gpxModel.addElement(gdw);
@@ -469 +471 @@
     @Override
     public void actionPerformed(ActionEvent ae) {
-        final var nogdw = new NoGpxDataWrapper();
+        NoGpxDataWrapper nogdw = new NoGpxDataWrapper();
         if (gpxModel == null) {
             constructGpxModel(nogdw);
         }
 
-        final var panelCb = new JPanel();
+        JPanel panelCb = new JPanel();
 
         panelCb.add(new JLabel(tr("GPX track: ")));
@@ -483 +485 @@
         panelCb.add(cbGpx);
 
-        final var buttonOpen = new JButton(tr("Open another GPX trace"));
+        JButton buttonOpen = new JButton(tr("Open another GPX trace"));
         buttonOpen.addActionListener(new LoadGpxDataActionListener());
         panelCb.add(buttonOpen);
@@ -491 +493 @@
         panelCb.add(buttonSupport);
 
-        final var panelTf = new JPanel(new GridBagLayout());
+        JPanel panelTf = new JPanel(new GridBagLayout());
 
         timezone = loadTimezone();
@@ -503 +505 @@
         tfOffset.setText(delta.formatOffset());
 
-        final var buttonViewGpsPhoto = new JButton(tr("<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"));
+        JButton buttonViewGpsPhoto = new JButton(tr("<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"));
         buttonViewGpsPhoto.setIcon(ImageProvider.get("clock"));
         buttonViewGpsPhoto.addActionListener(new SetOffsetActionListener());
 
-        final var buttonAutoGuess = new JButton(tr("Auto-Guess"));
+        JButton buttonAutoGuess = new JButton(tr("Auto-Guess"));
         buttonAutoGuess.setToolTipText(tr("Matches first photo with first gpx point"));
         buttonAutoGuess.addActionListener(new AutoGuessActionListener());
 
-        final var buttonAdjust = new JButton(tr("Manual adjust"));
+        JButton buttonAdjust = new JButton(tr("Manual adjust"));
         buttonAdjust.addActionListener(new AdjustActionListener());
 
-        final var buttonAdvanced = new JButton(tr("Advanced settings..."));
+        JButton buttonAdvanced = new JButton(tr("Advanced settings..."));
         buttonAdvanced.addActionListener(new AdvancedSettingsActionListener());
 
-        final var labelPosition = new JLabel(tr("Override position for: "));
+        JLabel labelPosition = new JLabel(tr("Override position for: "));
 
         int numAll = yLayer.getSortedImgList(true, true).size();
@@ -535 +537 @@
         cbShowThumbs.setEnabled(!yLayer.thumbsLoaded);
 
-        var y = 0;
-        var gbc = GBC.eol();
+        int y = 0;
+        GBC gbc = GBC.eol();
         gbc.gridx = 0;
         gbc.gridy = y++;
@@ -625 +627 @@
         expertChanged(ExpertToggleAction.isExpert());
 
-        final var statusBar = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
+        final JPanel statusBar = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
         statusBar.setBorder(BorderFactory.createLoweredBevelBorder());
         statusBarText = new JLabel(" ");
@@ -631 +633 @@
         statusBar.add(statusBarText);
 
-        final var repaintTheMap = new RepaintTheMapListener(yLayer);
+        RepaintTheMapListener repaintTheMap = new RepaintTheMapListener(yLayer);
         pDirectionPosition.addFocusListenerOnComponent(repaintTheMap);
         tfTimezone.addFocusListener(repaintTheMap);
@@ -811 +813 @@
         public void actionPerformed(ActionEvent e) {
 
-            final var offset = GpxTimeOffset.milliseconds(
+            final GpxTimeOffset offset = GpxTimeOffset.milliseconds(
                     delta.getMilliseconds() + Math.round(timezone.getHours() * TimeUnit.HOURS.toMillis(1)));
             final int dayOffset = offset.getDayOffset();