Various formatting and documentation.

git-svn-id: https://svn.libreccm.org/ccm/trunk@2019 8810af33-2d31-482b-a856-94f89814c4df

ccm-cms/src/com/arsdigita/cms/CMSConfig.java

@@ -73,8 +73,7 @@ public final class CMSConfig extends AbstractConfig {
      * Returns the singleton configuration record for the content section
      * environment.
      *
-     * @return The
+     * @return The <code>CMSConfig</code> record; it cannot be null
-     * <code>ContentSectionConfig</code> record; it cannot be null
      */
     public static synchronized CMSConfig getInstance() {
         if (s_config == null) {

ccm-cms/src/com/arsdigita/cms/ContentSection.java

@@ -124,6 +124,9 @@ public class ContentSection extends Application {
     protected static final String WF_TEMPLATES = "associatedWorkflowTemplates";
     private final static String ITEM_QUERY = "com.arsdigita.cms.ItemsInSection";
     private final static String SECTION_ID = "sectionId";
+    
+    private static final CMSConfig s_config = CMSConfig.getInstance();
+/*  DO NOT use CMSConfig constructor to instantiate !
     private static final CMSConfig s_config = new CMSConfig();
 
     static {
@@ -131,6 +134,7 @@ public class ContentSection extends Application {
         s_config.load();
         s_log.debug("Static initializer finished...");
     }
+*/ 
     // Cached properties
     PageResolver m_pageResolver = null;
     ItemResolver m_itemResolver = null;

ccm-cms/src/com/arsdigita/cms/Initializer.java

@@ -40,6 +40,7 @@ import com.arsdigita.cms.search.LaunchDateFilterType;
 import com.arsdigita.cms.search.LuceneQueryEngine;
 import com.arsdigita.cms.search.VersionFilterType;
 import com.arsdigita.cms.ui.authoring.AuthoringKitWizard;
+import com.arsdigita.cms.util.LanguageUtil;
 import com.arsdigita.cms.workflow.CMSEngine;
 import com.arsdigita.cms.workflow.CMSTask;
 import com.arsdigita.cms.workflow.CMSTaskType;
@@ -51,6 +52,7 @@ import com.arsdigita.domain.DomainObjectFactory;
 import com.arsdigita.domain.DomainObjectInstantiator;
 import com.arsdigita.domain.xml.TraversalHandler;
 import com.arsdigita.kernel.ACSObjectInstantiator;
+import com.arsdigita.kernel.Kernel;
 import com.arsdigita.kernel.NoValidURLException;
 import com.arsdigita.kernel.URLFinder;
 import com.arsdigita.kernel.URLFinderNotFoundException;
@@ -72,16 +74,12 @@ import com.arsdigita.search.filters.CategoryFilterType;
 import com.arsdigita.search.filters.ContentSectionFilterType;
 import com.arsdigita.search.filters.ObjectTypeFilterType;
 import com.arsdigita.search.filters.PermissionFilterType;
+import com.arsdigita.templating.PatternStylesheetResolver;
 import com.arsdigita.util.UncheckedWrapperException;
 import com.arsdigita.workflow.simple.Engine;
 import com.arsdigita.workflow.simple.Workflow;
 import com.arsdigita.workflow.simple.WorkflowTemplate;
-
 import com.arsdigita.xml.XML;
-import com.arsdigita.templating.PatternStylesheetResolver;
-
-import com.arsdigita.cms.util.LanguageUtil;
-import com.arsdigita.kernel.Kernel;
 
 import org.apache.log4j.Logger;
 

ccm-cms/src/com/arsdigita/cms/LoaderConfig.java

@@ -28,9 +28,9 @@ import org.apache.log4j.Logger;
 
 //  IMPLEMENTATION NOTE
 //  Class is a result of migrating the old enterprise.init based 
-//  initialization process and not yet completed. Functionality is
+//  initialization process. Functionality is   basically OK so far, but
-//  basically OK so far, but code urgently needs cleaning up and a
+//  code urgently needs cleaning up and a check for useful bits.
-//  check for useful bits.
+
 /**
  * Container for various configuration parameters for ccm-cms package loader.
  *

ccm-cms/src/com/arsdigita/cms/contenttypes/AbstractContentTypeLoader.java

@@ -36,7 +36,7 @@ import com.arsdigita.persistence.Session;
 import com.arsdigita.runtime.ScriptContext;
 import com.arsdigita.util.Assert;
 import com.arsdigita.util.UncheckedWrapperException;
-import com.arsdigita.workflow.simple.TaskCollection;
+// import com.arsdigita.workflow.simple.TaskCollection;
 import com.arsdigita.workflow.simple.WorkflowTemplate;
 import com.arsdigita.xml.XML;
 import java.io.BufferedReader;

ccm-themedirector/src/com/arsdigita/themedirector/Loader.java

@@ -23,8 +23,8 @@ import com.arsdigita.kernel.Kernel;
 import com.arsdigita.kernel.KernelExcursion;
 import com.arsdigita.loader.PackageLoader;
 import com.arsdigita.runtime.ScriptContext;
-import com.arsdigita.web.ApplicationType;
 import com.arsdigita.web.Application;
+import com.arsdigita.web.ApplicationType;
 
 import org.apache.log4j.Logger;