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

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

Author: lkrzyzanek
Date: 2009-03-19 11:47:22 -0400 (Thu, 19 Mar 2009)
New Revision: 25747

Modified:
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/components/HFURLComponent.java
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/struts/components/HFURLComponentTest.java
Log:
added pdf in URL handling

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/components/HFURLComponent.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/components/HFURLComponent.java	2009-03-19 15:45:15 UTC (rev 25746)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/components/HFURLComponent.java	2009-03-19 15:47:22 UTC (rev 25747)
@@ -107,6 +107,10 @@
       url = url.substring(0, questionMark);
     }
 
+    if (url.endsWith(".pdf")) {
+      url = url.replace(".pdf", "");
+    }
+
     final int docIDStart = url.indexOf(DOCID_PREFIX) + DOCID_PREFIX.length();
     int docIDEnd = url.indexOf("/", docIDStart);
     if (docIDEnd == -1) {

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/struts/components/HFURLComponentTest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/struts/components/HFURLComponentTest.java	2009-03-19 15:45:15 UTC (rev 25746)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/struts/components/HFURLComponentTest.java	2009-03-19 15:47:22 UTC (rev 25747)
@@ -35,11 +35,12 @@
   @Test
   public void testGetDocumentId() {
     assertEquals("DOC-1234", HFURLComponent.getDocumentId("/community/docs/DOC-1234"));
+    assertEquals("DOC-1234", HFURLComponent.getDocumentId("/community/docs/DOC-1234.pdf"));
     assertEquals("DOC-10350", HFURLComponent.getDocumentId("/community/docs/DOC-10350"));
     assertEquals("DOC-1234", HFURLComponent.getDocumentId("/community/docs/DOC-1234/edit"));
 
-    assertEquals("DOC-1234", HFURLComponent.getDocumentId("/community/docs/DOC-1234?param=1"));
-    assertEquals("DOC-1234", HFURLComponent.getDocumentId("/community/docs/DOC-1234/edit?param=1"));
+    assertEquals("DOC-1234", HFURLComponent.getDocumentId("/community/docs/DOC-1234?decorator=print"));
+    assertEquals("DOC-1234", HFURLComponent.getDocumentId("/community/docs/DOC-1234/edit?decorator=print"));
     
   }