From 3c7fbe8a0736ed1662e81e0d509573a6545c5532 Mon Sep 17 00:00:00 2001
From: quasi <quasi@8810af33-2d31-482b-a856-94f89814c4df>
Date: Tue, 17 May 2011 18:19:49 +0000
Subject: [PATCH] CT Image
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 * Suche funktioniert nun
 * Problem mit dem Event-Handler behoben

Damit sollten nun alle Punkte für diesen CT erledigt sein.

git-svn-id: https://svn.libreccm.org/ccm/trunk@918 8810af33-2d31-482b-a856-94f89814c4df
---
 .../com/arsdigita/cms/contenttypes/Image.xml        | 12 ++++++++++++
 .../src/com/arsdigita/cms/contenttypes/Image.java   | 13 +++++++++++--
 .../cms/contenttypes/ImageInitializer.java          | 11 +++++++++--
 .../cms/contenttypes/ui/ImagePropertiesStep.java    |  1 -
 .../cms/contenttypes/ui/ImagePropertyForm.java      |  2 +-
 5 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/ccm-cms-types-image/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Image.xml b/ccm-cms-types-image/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Image.xml
index cdc6f0ed6..fb00bb4a0 100644
--- a/ccm-cms-types-image/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Image.xml
+++ b/ccm-cms-types-image/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Image.xml
@@ -13,4 +13,16 @@
             </xrd:associations>
         </xrd:adapter>
     </xrd:context>
+
+    <xrd:context name="com.arsdigita.cms.search.ContentPageMetadataProvider">
+        <xrd:adapter objectType="com.arsdigita.cms.contenttypes.Image" extends="com.arsdigita.cms.ContentItem" traversalClass="com.arsdigita.cms.contenttypes.ContentItemTraversalAdapter">
+            <xrd:attributes rule="exclude">
+                <xrd:property name="/object/image"/>
+                <xrd:property name="/object/thumbnail"/>
+            </xrd:attributes>
+            <xrd:associations rule="include">
+                <xrd:property name="/object/textAsset"/>
+            </xrd:associations>
+        </xrd:adapter>
+    </xrd:context>
 </xrd:adapters>
diff --git a/ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/Image.java b/ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/Image.java
index 1688fc045..95aeb95ee 100755
--- a/ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/Image.java
+++ b/ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/Image.java
@@ -30,9 +30,9 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * This content type represents an article.
+ * 
  *
- * @version $Revision: #6 $ $Date: 2004/08/17 $
+ * @author Sören Bernstein
  */
 public class Image extends ContentPage {
 
@@ -97,6 +97,15 @@ public class Image extends ContentPage {
         super(type);
     }
 
+    /**
+     * @return the base PDL object type for this item. Child classes should
+     *  override this method to return the correct value
+     */
+    @Override
+    public String getBaseDataObjectType() {
+        return BASE_DATA_OBJECT_TYPE;
+    }
+
     public ImageAsset getImage() {
         DataObject dobj = (DataObject) get(IMAGE);
         if (dobj != null) {
diff --git a/ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/ImageInitializer.java b/ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/ImageInitializer.java
index 100eaebda..278b31ed7 100755
--- a/ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/ImageInitializer.java
+++ b/ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/ImageInitializer.java
@@ -18,7 +18,6 @@
  */
 package com.arsdigita.cms.contenttypes;
 
-import com.arsdigita.cms.ContentPage;
 import org.apache.log4j.Logger;
 
 /**
@@ -34,10 +33,18 @@ public class ImageInitializer extends ContentTypeInitializer {
     private static final Logger s_log = Logger.getLogger(ImageInitializer.class);
 
     public ImageInitializer() {
-        super("ccm-cms-types-image.pdl.mf", ContentPage.BASE_DATA_OBJECT_TYPE);
+        super("ccm-cms-types-image.pdl.mf", Image.BASE_DATA_OBJECT_TYPE);
     }
 
+    @Override
     public String getTraversalXML() {
         return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Image.xml";
     }
+
+    @Override
+    public String[] getStylesheets() {
+        return new String[] {
+            "/static/content-types/com/arsdigita/cms/contenttypes/Image.xsl" };
+    }
+
 }
diff --git a/ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/ui/ImagePropertiesStep.java b/ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/ui/ImagePropertiesStep.java
index d88a85cd7..15a916706 100755
--- a/ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/ui/ImagePropertiesStep.java
+++ b/ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/ui/ImagePropertiesStep.java
@@ -221,7 +221,6 @@ public class ImagePropertiesStep extends SimpleEditStep {
             if (image != null && uploadSheet.getSaveCancelSection().getSaveButton().isSelected(fse.getPageState())) {
 
                 image.setImage(imageAsset);
-                image.save();
             }
         }
 
diff --git a/ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/ui/ImagePropertyForm.java b/ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/ui/ImagePropertyForm.java
index fd02399a6..c82a8a35b 100755
--- a/ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/ui/ImagePropertyForm.java
+++ b/ccm-cms-types-image/src/com/arsdigita/cms/contenttypes/ui/ImagePropertyForm.java
@@ -244,7 +244,7 @@ public class ImagePropertyForm
             image.setOrigin((String) data.get(Image.ORIGIN));
             image.setOriginalSize((String) data.get(Image.ORIGSIZE));
 
-            image.save();
+            m_step.cancelStreamlinedCreation(fse.getPageState());
         }
     }
 }