You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by eg...@apache.org on 2003/07/14 12:32:06 UTC

cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/publication DefaultSiteTree.java SiteTree.java Publication.java

egli        2003/07/14 03:32:05

  Modified:    src/java/org/apache/lenya/cms/publication
                        DefaultSiteTree.java SiteTree.java Publication.java
  Log:
  Fixed Javadoc problems that were indicated by checkstyle.
  
  Revision  Changes    Path
  1.22      +7 -5      cocoon-lenya/src/java/org/apache/lenya/cms/publication/DefaultSiteTree.java
  
  Index: DefaultSiteTree.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/publication/DefaultSiteTree.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- DefaultSiteTree.java	10 Jul 2003 17:23:24 -0000	1.21
  +++ DefaultSiteTree.java	14 Jul 2003 10:32:05 -0000	1.22
  @@ -360,8 +360,9 @@
       }
   
   	/**
  -	 * Move up the node amongst its siblings. 
  -	 * @param documentid. The document id for the node.
  +	 * Move up the node amongst its siblings.
  +	 * 
  +	 * @param documentid The document id for the node.
   	 * @throws SiteTreeException if the moving failed.
   	 */
   	public void moveUp(String documentid)
  @@ -391,8 +392,9 @@
   	}
   
   	/**
  -	 * Move down the node amongst its siblings. 
  -	 * @param documentid. The document id for the node.
  +	 * Move down the node amongst its siblings.
  +	 * 
  +	 * @param documentid The document id for the node.
   	 * @throws SiteTreeException if the moving failed.
   	 */
   	public void moveDown(String documentid)
  
  
  
  1.14      +7 -6      cocoon-lenya/src/java/org/apache/lenya/cms/publication/SiteTree.java
  
  Index: SiteTree.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/publication/SiteTree.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- SiteTree.java	10 Jul 2003 17:23:24 -0000	1.13
  +++ SiteTree.java	14 Jul 2003 10:32:05 -0000	1.14
  @@ -157,15 +157,16 @@
       SiteTreeNode getNode(String documentId);
   
   	/**
  -	 * Move up the node amongst its siblings. 
  -	 * @param documentid. The document id of the node.
  +	 * Move up the node amongst its siblings.
  +	 * 
  +	 * @param documentid The document id of the node.
   	 * @throws SiteTreeException if the moving failed.
   	 */
   	void moveUp(String documentid) throws SiteTreeException;
   
   	/**
   	 * Move down the node amongst its siblings. 
  -	 * @param documentid. The document id of the node.
  +	 * @param documentid The document id of the node.
   	 * @throws SiteTreeException if the moving failed.
   	 */
   	void moveDown(String documentid) throws SiteTreeException;
  
  
  
  1.13      +28 -11    cocoon-lenya/src/java/org/apache/lenya/cms/publication/Publication.java
  
  Index: Publication.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/publication/Publication.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Publication.java	4 Jul 2003 14:07:39 -0000	1.12
  +++ Publication.java	14 Jul 2003 10:32:05 -0000	1.13
  @@ -1,5 +1,5 @@
   /*
  -$Id
  +$Id$
   <License>
   
    ============================================================================
  @@ -72,10 +72,18 @@
       public static final String INFO_AREA = "info";
       public static final String ADMIN_AREA = "admin";
       
  +	public static final String PUBLICATION_PREFIX = "lenya" + File.separator + "pubs";
  +
       private static final String[] areas = {
           AUTHORING_AREA, LIVE_AREA, INFO_AREA, ADMIN_AREA
       };
   
  +	private String id;
  +	private PublishingEnvironment environment;
  +	private File servletContext;
  +	private DocumentIdToPathMapper mapper = new DefaultDocumentIdToPathMapper();
  +	private String defaultLanguage = "hu";
  +
       /** 
        * Creates a new instance of Publication
        * 
  @@ -96,8 +104,6 @@
           environment = new PublishingEnvironment(servletContextPath, id);
       }
   
  -    private String id;
  -
       /**
        * Returns the publication ID.
        * @return A string value.
  @@ -106,8 +112,6 @@
           return id;
       }
   
  -    private PublishingEnvironment environment;
  -
       /**
        * Returns the publishing environment of this publication.
        * @return A {@link PublishingEnvironment} object.
  @@ -117,8 +121,6 @@
           return environment;
       }
   
  -    private File servletContext;
  -
       /**
        * Returns the servlet context this publication belongs to
        * (usually, the <code>webapps/lenya</code> directory).
  @@ -128,8 +130,6 @@
           return servletContext;
       }
   
  -    public static final String PUBLICATION_PREFIX = "lenya" + File.separator + "pubs";
  -
       /**
        * Returns the publication directory.
        * @return A <code>File</code> object.
  @@ -138,8 +138,6 @@
           return new File(getServletContext(), PUBLICATION_PREFIX + File.separator + getId());
       }
   
  -    private DocumentIdToPathMapper mapper = new DefaultDocumentIdToPathMapper();
  -
       /**
        * DOCUMENT ME!
        *
  @@ -167,4 +165,23 @@
       public static boolean isValidArea(String area) {
           return area != null && Arrays.asList(areas).contains(area);
       }
  +    
  +    /**
  +     * Get the default language
  +     * 
  +     * @return the default language
  +     */
  +    public String getDefaultLanguage() {
  +        return defaultLanguage;
  +    }
  +
  +    /**
  +     * Set the default language
  +     * 
  +     * @param language the default language
  +     */
  +    public void setDefaultLanguage(String language) {
  +        defaultLanguage = language;
  +    }
  +
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org