Ergaenzung zu r2149 / 2150

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

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

@@ -45,6 +45,9 @@ public abstract class ContentAssetInitializer extends CompoundInitializer {
 
     /** Logger object for this class  */
     private static Logger s_log = Logger.getLogger(ContentAssetInitializer.class);
+    /** Directory holding the assets traversal adapter file(s)                */
+    public static final String TRAVERSAL_ADAPTER_BASE_DIR = 
+                  "/WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/";
 
     /**
      * Constructor, sets specific manifest file and initializes PDL.
@@ -72,7 +75,6 @@ public abstract class ContentAssetInitializer extends CompoundInitializer {
     @Override
     public void init(DomainInitEvent evt) {
         s_log.info("ContentAssetInitializer init running...");
-        // System.err.println("ContentAssetInitializer init running...");
         
         super.init(evt);
 
@@ -114,28 +116,13 @@ public abstract class ContentAssetInitializer extends CompoundInitializer {
      */
     public abstract Class getAuthoringStep();
 
-// DEPRECATED - API Change  (pb - 2010-05-23) - will be removed asap
-// Initializer is meant to execute once at startup to set basic features for
-// operation. AuthoringStepLabel and AuthoringStepDescription are part of the UI
-// and have to be localized, i.e. determined each time a user invokes the UI.
-// This is contrary to the concept of an initializer.
-//
-// Accordingly in AuthoringStep setLabel is set deprecated and replaced by
-// setLabelKey to identify an Authoring Step.
-//
-// As an temporary measure Label / Description from FSIglobalize will be used
-// by registerAssetStep method (see above).
-// XXX todo: Replace label by labelKey overall in the appropriate code!
-//
     /**
      * The label for the authoring step
-     * @deprecated   (see above)
      */
     public abstract GlobalizedMessage getAuthoringStepLabel();
 
     /**
      * The description for the authoring step
-     * @deprecated (see above)
      */
     public abstract GlobalizedMessage getAuthoringStepDescription();
 

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

@@ -64,6 +64,9 @@ public abstract class ContentTypeInitializer extends CompoundInitializer {
     /** Directory holding the internal base theme                             */
     public static final String INTERNAL_THEME_TYPES_DIR = INTERNAL_THEME_DIR 
                                                           + "contenttypes/";
+    /** Directory holding the content types traversal adapter file(s)         */
+    public static final String TRAVERSAL_ADAPTER_BASE_DIR = 
+                  "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/";
 
     /**
      * Constructor, sets specific manifest file and object type.
@@ -127,48 +130,6 @@ public abstract class ContentTypeInitializer extends CompoundInitializer {
 
     }
 
-    // Up to version 6.5 ContentTypeInitilizer used init(LegacyInitEvent) for
-    // initialization, even though it actually initializes the domain coupling
-    // machinery which is the domain of init(DomainInitEvent). It even didn't
-    // use any of the legacy initialization features (enterprise.init file).
-    // Switched to domain init because legacy init is deprecated and we will get
-    // rid of it. Retained here commented out for documentation purpose during
-    // transition of contributed content types.
-/*  public void init(LegacyInitEvent evt) {
-        super.init(evt);
-
-        final String traversal = getTraversalXML();
-        if (!StringUtils.emptyString(traversal)) {
-            XML.parseResource
-                (traversal,
-                 new TraversalHandler());
-        }
-
-        try {
-
-            ContentType type = ContentType.findByAssociatedObjectType(m_objectType);
-
-            MetadataProviderRegistry.registerAdapter(
-                m_objectType,
-                new ContentPageMetadataProvider());
-
-            final String[] stylesheets = getStylesheets();
-            for (int i = 0; i < stylesheets.length; i++) {
-                String stylesheet = stylesheets[i];
-                ContentType.registerXSLFile(type, stylesheet);
-
-            }
-        } catch (com.arsdigita.domain.DataObjectNotFoundException e) {
-            s_log.debug("Unable to register the stylesheet for " +
-                        m_objectType +
-                        " because the content type was not found. " + 
-                        "This is normal during the load script but " +
-                        "should not appear during server startup.");
-        }
-
-    }
-*/
-    
     /**
      * Retrieves the content types traversal adapter.
      * Has to be overwritten by each specific content type to provide its

ccm-cms/src/com/arsdigita/cms/ui/authoring/SimpleEditStep.java

@@ -18,27 +18,22 @@
  */
 package com.arsdigita.cms.ui.authoring;
 
-import com.arsdigita.bebop.Label;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
 import com.arsdigita.bebop.Page;
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.event.ActionEvent;
 import com.arsdigita.bebop.event.ActionListener;
-import com.arsdigita.bebop.event.PrintEvent;
-import com.arsdigita.bebop.event.PrintListener;
 import com.arsdigita.bebop.event.RequestEvent;
 import com.arsdigita.bebop.event.RequestListener;
 import com.arsdigita.bebop.parameters.StringParameter;
-import com.arsdigita.cms.ContentItem;
 import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.cms.dispatcher.Utilities;
 import com.arsdigita.cms.ui.ContentItemPage;
 import com.arsdigita.cms.ui.SecurityPropertyEditor;
 import com.arsdigita.toolbox.ui.ComponentAccess;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 import org.apache.log4j.Logger;
 
@@ -47,7 +42,6 @@ import org.apache.log4j.Logger;
  * Extends {@link SecurityPropertyEditor} and provides authoring kit
  * integration. See the authoring kit documentation for more
  * info.
- * <p>
  *
  * Child classes should
  * a). call setDisplayComponent()
@@ -113,13 +107,16 @@ public class SimpleEditStep extends SecurityPropertyEditor
      * @param paramSuffix Additional global parameter name suffix if
      * there are multiple SimpleEditStep instances in an authoring kit.
      */
-    public SimpleEditStep(ItemSelectionModel itemModel, AuthoringKitWizard parent, String paramSuffix) {
+    public SimpleEditStep(ItemSelectionModel itemModel, 
+                          AuthoringKitWizard parent, 
+                          String paramSuffix) {
         super();
         m_parent = parent;
         m_itemModel = itemModel;
 
         m_streamlinedCreationParam = 
-            new StringParameter(parent.getContentType().getAssociatedObjectType() + "_properties_done" + paramSuffix);
+            new StringParameter(parent.getContentType().getAssociatedObjectType() 
+                               + "_properties_done" + paramSuffix);
         
             
         parent.getList().addActionListener(new ActionListener() {
@@ -141,7 +138,7 @@ public class SimpleEditStep extends SecurityPropertyEditor
     }
 
     /** 
-     * Registers globa state param for cancelling streamlined
+     * Registers global state param for cancelling streamlined
      * creation
      */
     @Override