Changeset 9454 in josm for trunk/src/org/openstreetmap/josm/gui/history

Timestamp:

2016-01-15T00:26:24+01:00 (11 years ago)

Author:

Don-vip

Message:

checkstyle + add basic unit test

Location:

trunk/src/org/openstreetmap/josm/gui/history

Files:

• CoordinateInfoViewer.java (modified) (2 diffs)
• HistoryBrowserModel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java

@@ -28 +28 @@
  * An UI widget for displaying differences in the coordinates of two
  * {@link HistoryNode}s.
- *
+ * @since 2243
  */
 public class CoordinateInfoViewer extends JPanel {
@@ -327 +327 @@
         private final Updater updater;
 
-        public MapViewer(HistoryBrowserModel model) {
+        MapViewer(HistoryBrowserModel model) {
             this.updater = new Updater(model, PointInTimeType.REFERENCE_POINT_IN_TIME);
             setBorder(BorderFactory.createLineBorder(Color.DARK_GRAY));

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java

@@ -105 +105 @@
         referenceRelationMemberTableModel = new DiffTableModel();
 
-        OsmDataLayer editLayer = Main.main.getEditLayer();
-        if (editLayer != null) {
-            editLayer.data.addDataSetListener(this);
+        if (Main.main != null) {
+            OsmDataLayer editLayer = Main.main.getEditLayer();
+            if (editLayer != null) {
+                editLayer.data.addDataSetListener(this);
+            }
         }
         MapView.addLayerChangeListener(this);