svn commit: r533561 - /velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/tools/LinkTool.java

[nbubna]

Author: nbubna
Date: Sun Apr 29 14:35:31 2007
New Revision: 533561

URL: http://svn.apache.org/viewvc?view=rev&rev=533561
Log:
fix misnamed setters and remove errant sys.out lines

Modified:
    
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/tools/LinkTool.java

Modified: 
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/tools/LinkTool.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/tools/LinkTool.java?view=diff&rev=533561&r1=533560&r2=533561
==============================================================================
--- 
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/tools/LinkTool.java
 (original)
+++ 
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/tools/LinkTool.java
 Sun Apr 29 14:35:31 2007
@@ -155,7 +155,7 @@
      * for this tool to operate and will throw a NullPointerException
      * if this is not set or is set to [EMAIL PROTECTED] null}.
      */
-    public void setServletRequest(HttpServletRequest request)
+    public void setRequest(HttpServletRequest request)
     {
         if (request == null)
         {
@@ -169,7 +169,7 @@
      * for this tool to operate and will throw a NullPointerException
      * if this is not set or is set to [EMAIL PROTECTED] null}.
      */
-    public void setServletResponse(HttpServletResponse response)
+    public void setResponse(HttpServletResponse response)
     {
         if (response == null)
         {
@@ -187,6 +187,13 @@
         this.application = application;
     }
 
+    @Deprecated
+    public void setXhtml(boolean useXhtml)
+    {
+        queryDataDelim =
+            (useXhtml) ? XHTML_QUERY_DELIMITER : HTML_QUERY_DELIMITER;
+    }
+
     /**
      * <p>Controls the delimiter used for separating query data pairs.
      *    By default, the standard '&' character is used.</p>
@@ -199,16 +206,8 @@
      *        will be used.  if false, then '&' will be used.
      * @see <a href="http://www.w3.org/TR/xhtml1/#C_12";>Using Ampersands in 
Attribute Values (and Elsewhere)</a>
      */
-    public void setXhtml(boolean useXhtml)
-    {
-System.out.println("fired setXhtml: "+useXhtml);
-        queryDataDelim =
-            (useXhtml) ? XHTML_QUERY_DELIMITER : HTML_QUERY_DELIMITER;
-    }
-
     public void setXHTML(boolean useXhtml)
     {
-System.out.println("fired primitive setXHTML");
         setXhtml(useXhtml);
     }
     
@@ -225,7 +224,6 @@
      */
     public void setSelfAbsolute(boolean selfAbsolute)
     {
-System.out.println("fired setSelfAbsolute: "+selfAbsolute);
         this.selfAbsolute = selfAbsolute;
     }