[jboss-svn-commits] JBL Code SVN: r25794 - in labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src: test/java/org/jboss/labs/clearspace/plugin/hfurl and 1 other directory.

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

Author: lkrzyzanek
Date: 2009-03-24 05:11:53 -0400 (Tue, 24 Mar 2009)
New Revision: 25794

Modified:
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManager.java
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/HFURLManager.java
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManagerTest.java
Log:
getHFURL convert url to HF URL only if HF links are enabled

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManager.java	2009-03-24 08:53:08 UTC (rev 25793)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManager.java	2009-03-24 09:11:53 UTC (rev 25794)
@@ -137,6 +137,10 @@
   }
 
   public String getHFURL(String standardURL) {
+    if (!isHFLinksEnabled()) {
+      return standardURL;
+    }
+    
     String hfURL = standardURL;
     try {
       if (standardURL != null && standardURL.contains(docIdURLPrefix + "/")) {

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/HFURLManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/HFURLManager.java	2009-03-24 08:53:08 UTC (rev 25793)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/HFURLManager.java	2009-03-24 09:11:53 UTC (rev 25794)
@@ -70,10 +70,13 @@
    * @see com.jivesoftware.community.impl.dao.DocumentBean#getDocumentID()
    */
   public List<String> getDocumentID(String hfURLTitle);
-  
+
   /**
-   * Get human friendly URL from standard CS URL
-   * @param standardURL i.e. /docs/DOC-1234
+   * Get human friendly URL from standard CS URL. If human friendly links are
+   * note enabled then standardURL is returned.
+   * 
+   * @param standardURL
+   *          i.e. /docs/DOC-1234
    * @return i.e. /wiki/humanFriendlyURL
    */
   public String getHFURL(String standardURL);

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManagerTest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManagerTest.java	2009-03-24 08:53:08 UTC (rev 25793)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManagerTest.java	2009-03-24 09:11:53 UTC (rev 25794)
@@ -49,7 +49,7 @@
 
   @Before
   public void setupHFURLManager() {
-    hfURLManager = new DbHFURLManager();
+    hfURLManager = new DummyHFURLManager();
     hfURLManager.setDocIdURLPrefix("/docs");
     hfURLManager.setHfULRPrefix("/wiki");
 
@@ -62,6 +62,13 @@
     hfURLManager.setHfURLDAO(new DummyHFURLDAO());
   }
 
+  class DummyHFURLManager extends DbHFURLManager {
+    @Override
+    public boolean isHFLinksEnabled() {
+      return true;
+    }
+  }
+
   class DummyHFURLDAO implements HFURLDAO {
 
     public void updateIndex() {