Index: /trunk/src/org/openstreetmap/josm/data/gpx/GpxExtension.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/gpx/GpxExtension.java	(revision 19630)
+++ /trunk/src/org/openstreetmap/josm/data/gpx/GpxExtension.java	(revision 19631)
@@ -190,5 +190,5 @@
     public void hide() {
         visible = false;
-        if (parent != null && parent instanceof GpxExtension) {
+        if (parent instanceof GpxExtension) {
             GpxExtension gpx = (GpxExtension) parent;
             if (Utils.isStripEmpty(gpx.getValue())
@@ -206,5 +206,5 @@
     public void show() {
         visible = true;
-        if (parent != null && parent instanceof GpxExtension) {
+        if (parent instanceof GpxExtension) {
             ((GpxExtension) parent).show();
         }
Index: /trunk/tools/pmd/josm-ruleset.xml
===================================================================
--- /trunk/tools/pmd/josm-ruleset.xml	(revision 19630)
+++ /trunk/tools/pmd/josm-ruleset.xml	(revision 19631)
@@ -123,5 +123,4 @@
     <exclude name="NPathComplexity"/>
     <exclude name="SignatureDeclareThrowsException"/>
-    <exclude name="SimplifiedTernary"/>
     <exclude name="SimplifyBooleanReturns" reason="Increased sensitivity in 7.x; should be fixed in our source code." />
     <exclude name="SingularField"/>