Changeset 4255

Timestamp:

01/13/14 08:12:46 (10 years ago)

Author:

twagoo

Message:

fixed NPE for 'show cmdi' AJAX fallback link when JS disabled

File:

• vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java (modified) (7 diffs)

vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java

@@ -31 +31 @@
 import org.apache.wicket.MarkupContainer;
 import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.behavior.Behavior;
 import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
 import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxFallbackLink;
@@ -45 +43 @@
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.MarkupStream;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
@@ -504 +500 @@
 
     private Label completeCmdiLabel = null;
-    
+
     /**
      * Add complete CMDI view
@@ -515 +511 @@
         completeCmdiContainer.setOutputMarkupId(true);
         add(completeCmdiContainer);
-        
+
         // Add a toggle link that provides lazy execution of CMDI transformation
         Link toggleLink = new IndicatingAjaxFallbackLink("toggleCmdiView") {
@@ -529 +525 @@
                     completeCmdiLabel.setVisible(!completeCmdiLabel.isVisible());
                 }
-                target.add(completeCmdiContainer);
+                if (target != null) {
+                    // Ajax supported, updated only container
+                    target.add(completeCmdiContainer);
+                }
             }
         };
@@ -537 +536 @@
             @Override
             public String getObject() {
-                if(completeCmdiLabel == null || !completeCmdiLabel.isVisible()){
+                if (completeCmdiLabel == null || !completeCmdiLabel.isVisible()) {
                     return "Show CMDI metadata";
-                } else{
+                } else {
                     return "Hide CMDI metadata";
                 }
@@ -546 +545 @@
         toggleLink.add(toggleLabel);
         completeCmdiContainer.add(toggleLink);
-        
+
         // add a placeholder for the transformation
         final WebMarkupContainer completeCmdiPlaceholder = new WebMarkupContainer("completeCmdi");