Author: sskracic Date: 2005-09-02 16:12:21 +0200 (Fri, 02 Sep 2005) New Revision: 755 Modified: ccm-cms-types-agenda/trunk/src/com/arsdigita/cms/contenttypes/AgendaInitializer.java ccm-cms-types-article/trunk/src/com/arsdigita/cms/contenttypes/ArticleInitializer.java ccm-cms-types-bookmark/trunk/src/com/arsdigita/cms/contenttypes/BookmarkInitializer.java ccm-cms-types-event/trunk/src/com/arsdigita/cms/contenttypes/EventInitializer.java ccm-cms-types-faqitem/trunk/src/com/arsdigita/cms/contenttypes/FAQItemInitializer.java ccm-cms-types-glossaryitem/trunk/src/com/arsdigita/cms/contenttypes/GlossaryItemInitializer.java ccm-cms-types-inlinesite/trunk/src/com/arsdigita/cms/contenttypes/InlineSiteInitializer.java ccm-cms-types-job/trunk/src/com/arsdigita/cms/contenttypes/JobInitializer.java ccm-cms-types-legalnotice/trunk/src/com/arsdigita/cms/contenttypes/LegalNoticeInitializer.java ccm-cms-types-minutes/trunk/src/com/arsdigita/cms/contenttypes/MinutesInitializer.java ccm-cms-types-motditem/trunk/src/com/arsdigita/cms/contenttypes/MOTDItemInitializer.java ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/MultiPartArticleLoader.java ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/MultiPartArticleTroikaRickshawUpgrade.java ccm-cms-types-newsitem/trunk/src/com/arsdigita/cms/contenttypes/NewsItemInitializer.java ccm-cms-types-organization/trunk/src/com/arsdigita/cms/contenttypes/OrganizationInitializer.java ccm-cms-types-organization/trunk/src/com/arsdigita/cms/contenttypes/ui/OrganizationImageForm.java ccm-cms-types-pressrelease/trunk/src/com/arsdigita/cms/contenttypes/PressReleaseInitializer.java ccm-cms-types-service/trunk/src/com/arsdigita/cms/contenttypes/ServiceInitializer.java ccm-cms-types-siteproxy/trunk/src/com/arsdigita/cms/contenttypes/SiteProxyInitializer.java Log: NFC: Trimming wildcard imports in all content types. Modified: ccm-cms-types-agenda/trunk/src/com/arsdigita/cms/contenttypes/AgendaInitializer.java =================================================================== --- ccm-cms-types-agenda/trunk/src/com/arsdigita/cms/contenttypes/AgendaInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-agenda/trunk/src/com/arsdigita/cms/contenttypes/AgendaInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,13 +18,6 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.domain.xml.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; -import com.arsdigita.xml.*; - import org.apache.log4j.Logger; /** Modified: ccm-cms-types-article/trunk/src/com/arsdigita/cms/contenttypes/ArticleInitializer.java =================================================================== --- ccm-cms-types-article/trunk/src/com/arsdigita/cms/contenttypes/ArticleInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-article/trunk/src/com/arsdigita/cms/contenttypes/ArticleInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,11 +18,6 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; - import org.apache.log4j.Logger; /** Modified: ccm-cms-types-bookmark/trunk/src/com/arsdigita/cms/contenttypes/BookmarkInitializer.java =================================================================== --- ccm-cms-types-bookmark/trunk/src/com/arsdigita/cms/contenttypes/BookmarkInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-bookmark/trunk/src/com/arsdigita/cms/contenttypes/BookmarkInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,14 +18,8 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; - import org.apache.log4j.Logger; - /** * The CMS initializer. * @@ -45,7 +39,7 @@ Bookmark.BASE_DATA_OBJECT_TYPE); } public String[] getStylesheets() { - return new String[] { + return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/Bookmark.xsl" }; } Modified: ccm-cms-types-event/trunk/src/com/arsdigita/cms/contenttypes/EventInitializer.java =================================================================== --- ccm-cms-types-event/trunk/src/com/arsdigita/cms/contenttypes/EventInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-event/trunk/src/com/arsdigita/cms/contenttypes/EventInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,12 +18,6 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.domain.xml.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; -import com.arsdigita.xml.*; import org.apache.log4j.Logger; /** Modified: ccm-cms-types-faqitem/trunk/src/com/arsdigita/cms/contenttypes/FAQItemInitializer.java =================================================================== --- ccm-cms-types-faqitem/trunk/src/com/arsdigita/cms/contenttypes/FAQItemInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-faqitem/trunk/src/com/arsdigita/cms/contenttypes/FAQItemInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,14 +18,8 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; - import org.apache.log4j.Logger; - /** * The CMS initializer. * @@ -45,7 +39,7 @@ FAQItem.BASE_DATA_OBJECT_TYPE); } public String[] getStylesheets() { - return new String[] { + return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/FAQItem.xsl" }; } Modified: ccm-cms-types-glossaryitem/trunk/src/com/arsdigita/cms/contenttypes/GlossaryItemInitializer.java =================================================================== --- ccm-cms-types-glossaryitem/trunk/src/com/arsdigita/cms/contenttypes/GlossaryItemInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-glossaryitem/trunk/src/com/arsdigita/cms/contenttypes/GlossaryItemInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,11 +18,6 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; - import org.apache.log4j.Logger; /** @@ -43,9 +38,9 @@ super("ccm-cms-types-glossaryitem.pdl.mf", GlossaryItem.BASE_DATA_OBJECT_TYPE); } - + public String[] getStylesheets() { - return new String[] { + return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/GlossaryItem.xsl" }; } Modified: ccm-cms-types-inlinesite/trunk/src/com/arsdigita/cms/contenttypes/InlineSiteInitializer.java =================================================================== --- ccm-cms-types-inlinesite/trunk/src/com/arsdigita/cms/contenttypes/InlineSiteInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-inlinesite/trunk/src/com/arsdigita/cms/contenttypes/InlineSiteInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,11 +18,6 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; - import org.apache.log4j.Logger; /** @@ -43,9 +38,9 @@ super("ccm-cms-types-inlinesite.pdl.mf", InlineSite.BASE_DATA_OBJECT_TYPE); } - + public String[] getStylesheets() { - return new String[] { + return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/InlineSite.xsl" }; } Modified: ccm-cms-types-job/trunk/src/com/arsdigita/cms/contenttypes/JobInitializer.java =================================================================== --- ccm-cms-types-job/trunk/src/com/arsdigita/cms/contenttypes/JobInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-job/trunk/src/com/arsdigita/cms/contenttypes/JobInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,14 +18,6 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.domain.xml.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; -import com.arsdigita.xml.*; - - /** * Initializer * Modified: ccm-cms-types-legalnotice/trunk/src/com/arsdigita/cms/contenttypes/LegalNoticeInitializer.java =================================================================== --- ccm-cms-types-legalnotice/trunk/src/com/arsdigita/cms/contenttypes/LegalNoticeInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-legalnotice/trunk/src/com/arsdigita/cms/contenttypes/LegalNoticeInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,13 +18,6 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.domain.xml.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; -import com.arsdigita.xml.*; - import org.apache.log4j.Logger; /** Modified: ccm-cms-types-minutes/trunk/src/com/arsdigita/cms/contenttypes/MinutesInitializer.java =================================================================== --- ccm-cms-types-minutes/trunk/src/com/arsdigita/cms/contenttypes/MinutesInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-minutes/trunk/src/com/arsdigita/cms/contenttypes/MinutesInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,13 +18,6 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.domain.xml.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; -import com.arsdigita.xml.*; - import org.apache.log4j.Logger; /** Modified: ccm-cms-types-motditem/trunk/src/com/arsdigita/cms/contenttypes/MOTDItemInitializer.java =================================================================== --- ccm-cms-types-motditem/trunk/src/com/arsdigita/cms/contenttypes/MOTDItemInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-motditem/trunk/src/com/arsdigita/cms/contenttypes/MOTDItemInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,10 +18,6 @@ */ package com.arsdigita.cms.contenttypes; -import com.arsdigita.db.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; - /** * The CMS initializer. * Modified: ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/MultiPartArticleLoader.java =================================================================== --- ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/MultiPartArticleLoader.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/MultiPartArticleLoader.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,19 +18,15 @@ */ package com.arsdigita.cms.contenttypes; -import com.arsdigita.cms.*; -import com.arsdigita.cms.contenttypes.AbstractContentTypeLoader; -import com.arsdigita.cms.lifecycle.*; -import com.arsdigita.cms.workflow.*; -import com.arsdigita.util.*; -import com.arsdigita.workflow.simple.*; - +import com.arsdigita.cms.ContentSection; +import com.arsdigita.cms.ContentType; +import com.arsdigita.cms.lifecycle.LifecycleDefinition; +import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.util.parameter.Parameter; import com.arsdigita.util.parameter.URLParameter; - -import java.io.InputStream; -import java.net.URL; +import com.arsdigita.workflow.simple.WorkflowTemplate; import java.net.MalformedURLException; +import java.net.URL; /** * Loader. @@ -52,13 +48,12 @@ return TYPES; } - private URLParameter m_template; public MultiPartArticleLoader() { try { m_template = new URLParameter - ("com.arsdigita.cms.contenttypes.mparticle.template", + ("com.arsdigita.cms.contenttypes.mparticle.template", Parameter.REQUIRED, new URL(null, "resource:///WEB-INF/content-types/com/arsdigita/cms/contenttypes" + Modified: ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/MultiPartArticleTroikaRickshawUpgrade.java =================================================================== --- ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/MultiPartArticleTroikaRickshawUpgrade.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-mparticle/trunk/src/com/arsdigita/cms/contenttypes/MultiPartArticleTroikaRickshawUpgrade.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,15 +18,26 @@ */ package com.arsdigita.cms.contenttypes; -import com.arsdigita.cms.*; -import com.arsdigita.cms.lifecycle.*; -import com.arsdigita.persistence.*; -import com.arsdigita.persistence.metadata.*; -import com.arsdigita.runtime.*; -import com.arsdigita.util.*; -import java.io.*; -import java.net.*; -import java.util.*; +import com.arsdigita.cms.ContentSection; +import com.arsdigita.cms.ContentSectionCollection; +import com.arsdigita.cms.ContentType; +import com.arsdigita.cms.Template; +import com.arsdigita.cms.TemplateManager; +import com.arsdigita.cms.TemplateManagerFactory; +import com.arsdigita.cms.lifecycle.LifecycleDefinition; +import com.arsdigita.cms.lifecycle.LifecycleDefinitionCollection; +import com.arsdigita.persistence.Session; +import com.arsdigita.persistence.SessionManager; +import com.arsdigita.persistence.TransactionContext; +import com.arsdigita.runtime.Startup; +import com.arsdigita.util.Assert; +import com.arsdigita.util.UncheckedWrapperException; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.URL; +import java.util.Date; import org.apache.log4j.Logger; /** Modified: ccm-cms-types-newsitem/trunk/src/com/arsdigita/cms/contenttypes/NewsItemInitializer.java =================================================================== --- ccm-cms-types-newsitem/trunk/src/com/arsdigita/cms/contenttypes/NewsItemInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-newsitem/trunk/src/com/arsdigita/cms/contenttypes/NewsItemInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,13 +18,6 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.domain.xml.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; -import com.arsdigita.xml.*; - import org.apache.log4j.Logger; /** Modified: ccm-cms-types-organization/trunk/src/com/arsdigita/cms/contenttypes/OrganizationInitializer.java =================================================================== --- ccm-cms-types-organization/trunk/src/com/arsdigita/cms/contenttypes/OrganizationInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-organization/trunk/src/com/arsdigita/cms/contenttypes/OrganizationInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,11 +18,6 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; - import org.apache.log4j.Logger; /** @@ -44,7 +39,7 @@ } public String[] getStylesheets() { - return new String[] { + return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/Organization.xsl" }; } Modified: ccm-cms-types-organization/trunk/src/com/arsdigita/cms/contenttypes/ui/OrganizationImageForm.java =================================================================== --- ccm-cms-types-organization/trunk/src/com/arsdigita/cms/contenttypes/ui/OrganizationImageForm.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-organization/trunk/src/com/arsdigita/cms/contenttypes/ui/OrganizationImageForm.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,10 +18,23 @@ */ package com.arsdigita.cms.contenttypes.ui; -import com.arsdigita.bebop.*; -import com.arsdigita.bebop.form.*; -import com.arsdigita.bebop.event.*; -import com.arsdigita.bebop.parameters.*; +import com.arsdigita.bebop.ColumnPanel; +import com.arsdigita.bebop.FormData; +import com.arsdigita.bebop.Form; +import com.arsdigita.bebop.FormProcessException; +import com.arsdigita.bebop.Label; +import com.arsdigita.bebop.PageState; +import com.arsdigita.bebop.SaveCancelSection; +import com.arsdigita.bebop.form.FileUpload; +import com.arsdigita.bebop.form.FormErrorDisplay; +import com.arsdigita.bebop.form.Option; +import com.arsdigita.bebop.form.RadioGroup; +import com.arsdigita.bebop.event.FormInitListener; +import com.arsdigita.bebop.event.FormProcessListener; +import com.arsdigita.bebop.event.FormSectionEvent; +import com.arsdigita.bebop.event.FormSubmissionListener; +import com.arsdigita.bebop.event.FormValidationListener; +import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ImageAsset; @@ -29,8 +42,8 @@ import com.arsdigita.dispatcher.MultipartHttpServletRequest; -import java.io.*; -import java.sql.*; +import java.io.File; +import java.io.IOException; import com.arsdigita.cms.ImageAsset; import com.arsdigita.cms.contenttypes.Organization; @@ -48,7 +61,6 @@ import com.arsdigita.bebop.event.FormSubmissionListener; import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.form.FormErrorDisplay; -import com.arsdigita.bebop.parameters.ParameterModel; import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.cms.ItemSelectionModel; Modified: ccm-cms-types-pressrelease/trunk/src/com/arsdigita/cms/contenttypes/PressReleaseInitializer.java =================================================================== --- ccm-cms-types-pressrelease/trunk/src/com/arsdigita/cms/contenttypes/PressReleaseInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-pressrelease/trunk/src/com/arsdigita/cms/contenttypes/PressReleaseInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,14 +18,6 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.domain.xml.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; -import com.arsdigita.xml.*; - - import org.apache.log4j.Logger; /** Modified: ccm-cms-types-service/trunk/src/com/arsdigita/cms/contenttypes/ServiceInitializer.java =================================================================== --- ccm-cms-types-service/trunk/src/com/arsdigita/cms/contenttypes/ServiceInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-service/trunk/src/com/arsdigita/cms/contenttypes/ServiceInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,13 +18,6 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.domain.xml.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; -import com.arsdigita.xml.*; - import org.apache.log4j.Logger; /** Modified: ccm-cms-types-siteproxy/trunk/src/com/arsdigita/cms/contenttypes/SiteProxyInitializer.java =================================================================== --- ccm-cms-types-siteproxy/trunk/src/com/arsdigita/cms/contenttypes/SiteProxyInitializer.java 2005-09-02 13:53:42 UTC (rev 754) +++ ccm-cms-types-siteproxy/trunk/src/com/arsdigita/cms/contenttypes/SiteProxyInitializer.java 2005-09-02 14:12:21 UTC (rev 755) @@ -18,11 +18,6 @@ */ package com.arsdigita.cms.contenttypes; - -import com.arsdigita.db.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.runtime.*; - import org.apache.log4j.Logger; /** @@ -43,9 +38,9 @@ super("ccm-cms-types-siteproxy.pdl.mf", SiteProxy.BASE_DATA_OBJECT_TYPE); } - + public String[] getStylesheets() { - return new String[] { + return new String[] { "/static/content-types/com/arsdigita/cms/contenttypes/SiteProxy.xsl" }; } |