Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java	(revision 13210)
+++ trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java	(revision 13211)
@@ -77,5 +77,5 @@
         assertFalse(layer.isLocalFile());
         assertEquals(Color.MAGENTA, layer.getColorProperty().get());
-        assertEquals("<html>0 tracks, 0 routes, 0 waypoints<br>Length: < 0.01 m<br></html>", layer.getToolTipText());
+        assertEquals("<html>0 tracks (0 segments), 0 routes, 0 waypoints<br>Length: < 0.01 m<br></html>", layer.getToolTipText());
 
         GpxLayer layer2 = new GpxLayer(new GpxData(), "bar", true);
@@ -83,5 +83,5 @@
         assertTrue(layer2.isLocalFile());
         assertEquals(Color.MAGENTA, layer2.getColorProperty().get());
-        assertEquals("<html>0 tracks, 0 routes, 0 waypoints<br>Length: < 0.01 m<br></html>", layer2.getToolTipText());
+        assertEquals("<html>0 tracks (0 segments), 0 routes, 0 waypoints<br>Length: < 0.01 m<br></html>", layer2.getToolTipText());
 
         assertTrue(layer.checkSaveConditions());
@@ -102,4 +102,9 @@
         assertEquals("<html>\n"+
                      "  <head>\n" +
+                     "    <style type=\"text/css\">\n" +
+                     "      <!--\n" +
+                     "        td { padding-top: 4px; padding-bottom: 4px; padding-right: 16px; padding-left: 16px }\n" +
+                     "      -->\n" +
+                     "    </style>\n" +
                      "    \n" +
                      "  </head>\n" +
@@ -112,4 +117,9 @@
         assertEquals("<html>\n"+
                      "  <head>\n" +
+                     "    <style type=\"text/css\">\n" +
+                     "      <!--\n" +
+                     "        td { padding-top: 4px; padding-bottom: 4px; padding-right: 16px; padding-left: 16px }\n" +
+                     "      -->\n" +
+                     "    </style>\n" +
                      "    \n" +
                      "  </head>\n" +
@@ -118,5 +128,5 @@
                      "      <tr align=\"center\">\n" +
                      "        <td colspan=\"5\">\n" +
-                     "          1 track\n" +
+                     "          1 track, 1 track segments\n" +
                      "        </td>\n" +
                      "      </tr>\n" +
@@ -135,4 +145,7 @@
                      "        </td>\n" +
                      "        <td>\n" +
+                     "          Number of<br>Segments\n" +
+                     "        </td>\n" +
+                     "        <td>\n" +
                      "          URL\n" +
                      "        </td>\n" +
@@ -150,4 +163,7 @@
                      "        <td>\n" +
                      "          12.0 m\n" +
+                     "        </td>\n" +
+                     "        <td>\n" +
+                     "          1\n" +
                      "        </td>\n" +
                      "        <td>\n" +
