[jboss-cvs] jboss-seam/src/pdf/org/jboss/seam/pdf ...

[Gavin King]

  User: gavin   
  Date: 07/05/17 19:23:53

  Modified:    src/pdf/org/jboss/seam/pdf  DocumentStore.java
  Log:
  cleanup
  
  Revision  Changes    Path
  1.9       +30 -21    jboss-seam/src/pdf/org/jboss/seam/pdf/DocumentStore.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DocumentStore.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/pdf/org/jboss/seam/pdf/DocumentStore.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- DocumentStore.java	30 Apr 2007 14:19:43 -0000	1.8
  +++ DocumentStore.java	17 May 2007 23:23:52 -0000	1.9
  @@ -1,22 +1,25 @@
   package org.jboss.seam.pdf;
   
   import java.io.Serializable;
  -import java.util.*;
  +import java.util.HashMap;
  +import java.util.Map;
   
   import javax.faces.FacesException;
   import javax.faces.application.ViewHandler;
   import javax.faces.context.ExternalContext;
   import javax.faces.context.FacesContext;
   
  -import org.jboss.seam.*;
  -import org.jboss.seam.annotations.*;
  +import org.jboss.seam.Component;
  +import org.jboss.seam.ScopeType;
  +import org.jboss.seam.annotations.Install;
  +import org.jboss.seam.annotations.Name;
  +import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.pdf.DocumentData.DocType;
   
   @Name("org.jboss.seam.pdf.documentStore")
   @Scope(ScopeType.CONVERSATION)
   @Install(precedence=Install.BUILT_IN)
  -public class DocumentStore 
  -    implements Serializable
  +public class DocumentStore implements Serializable
   {    
       private static final long serialVersionUID = -357154201942127711L;
   
  @@ -26,31 +29,38 @@
       boolean useExtensions = false;
       String errorPage = null;
       
  -    public void setUseExtensions(boolean useExtensions) {
  +    public void setUseExtensions(boolean useExtensions) 
  +    {
           this.useExtensions = useExtensions;
       }
       
  -    public void setErrorPage(String errorPage) {
  +    public void setErrorPage(String errorPage) 
  +    {
           this.errorPage = errorPage;
       }
       
  -    public String getErrorPage() {
  +    public String getErrorPage() 
  +    {
           return errorPage;
       }
       
  -    public String newId() {
  +    public String newId() 
  +    {
           return String.valueOf(nextId++);
       }
   
  -    public void saveData(String id, DocumentData documentData) {
  +    public void saveData(String id, DocumentData documentData) 
  +    {
           dataStore.put(id, documentData);
       }
   
  -    public boolean idIsValid(String id) {
  +    public boolean idIsValid(String id) 
  +    {
           return dataStore.get(id) != null;
       }
       
  -    public DocumentData getDocumentData(String id) { 
  +    public DocumentData getDocumentData(String id) 
  +    {
           return dataStore.get(id);
       }
       
  @@ -60,21 +70,20 @@
       }
     
   
  -    public String preferredUrlForContent(String baseName, DocType docType, String contentId) {
  -       String url = getFacesContext().getApplication().getViewHandler().getActionURL(getFacesContext(), "/seam-doc." + getDefaultSuffix(getFacesContext()));
  -       String baseUrl = getFacesContext().getExternalContext().encodeActionURL(url);
  +    public String preferredUrlForContent(String baseName, DocType docType, String contentId) 
  +    {
  +       FacesContext context = FacesContext.getCurrentInstance();
  +       String url = context.getApplication().getViewHandler().getActionURL(context, "/seam-doc." + getDefaultSuffix(context));
  +       String baseUrl = context.getExternalContext().encodeActionURL(url);
           
  -       if (useExtensions) {
  +       if (useExtensions) 
  +       {
              baseUrl = baseName + "." + docType.getExtension();
          } 
           
          return baseUrl + "?docId=" + contentId;
       }
       
  -    private FacesContext getFacesContext() 
  -    {
  -       return FacesContext.getCurrentInstance().getCurrentInstance();
  -    }
       
       private static String getDefaultSuffix(FacesContext context) throws FacesException {
           ExternalContext externalContext = context.getExternalContext();