[jboss-svn-commits] JBL Code SVN: r26276 - in labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src: main/java/org/jboss/labs/clearspace/plugin/hfurl/struts and 2 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: lkrzyzanek
Date: 2009-04-27 07:50:18 -0400 (Mon, 27 Apr 2009)
New Revision: 26276

Modified:
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManager.java
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/HFURLManager.java
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/RedirectToHFURLAction.java
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManagerTest.java
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/struts/mapping/HFURLMappingTest.java
Log:
renamed getHFURL(String, boolean) to getHFURLUnique due to javascript methods cannot overloaded

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManager.java	2009-04-27 09:40:58 UTC (rev 26275)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManager.java	2009-04-27 11:50:18 UTC (rev 26276)
@@ -137,10 +137,10 @@
   }
 
   public String getHFURL(String standardURL) {
-    return getHFURL(standardURL, false);
+    return getHFURLUnique(standardURL, false);
   }
 
-  public String getHFURL(String standardURL, boolean onlyUniqueHFURL) {
+  public String getHFURLUnique(String standardURL, boolean onlyUniqueHFURL) {
     if (!isHFLinksEnabled()) {
       return standardURL;
     }

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/HFURLManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/HFURLManager.java	2009-04-27 09:40:58 UTC (rev 26275)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/HFURLManager.java	2009-04-27 11:50:18 UTC (rev 26276)
@@ -72,9 +72,9 @@
   public List<String> getDocumentID(String hfURLTitle);
 
   /**
-   * Shortcut for getHFURL(standardURL, false)
+   * Shortcut for getHFURLUnique(standardURL, false)
    * 
-   * @see #getHFURL(String, boolean)
+   * @see #getHFURLUnique(String, boolean)
    */
   public String getHFURL(String standardURL);
 
@@ -92,7 +92,7 @@
    *          URLs
    * @return i.e. /wiki/humanFriendlyURL
    */
-  public String getHFURL(String standardURL, boolean onlyUniqueHFURL);
+  public String getHFURLUnique(String standardURL, boolean onlyUniqueHFURL);
 
   /**
    * Get HF URL Title for document ID

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/RedirectToHFURLAction.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/RedirectToHFURLAction.java	2009-04-27 09:40:58 UTC (rev 26275)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/RedirectToHFURLAction.java	2009-04-27 11:50:18 UTC (rev 26276)
@@ -58,7 +58,7 @@
       url = url + "?" + params;
     }
 
-    String urlToRedirect = hfURLManager.getHFURL(url, true);
+    String urlToRedirect = hfURLManager.getHFURLUnique(url, true);
 
     if (url.equals(urlToRedirect)) {
       url = addParameter(urlToRedirect, "uniqueTitle=false");

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManagerTest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManagerTest.java	2009-04-27 09:40:58 UTC (rev 26275)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManagerTest.java	2009-04-27 11:50:18 UTC (rev 26276)
@@ -170,7 +170,7 @@
         .getHFURL("/docs/DOC-1234/restore"));
 
     assertEquals("/docs/DOC-3456", hfURLManager
-        .getHFURL("/docs/DOC-3456", true));
+        .getHFURLUnique("/docs/DOC-3456", true));
 
   }
 

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/struts/mapping/HFURLMappingTest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/struts/mapping/HFURLMappingTest.java	2009-04-27 09:40:58 UTC (rev 26275)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/struts/mapping/HFURLMappingTest.java	2009-04-27 11:50:18 UTC (rev 26276)
@@ -54,7 +54,7 @@
         return null;
       }
       
-      public String getHFURL(String standardURL, boolean onlyUniqueHFURL) {
+      public String getHFURLUnique(String standardURL, boolean onlyUniqueHFURL) {
         return null;
       }