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

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

Author: lkrzyzanek
Date: 2009-03-25 11:23:22 -0400 (Wed, 25 Mar 2009)
New Revision: 25822

Modified:
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/DuplicateDocument.java
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/NavigationAction.java
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/mapping/HFURLMapping.java
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/web/navigation.ftl
Log:
added PDF version capability for more than one document

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/DuplicateDocument.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/DuplicateDocument.java	2009-03-25 14:59:26 UTC (rev 25821)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/DuplicateDocument.java	2009-03-25 15:23:22 UTC (rev 25822)
@@ -38,8 +38,6 @@
 
   private String documentID;
 
-  private String urlSuffix;
-
   private String subject;
 
   private List<Community> communities;
@@ -98,12 +96,4 @@
         "subject", this.subject).toString();
   }
 
-  public void setUrlSuffix(String urlSuffix) {
-    this.urlSuffix = urlSuffix;
-  }
-
-  public String getUrlSuffix() {
-    return urlSuffix;
-  }
-
 }

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/NavigationAction.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/NavigationAction.java	2009-03-25 14:59:26 UTC (rev 25821)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/NavigationAction.java	2009-03-25 15:23:22 UTC (rev 25822)
@@ -45,12 +45,14 @@
 
   private static final Logger log = LogManager.getLogger(HFURLMapping.class);
 
-  List<String> docIds;
+  private List<String> docIds;
 
-  String urlSuffix;
+  private String urlSuffix;
 
-  List<DuplicateDocument> documents = new ArrayList<DuplicateDocument>();
+  private String pdfRequired;
 
+  private List<DuplicateDocument> documents = new ArrayList<DuplicateDocument>();
+
   protected DocumentManager documentManager;
 
   private CommunityManager communityManager;
@@ -64,7 +66,6 @@
         DuplicateDocument dupDoc = new DuplicateDocument();
         dupDoc.setDocumentID(doc.getDocumentID());
         dupDoc.setSubject(doc.getSubject());
-        dupDoc.setUrlSuffix(urlSuffix);
 
         dupDoc.setCommunities(getCommunities(doc));
 
@@ -130,4 +131,12 @@
   public void setUrlSuffix(String urlSuffix) {
     this.urlSuffix = urlSuffix;
   }
+
+  public void setPdfRequired(String pdfRequired) {
+    this.pdfRequired = pdfRequired;
+  }
+
+  public String getPdfRequired() {
+    return pdfRequired;
+  }
 }

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/mapping/HFURLMapping.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/mapping/HFURLMapping.java	2009-03-25 14:59:26 UTC (rev 25821)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/mapping/HFURLMapping.java	2009-03-25 15:23:22 UTC (rev 25822)
@@ -83,8 +83,10 @@
       // in this case try to switch from HF URL to standard CS URL
       // document (documentID) is always the second element
       String hfURLTitle;
+      boolean isPdf = false;
       if (uriElements[2].endsWith(".pdf")) {
         hfURLTitle = uriElements[2].replace(".pdf", "");
+        isPdf = true;
       } else {
         hfURLTitle = uriElements[2];
       }
@@ -120,6 +122,7 @@
             }
           }
           params.put("urlSuffix", suffix.toString());
+          params.put("pdfRequired", Boolean.toString(isPdf));
           uri = DOC_MORE_THAN_ONE;
         }
       }

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/web/navigation.ftl
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/web/navigation.ftl	2009-03-25 14:59:26 UTC (rev 25821)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/web/navigation.ftl	2009-03-25 15:23:22 UTC (rev 25822)
@@ -33,7 +33,7 @@
                   Beware - when it's enabled HF URL links then s.url tag with "/docs/..." value modify to HF URL back.
                   We need to avoid HF URL link now
                  -->
-                <a href="<@s.url value='/' includeParams='none' />docs/${doc.documentID}<#if  doc.urlSuffix?exists && "" != doc.urlSuffix?trim>/${doc.urlSuffix}</#if>">
+                <a href="<@s.url value='/' includeParams='none' />docs/${doc.documentID}<#if pdfRequired?exists && "true" == pdfRequired?trim>.pdf</#if><#if urlSuffix?exists && "" != urlSuffix?trim>/${doc.urlSuffix}</#if>">
                 <#list doc.communities as comm>
                   ${comm.name} &gt;
                 </#list>