svn commit: r1544473 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/StandardContext.java

[markt]

Author: markt
Date: Fri Nov 22 10:37:38 2013
New Revision: 1544473

URL: http://svn.apache.org/r1544473
Log:
Minor clean-up. Inherit the Javadoc.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1544455

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1544473&r1=1544472&r2=1544473&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Fri 
Nov 22 10:37:38 2013
@@ -1055,11 +1055,13 @@ public class StandardContext extends Con
     }
 
      
+    @Override
     public InstanceManager getInstanceManager() {
        return instanceManager;
     }
 
 
+    @Override
     public void setInstanceManager(InstanceManager instanceManager) {
        this.instanceManager = instanceManager;
     }
@@ -6580,72 +6582,55 @@ public class StandardContext extends Con
 
     }
 
-     /**
-     * Set the validation feature of the XML parser used when
-     * parsing xml instances.
-     * @param webXmlValidation true to enable xml instance validation
-     */
+    
+    @Override
+    public boolean getXmlNamespaceAware(){
+        return webXmlNamespaceAware;
+    }
+
+
+    @Override
+    public void setXmlNamespaceAware(boolean webXmlNamespaceAware){
+        this.webXmlNamespaceAware = webXmlNamespaceAware;
+    }    
+
+
     @Override
     public void setXmlValidation(boolean webXmlValidation){
-        
         this.webXmlValidation = webXmlValidation;
-
     }
 
-    /**
-     * Get the server.xml <context> attribute's xmlValidation.
-     * @return true if validation is enabled.
-     *
-     */
+
     @Override
     public boolean getXmlValidation(){
         return webXmlValidation;
     }
 
 
-    /**
-     * Get the server.xml <context> attribute's xmlNamespaceAware.
-     * @return true if namespace awarenes is enabled.
-     */
     @Override
-    public boolean getXmlNamespaceAware(){
-        return webXmlNamespaceAware;
+    public boolean getTldNamespaceAware(){
+        return tldNamespaceAware;
     }
 
 
-    /**
-     * Set the namespace aware feature of the XML parser used when
-     * parsing xml instances.
-     * @param webXmlNamespaceAware true to enable namespace awareness
-     */
     @Override
-    public void setXmlNamespaceAware(boolean webXmlNamespaceAware){
-        this.webXmlNamespaceAware= webXmlNamespaceAware;
+    public void setTldNamespaceAware(boolean tldNamespaceAware){
+        this.tldNamespaceAware = tldNamespaceAware;
     }    
 
 
-    /**
-     * Set the validation feature of the XML parser used when
-     * parsing tlds files. 
-     * @param tldValidation true to enable xml instance validation
-     */
     @Override
     public void setTldValidation(boolean tldValidation){
-        
         this.tldValidation = tldValidation;
-
     }
 
-    /**
-     * Get the server.xml <context> attribute's webXmlValidation.
-     * @return true if validation is enabled.
-     *
-     */
+
     @Override
     public boolean getTldValidation(){
         return tldValidation;
     }
 
+    
     /**
      * Sets the process TLDs attribute.
      *
@@ -6662,26 +6647,6 @@ public class StandardContext extends Con
         return processTlds;
     }
 
-    /**
-     * Get the server.xml &lt;host&gt; attribute's xmlNamespaceAware.
-     * @return true if namespace awarenes is enabled.
-     */
-    @Override
-    public boolean getTldNamespaceAware(){
-        return tldNamespaceAware;
-    }
-
-
-    /**
-     * Set the namespace aware feature of the XML parser used when
-     * parsing xml instances.
-     * @param tldNamespaceAware true to enable namespace awareness
-     */
-    @Override
-    public void setTldNamespaceAware(boolean tldNamespaceAware){
-        this.tldNamespaceAware= tldNamespaceAware;
-    }    
-
 
     /** 
      * Support for "stateManageable" JSR77 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org