Nachziehen der Änderungen zu CKEditor in core r4769

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

ccm-cms-types-event/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Event.xml

@@ -7,8 +7,12 @@
 
   <!-- First off the adapters for ContentItemPanel -->
   <xrd:context name="com.arsdigita.cms.dispatcher.SimpleXMLGenerator">
-    <xrd:adapter objectType="com.arsdigita.cms.contenttypes.Event" extends="com.arsdigita.cms.contenttypes.GenericArticle"  traversalClass="com.arsdigita.cms.contenttypes.ContentItemTraversalAdapter">
+
-      <xrd:formatter property="/object/startDate" 
+      <xrd:adapter objectType="com.arsdigita.cms.contenttypes.Event"
+                    extends="com.arsdigita.cms.contenttypes.GenericArticle"  
+             traversalClass="com.arsdigita.cms.contenttypes.ContentItemTraversalAdapter">
+
+          <xrd:formatter property="/object/startDate" 
                         class="com.arsdigita.xml.formatters.DateFormatter"/>
       <xrd:formatter property="/object/endDate" 
                         class="com.arsdigita.xml.formatters.DateFormatter"/>

ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/ui/EventPropertyForm.java

@@ -56,10 +56,11 @@ public class EventPropertyForm extends BasicPageForm
                                           FormInitListener, 
                                           FormSubmissionListener {
 
-    /** Name of this form */
-    public static final String ID = "event_edit";
     private final static org.apache.log4j.Logger s_log =
             org.apache.log4j.Logger.getLogger(EventPropertyForm.class);
+
+    /** Name of this form */
+    public static final String ID = "event_edit";
     private EventPropertiesStep m_step;
     /** event date parameter name */
     public static final String START_DATE = "startDate";

ccm-cms-types-filestorageitem/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/FileStorageItem.xml

@@ -7,7 +7,9 @@
        were not in the parent type, or to remove attributes
    -->
 
+  <!-- First off the adapters for ContentItemPanel -->
   <xrd:context name="com.arsdigita.cms.dispatcher.SimpleXMLGenerator">
+      
     <xrd:adapter objectType="com.arsdigita.cms.contenttypes.FileStorageItem"
                     extends="com.arsdigita.cms.ContentPage"
              traversalClass="com.arsdigita.cms.contenttypes.ContentItemTraversalAdapter">

ccm-cms-types-filestorageitem/src/com/arsdigita/cms/contenttypes/FileStorageItem.java

@@ -72,6 +72,7 @@ public class FileStorageItem extends ContentPage {
         super( type );
     }
 
+    @Override
     public void beforeSave() {
         super.beforeSave();
         
@@ -80,16 +81,19 @@ public class FileStorageItem extends ContentPage {
 
 
     /* accessors *****************************************************/
+    @Override
     public String getDescription() {
         return (String) get( DESCRIPTION );
     }
 
+    @Override
     public void setDescription( String description ) {
         set( DESCRIPTION, description );
     }
 
     // Search stuff to allow the content type to be searchable
     public static final int SUMMARY_LENGTH = 200;
+    @Override
     public String getSearchSummary() {
         return com.arsdigita.util.StringUtils.truncateString(getDescription(),
                                                              SUMMARY_LENGTH,
@@ -109,11 +113,13 @@ public class FileStorageItem extends ContentPage {
         setAssociation(FILE, file);
     }
     /**
-     * instruct search framework to include file contents in the same record
+     * Instruct search framework to include file contents in the same record
      * as the other parts of the page (eg title, metadata etc). See
      * indexAssetsWithPage in com.arsdigita.cms.ContentPage
      *
+     * @return 
      */
+    @Override
      public boolean indexAssetsWithPage() {
          return true;
      }

ccm-cms-types-filestorageitem/src/com/arsdigita/cms/contenttypes/ui/FileStorageItemPropertyForm.java

@@ -35,25 +35,31 @@ import com.arsdigita.cms.util.GlobalizationUtil;
 
 
 /**
- * Form to edit the basic properties of an FileStorageItem. This form can be
+ * Form to edit the basic properties of a <code>FileStorageItem</code>. These 
- * extended to create forms for FileStorageItem subclasses.
+ * are title, name
+ * 
+ * This form can be extended to create forms for FileStorageItem subclasses.
  */
 public class FileStorageItemPropertyForm
-    extends BasicPageForm
+       extends BasicPageForm
-    implements FormProcessListener, FormInitListener, FormSubmissionListener {
+       implements FormProcessListener, FormInitListener, FormSubmissionListener {
-
 
     private FileStorageItemPropertiesStep m_step;
     
     /** Name of this form */
     public static final String ID = "FileStorageItem_edit";
 
+    
+    /**  *****************************
+     *       Constructor Section
+     *   *****************************  */
+
     /**
      * Creates a new form to edit the FileStorageItem object specified by the item
      * selection model passed in.
      *
-     * @param itemModel The ItemSelectionModel to use to obtain the FileStorageItem to
+     * @param itemModel The ItemSelectionModel to use to obtain the FileStorageItem
-     * work on
+     * to work on
      **/
     public FileStorageItemPropertyForm( ItemSelectionModel itemModel ) {
         this(itemModel,null);
@@ -62,16 +68,18 @@ public class FileStorageItemPropertyForm
      * Creates a new form to edit the FileStorageItem object specified by the item
      * selection model passed in.
      *
-     * @param itemModel The ItemSelectionModel to use to obtain the FileStorageItem to
+     * @param itemModel The ItemSelectionModel to use to obtain the FileStorageItem
-     * work on
+     * to work on
      * @param step The FileStorageItemPropertiesStep which controls this form.
      **/
-    public FileStorageItemPropertyForm( ItemSelectionModel itemModel, FileStorageItemPropertiesStep step ) {
+    public FileStorageItemPropertyForm( ItemSelectionModel itemModel, 
+                                        FileStorageItemPropertiesStep step ) {
         super( ID, itemModel );
         m_step = step;
         addSubmissionListener(this);
     }
 
+    
     /**
      * Adds widgets to the form.
      */
@@ -82,7 +90,7 @@ public class FileStorageItemPropertyForm
      // add( new Label( GlobalizationUtil.globalize("cms.contenttypes.ui.lead") ) );
         ParameterModel descriptionParam = new StringParameter( FileStorageItem
                                                                .DESCRIPTION );
-//        descriptionParam.addParameterListener( new NotNullValidationListener() );
+    //   descriptionParam.addParameterListener( new NotNullValidationListener() );
         CMSDHTMLEditor description = new CMSDHTMLEditor( descriptionParam );
         description.setLabel(GlobalizationUtil.globalize("cms.contenttypes.ui.lead"));
         description.setCols( 40 );

ccm-sci-bundle/bundles/devel/cfg/integration.properties

@@ -196,7 +196,7 @@ com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCat
 # THEMEDIRECTOR configuration parameters
 # ##############################################################################
 # Required to point to the package containing the theme to copy from when creating
-# a new theme! (In addition to default_theme_path. Otherwise no files are copied!
+# a new theme! (In addition to default_theme_path). Otherwise no files are copied!
 themedirector.default_theme_manifest=ccm-sci-bundle.web.mf
 # Required to denote the dir containing the default theme!
 themedirector.default_theme_path=themes/scicms-default