From 38c340cd6f512802f7edfb159f5f9a4ea41726cf Mon Sep 17 00:00:00 2001 From: jensp Date: Tue, 16 Nov 2010 20:02:51 +0000 Subject: [PATCH] =?UTF-8?q?AbstractContentTypeLoader#createPedigree()=20um?= =?UTF-8?q?=20Log-Ausgabe=20erg=C3=A4nzt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@613 8810af33-2d31-482b-a856-94f89814c4df --- .../AbstractContentTypeLoader.java | 53 ++++++++++++------- 1 file changed, 33 insertions(+), 20 deletions(-) diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/AbstractContentTypeLoader.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/AbstractContentTypeLoader.java index a85b9b361..e6a904b4e 100755 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/AbstractContentTypeLoader.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/AbstractContentTypeLoader.java @@ -81,16 +81,18 @@ public abstract class AbstractContentTypeLoader extends PackageLoader { List types = handler.getContentTypes(); Session ssn = ctx.getSession(); - DataCollection sections = ssn.retrieve(ContentSection.BASE_DATA_OBJECT_TYPE); + DataCollection sections = ssn.retrieve( + ContentSection.BASE_DATA_OBJECT_TYPE); while (sections.next()) { - ContentSection section = (ContentSection) DomainObjectFactory.newInstance(sections.getDataObject()); + ContentSection section = (ContentSection) DomainObjectFactory. + newInstance(sections.getDataObject()); if (!isLoadableInto(section)) { continue; } LifecycleDefinitionCollection ldc = - section.getLifecycleDefinitions(); + section.getLifecycleDefinitions(); LifecycleDefinition ld = null; if (ldc.next()) { ld = ldc.getLifecycleDefinition(); @@ -118,10 +120,11 @@ public abstract class AbstractContentTypeLoader extends PackageLoader { } protected void prepareSection(final ContentSection section, - final ContentType type, - final LifecycleDefinition ld, - final WorkflowTemplate wf) { - ContentTypeLifecycleDefinition.updateLifecycleDefinition(section, type, ld); + final ContentType type, + final LifecycleDefinition ld, + final WorkflowTemplate wf) { + ContentTypeLifecycleDefinition.updateLifecycleDefinition(section, type, + ld); ContentTypeWorkflowTemplate.updateWorkflowTemplate(section, type, wf); } @@ -163,12 +166,12 @@ public abstract class AbstractContentTypeLoader extends PackageLoader { * be called by the loader class by overriding prepareSection */ protected Template setDefaultTemplate(final String name, - final String label, - final InputStream templateIs, - final ContentSection section, - final ContentType type, - final LifecycleDefinition ld, - final WorkflowTemplate wf) { + final String label, + final InputStream templateIs, + final ContentSection section, + final ContentType type, + final LifecycleDefinition ld, + final WorkflowTemplate wf) { final Template template = new Template(); template.setName(name); template.setLabel(label); @@ -177,7 +180,8 @@ public abstract class AbstractContentTypeLoader extends PackageLoader { Assert.isTrue(templateIs != null, "Template not found"); - final BufferedReader input = new BufferedReader(new InputStreamReader(templateIs)); + final BufferedReader input = new BufferedReader(new InputStreamReader( + templateIs)); final StringBuffer body = new StringBuffer(); @@ -194,7 +198,8 @@ public abstract class AbstractContentTypeLoader extends PackageLoader { template.setText(body.toString()); - TemplateManagerFactory.getInstance().addTemplate(section, type, template, TemplateManager.PUBLIC_CONTEXT); + TemplateManagerFactory.getInstance().addTemplate(section, type, template, + TemplateManager.PUBLIC_CONTEXT); template.publish(ld, new Date()); return template; @@ -218,7 +223,8 @@ public abstract class AbstractContentTypeLoader extends PackageLoader { ContentType ct = cts.getContentType(); try { - Class.forName(type.getClassName()).asSubclass(Class.forName(ct.getClassName())); + Class.forName(type.getClassName()).asSubclass(Class.forName(ct. + getClassName())); } catch (Exception ex) { // This cast is not valid so type is not a sublacss of ct continue; @@ -228,10 +234,11 @@ public abstract class AbstractContentTypeLoader extends PackageLoader { // or if the current ancestor list is longer than that one from the possible // parent earlier found if (!type.getClassName().equals(ct.getClassName()) - && (parent == null + && (parent == null || (parent.getAncestors() != null - && ct.getAncestors() != null - && parent.getAncestors().length() < ct.getAncestors().length()))) { + && ct.getAncestors() != null + && parent.getAncestors().length() < ct.getAncestors(). + length()))) { parent = ct; } } @@ -241,13 +248,19 @@ public abstract class AbstractContentTypeLoader extends PackageLoader { if (parent.getAncestors() != null) { String parentAncestors = parent.getAncestors(); - StringTokenizer strTok = new StringTokenizer(parentAncestors, "/"); + StringTokenizer strTok = new StringTokenizer(parentAncestors, + "/"); // Add parent ancestors to this content types ancestor list // Also while we iterate through the list, we also need to add // this content type as sibling to all entries in the ancestor list while (strTok.hasMoreElements()) { + Object token; + token = strTok.nextElement(); + s_log.error(String.format( + "Trying to convert '%s' to BigDecimal...", token)); + //BigDecimal ctID = (BigDecimal) strTok.nextElement(); BigDecimal ctID = (BigDecimal) strTok.nextElement(); // Get the current content type