From e20f3426b07c36e3f5673a4426081ebd646e19f3 Mon Sep 17 00:00:00 2001 From: pb Date: Sat, 17 Apr 2010 07:44:02 +0000 Subject: [PATCH] Verschiedene deprecated Klassen und Methoden entfernt. git-svn-id: https://svn.libreccm.org/ccm/trunk@370 8810af33-2d31-482b-a856-94f89814c4df --- .../content-section/LifecycleService.pdl | 2 +- .../query-getEnabledUserTasks.ora.pdl | 2 +- .../query-getEnabledUserTasks.pg.pdl | 2 +- ccm-cms/src/com/arsdigita/cms/Article.java | 2 +- .../cms/ArticleImageAssociation.java | 2 +- .../cms/AuthoringKitStepAssociation.java | 5 +- .../src/com/arsdigita/cms/AuthoringStep.java | 5 +- .../cms/AuthoringStepCollection.java | 8 +- .../src/com/arsdigita/cms/BinaryAsset.java | 4 +- .../cms/CategoryTemplateMapping.java | 2 +- .../src/com/arsdigita/cms/ContentBundle.java | 30 +- .../src/com/arsdigita/cms/ContentPage.java | 2 +- .../arsdigita/cms/ContentSectionConfig.java | 11 +- .../ContentSectionConfig_parameter.properties | 2 +- .../src/com/arsdigita/cms/ContentType.java | 2 +- .../arsdigita/cms/ContentTypeCollection.java | 8 +- .../cms/ContentTypeLifecycleDefinition.java | 5 +- .../cms/ContentTypeWorkflowTemplate.java | 6 +- .../cms/DataQueryExistsListener.java | 3 +- .../arsdigita/cms/DefaultDomainService.java | 3 +- .../arsdigita/cms/DefaultTemplateManager.java | 4 +- .../src/com/arsdigita/cms/DomainCopier.java | 6 +- .../com/arsdigita/cms/ExtraXMLGenerator.java | 4 +- ccm-cms/src/com/arsdigita/cms/FileAsset.java | 4 +- .../arsdigita/cms/FileAssetCollection.java | 9 +- ccm-cms/src/com/arsdigita/cms/Folder.java | 4 - ccm-cms/src/com/arsdigita/cms/ImageAsset.java | 6 +- .../arsdigita/cms/ImageAssetCollection.java | 9 +- .../src/com/arsdigita/cms/Initializer.java | 18 +- .../com/arsdigita/cms/ItemSelectionModel.java | 2 - .../arsdigita/cms/ItemTemplateCollection.java | 3 +- .../arsdigita/cms/ItemTemplateMapping.java | 2 +- ccm-cms/src/com/arsdigita/cms/Loader.java | 2 +- .../src/com/arsdigita/cms/ObjectCopier.java | 6 +- .../src/com/arsdigita/cms/PageLocations.java | 5 +- .../com/arsdigita/cms/ReusableImageAsset.java | 6 +- .../com/arsdigita/cms/SearchFormatter.java | 2 +- .../cms/SectionLocaleCollection.java | 8 +- .../cms/SectionTemplateCollection.java | 4 +- .../arsdigita/cms/SectionTemplateMapping.java | 4 +- ccm-cms/src/com/arsdigita/cms/Security.java | 4 +- .../com/arsdigita/cms/SecurityManager.java | 6 +- ccm-cms/src/com/arsdigita/cms/Template.java | 2 +- .../com/arsdigita/cms/TemplateCollection.java | 4 +- .../com/arsdigita/cms/TemplateManager.java | 3 +- .../arsdigita/cms/TemplateManagerFactory.java | 3 +- ccm-cms/src/com/arsdigita/cms/TextAsset.java | 3 +- ccm-cms/src/com/arsdigita/cms/TextPage.java | 2 +- .../src/com/arsdigita/cms/VersionCopier.java | 6 +- .../src/com/arsdigita/cms/VersionUpdater.java | 4 +- .../cms/contenttypes/ContentGroup.java | 2 +- .../contenttypes/ContentGroupAssociation.java | 2 +- .../contenttypes/ui/ContentGroupItemList.java | 3 +- .../cms/contenttypes/ui/ImageDisplay.java | 2 +- .../arsdigita/cms/dispatcher/BaseAsset.java | 2 +- .../cms/dispatcher/CMSDispatcher.java | 2 +- .../com/arsdigita/cms/dispatcher/CMSPage.java | 2 +- .../com/arsdigita/cms/dispatcher/Cache.java | 2 +- .../dispatcher/ContentCenterDispatcher.java | 2 +- .../cms/dispatcher/FileDispatcher.java | 3 +- .../cms/dispatcher/ItemResolver.java | 6 +- .../arsdigita/cms/dispatcher/MasterPage.java | 3 +- .../dispatcher/MultilingualItemResolver.java | 38 +- .../cms/dispatcher/PageResolver.java | 3 +- .../arsdigita/cms/dispatcher/Resource.java | 3 +- .../cms/dispatcher/ResourceHandler.java | 3 +- .../cms/dispatcher/ResourceHandlerImpl.java | 4 +- .../cms/dispatcher/ResourceMapping.java | 3 +- .../cms/dispatcher/ResourceType.java | 5 +- .../cms/dispatcher/ServiceDispatcher.java | 4 +- .../arsdigita/cms/dispatcher/SimpleCache.java | 3 +- .../cms/dispatcher/SimpleItemResolver.java | 3 +- .../cms/dispatcher/SimplePageResolver.java | 5 +- .../cms/dispatcher/SimpleXMLGenerator.java | 3 +- .../arsdigita/cms/dispatcher/StreamAsset.java | 3 +- .../arsdigita/cms/dispatcher/StreamImage.java | 3 +- .../cms/dispatcher/TemplateResolver.java | 2 +- .../arsdigita/cms/dispatcher/Utilities.java | 2 +- .../cms/dispatcher/XMLGenerator.java | 2 +- ccm-cms/src/com/arsdigita/cms/enterprise.init | 4 +- .../cms/installer/SectionInitializer.java | 10 +- .../cms/installer/ServiceInstaller.java | 3 +- .../cms/installer/WorkspaceInstaller.java | 3 +- .../com/arsdigita/cms/lifecycle/Duration.java | 2 +- .../arsdigita/cms/lifecycle/Initializer.java | 4 +- .../arsdigita/cms/lifecycle/Lifecycle.java | 2 +- .../cms/lifecycle/LifecycleDefinition.java | 2 +- .../LifecycleDefinitionCollection.java | 2 +- .../cms/lifecycle/LifecycleEvent.java | 2 +- .../cms/lifecycle/LifecycleListener.java | 2 +- .../cms/lifecycle/LifecycleService.java | 2 +- .../com/arsdigita/cms/lifecycle/Phase.java | 2 +- .../lifecycle/PublishLifecycleListener.java | 2 +- .../arsdigita/cms/lifecycle/Scheduler.java | 2 +- .../cms/lifecycle/SchedulerTask.java | 2 +- .../com/arsdigita/cms/lifecycle/package.html | 2 +- .../cms/ui/ACSObjectRequestLocal.java | 8 +- .../com/arsdigita/cms/ui/AccessDenied.java | 4 +- .../arsdigita/cms/ui/ArticleImageDisplay.java | 3 +- .../src/com/arsdigita/cms/ui/BackButton.java | 4 +- .../com/arsdigita/cms/ui/BaseAdminPane.java | 4 - .../com/arsdigita/cms/ui/BaseDeleteForm.java | 4 - .../src/com/arsdigita/cms/ui/BaseForm.java | 4 - .../com/arsdigita/cms/ui/BaseItemPane.java | 4 - .../src/com/arsdigita/cms/ui/BaseTree.java | 4 - .../src/com/arsdigita/cms/ui/BrowsePane.java | 4 - .../com/arsdigita/cms/ui/CMSContainer.java | 4 +- ccm-cms/src/com/arsdigita/cms/ui/CMSForm.java | 4 - .../com/arsdigita/cms/ui/CategoryForm.java | 4 +- .../cms/ui/ContentItemContextBar.java | 4 - .../arsdigita/cms/ui/ContentItemNavbar.java | 3 +- .../com/arsdigita/cms/ui/ContentItemPage.java | 4 - .../arsdigita/cms/ui/ContentPageTable.java | 2 - .../cms/ui/ContentSectionComponent.java | 4 +- .../cms/ui/ContentSectionContainer.java | 7 +- .../cms/ui/ContentSectionContextBar.java | 4 - .../cms/ui/ContentSectionNavbar.java | 6 +- .../arsdigita/cms/ui/ContentSectionPage.java | 4 - .../cms/ui/ContentSectionRequestLocal.java | 8 +- .../com/arsdigita/cms/ui/ControlButton.java | 4 +- .../cms/ui/DataCollectionBuilder.java | 6 +- .../ui/DataCollectionOptionPrintListener.java | 6 +- .../cms/ui/DataQueryOptionPrintListener.java | 6 +- .../cms/ui/DefaultImageBrowserModel.java | 4 +- .../ui/DefaultImageBrowserModelBuilder.java | 4 +- .../cms/ui/DomainObjectRenderer.java | 4 +- .../cms/ui/EmptyImageBrowserModel.java | 4 +- .../arsdigita/cms/ui/FileUploadSection.java | 4 +- .../com/arsdigita/cms/ui/FlatItemList.java | 6 +- .../arsdigita/cms/ui/FolderBreadcrumbNav.java | 3 +- .../com/arsdigita/cms/ui/FolderContent.java | 4 +- .../arsdigita/cms/ui/FolderProperties.java | 4 +- .../cms/ui/FormSecurityListener.java | 6 +- .../com/arsdigita/cms/ui/GlobalNavbar.java | 6 +- .../arsdigita/cms/ui/GlobalNavigation.java | 6 +- ...java => HorizontalLine.java.nolongerInUse} | 4 +- .../com/arsdigita/cms/ui/ImageBrowser.java | 4 +- .../arsdigita/cms/ui/ImageBrowserModel.java | 4 +- .../cms/ui/ImageBrowserModelBuilder.java | 4 +- .../com/arsdigita/cms/ui/ImageChooser.java | 4 +- .../com/arsdigita/cms/ui/ImageDisplay.java | 4 +- .../com/arsdigita/cms/ui/ItemListModel.java | 4 +- .../arsdigita/cms/ui/ItemPropertySheet.java | 2 - .../src/com/arsdigita/cms/ui/ItemSearch.java | 4 +- .../cms/ui/ItemSearchBrowsePane.java | 2 - .../cms/ui/ItemSearchFolderBrowser.java | 2 - .../arsdigita/cms/ui/ItemSearchSection.java | 4 +- .../cms/ui/ItemSearchSectionInline.java | 4 +- .../cms/ui/LocalesListModelBuilder.java | 4 +- ccm-cms/src/com/arsdigita/cms/ui/Logout.java | 3 +- ccm-cms/src/com/arsdigita/cms/ui/Navbar.java | 4 +- .../com/arsdigita/cms/ui/PartyAddForm.java | 4 +- .../com/arsdigita/cms/ui/PartySearchForm.java | 6 +- .../src/com/arsdigita/cms/ui/ReportPane.java | 2 +- .../cms/ui/SearchResultRedirector.java | 4 +- .../cms/ui/SectionConfigurationPage.java | 4 +- .../cms/ui/SecurityPropertyEditor.java | 7 +- .../cms/ui/SingleImageSelectionModel.java | 8 +- .../com/arsdigita/cms/ui/SortableList.java | 4 +- .../src/com/arsdigita/cms/ui/TasksPanel.java | 8 +- .../ui/UniqueItemNameValidationListener.java | 5 +- .../src/com/arsdigita/cms/ui/UserAddForm.java | 4 +- .../com/arsdigita/cms/ui/UserSearchForm.java | 4 +- .../arsdigita/cms/ui/WorkspaceContextBar.java | 6 +- .../com/arsdigita/cms/ui/WorkspacePage.java | 6 +- .../cms/ui/authoring/ArticleImage.java | 3 +- .../cms/ui/authoring/ArticleImageChooser.java | 3 +- .../ui/authoring/AuthoringKitSelector.java | 4 +- .../cms/ui/authoring/AuthoringKitWizard.java | 6 +- .../cms/ui/authoring/BasicImageForm.java | 4 +- .../cms/ui/authoring/CreationSelector.java | 6 +- .../cms/ui/authoring/ImageSelectionForm.java | 3 +- .../cms/ui/authoring/ImageUploadForm.java | 3 +- .../ui/authoring/NameValidationListener.java | 6 +- .../cms/ui/authoring/NewItemForm.java | 3 +- .../cms/ui/authoring/PageCreate.java | 5 +- .../cms/ui/authoring/PageCreateDynamic.java | 9 +- .../arsdigita/cms/ui/authoring/PageEdit.java | 3 +- .../cms/ui/authoring/SimpleEditStep.java | 3 +- .../cms/ui/authoring/TextAssetBody.java | 3 +- .../authoring/TextAssetBodyPropertySheet.java | 3 +- .../cms/ui/authoring/TextPageBody.java | 4 +- .../cms/ui/authoring/WizardSelector.java | 4 +- .../cms/ui/authoringkit/AddStep.java | 3 +- .../cms/ui/authoringkit/DeleteStep.java | 3 +- .../cms/ui/authoringkit/EditKit.java | 3 +- .../cms/ui/authoringkit/EditStep.java | 3 +- .../cms/ui/authoringkit/KitInfo.java | 3 +- .../cms/ui/authoringkit/KitPanel.java | 3 +- .../cms/ui/category/AddUseContextForm.java | 6 +- .../cms/ui/category/BaseCategoryForm.java | 370 ++--- .../ui/category/CategorizedObjectsList.java | 5 +- .../cms/ui/category/CategoryAddForm.java | 6 +- .../ui/category/CategoryAdminContainer.java | 3 +- .../cms/ui/category/CategoryAdminPane.java | 4 - .../cms/ui/category/CategoryEditForm.java | 6 +- .../cms/ui/category/CategoryItemPane.java | 1228 ++++++++--------- .../cms/ui/category/CategoryItemsBrowser.java | 3 +- .../category/CategoryIteratorListModel.java | 3 +- .../category/CategoryLocalizationAddForm.java | 6 +- .../CategoryLocalizationEditForm.java | 6 +- .../ui/category/CategoryLocalizationForm.java | 1 + .../cms/ui/category/CategoryRequestLocal.java | 4 - .../ui/category/CategoryTreeModelBuilder.java | 6 +- .../CategoryUseContextModelBuilder.java | 6 +- .../OrderedCategorizedObjectsList.java | 3 +- .../cms/ui/category/SortableCategoryList.java | 6 +- .../cms/ui/folder/FolderAddForm.java | 4 - .../cms/ui/folder/FolderAdminPane.java | 6 +- .../cms/ui/folder/FolderBaseForm.java | 6 +- .../cms/ui/folder/FolderBrowser.java | 2 +- .../cms/ui/folder/FolderCreator.java | 2 - .../cms/ui/folder/FolderEditForm.java | 4 - .../arsdigita/cms/ui/folder/FolderEditor.java | 2 +- .../arsdigita/cms/ui/folder/FolderForm.java | 3 +- .../cms/ui/folder/FolderItemPane.java | 5 +- .../cms/ui/folder/FolderManipulator.java | 4 +- .../cms/ui/folder/FolderRequestLocal.java | 4 - .../cms/ui/folder/FolderSelectionModel.java | 4 +- .../arsdigita/cms/ui/folder/FolderTree.java | 2 - .../cms/ui/folder/FolderTreeModelBuilder.java | 4 +- .../com/arsdigita/cms/ui/folder/ItemPath.java | 3 +- .../cms/ui/item/ContentItemRequestLocal.java | 8 +- .../arsdigita/cms/ui/item/ItemLanguages.java | 5 +- .../cms/ui/item/ItemWorkflowRequestLocal.java | 8 +- .../com/arsdigita/cms/ui/item/Summary.java | 4 +- .../cms/ui/lifecycle/AddPhaseForm.java | 5 +- .../cms/ui/lifecycle/BaseLifecycleForm.java | 6 +- .../cms/ui/lifecycle/DeletePhaseForm.java | 6 +- .../cms/ui/lifecycle/EditPhaseForm.java | 6 +- .../ui/lifecycle/ItemLifecycleAdminPane.java | 6 +- .../ui/lifecycle/ItemLifecycleItemPane.java | 6 +- .../ui/lifecycle/ItemLifecycleSelectForm.java | 4 - .../lifecycle/ItemPhaseTableModelBuilder.java | 6 +- .../cms/ui/lifecycle/LifecycleAddForm.java | 6 +- .../ui/lifecycle/LifecycleAdminContainer.java | 2 - .../cms/ui/lifecycle/LifecycleAdminPane.java | 6 +- .../LifecycleDefinitionRequestLocal.java | 4 - .../cms/ui/lifecycle/LifecycleEditForm.java | 6 +- .../cms/ui/lifecycle/LifecycleItemPane.java | 6 +- .../lifecycle/LifecycleListModelBuilder.java | 6 +- .../ui/lifecycle/LifecycleRequestLocal.java | 4 - .../cms/ui/lifecycle/PhaseRequestLocal.java | 4 - .../ui/permissions/CMSUserObjectStruct.java | 6 +- .../cms/ui/permissions/ObjectAddAdmin.java | 4 +- .../ui/permissions/ObjectAddSearchAdmin.java | 4 +- .../cms/ui/portlet/TaskPortletRenderer.java | 30 +- .../cms/ui/report/ReportListModel.java | 2 +- .../cms/ui/revision/DifferencePane.java | 8 +- .../ui/revision/ItemRevisionAdminPane.java | 8 +- .../cms/ui/revision/OperationIterator.java | 6 +- .../revision/RevisionTableModelBuilder.java | 6 +- .../ui/revision/TransactionRequestLocal.java | 4 - .../cms/ui/role/AdminTableModelBuilder.java | 4 - .../arsdigita/cms/ui/role/BaseRoleForm.java | 4 - .../cms/ui/role/BaseRoleItemPane.java | 4 - .../cms/ui/role/MemberTableModelBuilder.java | 4 - .../arsdigita/cms/ui/role/RoleAddForm.java | 4 - .../cms/ui/role/RoleAdminAddForm.java | 4 - .../arsdigita/cms/ui/role/RoleAdminPane.java | 4 - .../arsdigita/cms/ui/role/RoleEditForm.java | 4 - .../arsdigita/cms/ui/role/RoleFactory.java | 4 - .../cms/ui/role/RolePartyAddForm.java | 3 - .../cms/ui/role/RoleRequestLocal.java | 8 +- .../com/arsdigita/cms/ui/staff/PartyInfo.java | 4 +- .../ui/templates/SectionTemplatesListing.java | 4 - .../cms/ui/templates/TemplateBody.java | 4 - .../cms/ui/templates/TemplateCreate.java | 4 - .../cms/ui/templates/TemplateEdit.java | 4 +- .../com/arsdigita/cms/ui/type/AddType.java | 3 +- .../cms/ui/type/ContentTypeAdminPane.java | 6 +- .../cms/ui/type/ContentTypeItemPane.java | 6 +- .../cms/ui/type/ContentTypePropertyList.java | 6 +- .../cms/ui/type/ContentTypeRequestLocal.java | 4 - .../com/arsdigita/cms/ui/type/EditType.java | 3 +- .../com/arsdigita/cms/ui/type/SelectType.java | 4 +- .../cms/ui/type/TypeSecurityContainer.java | 6 +- .../cms/ui/type/TypeSecurityListener.java | 6 +- .../cms/ui/util/ToggleLinkFormListener.java | 4 +- .../util/UniqueStringValidationListener.java | 4 +- .../cms/ui/workflow/AssignedTaskSection.java | 8 +- .../cms/ui/workflow/AssignedTaskTable.java | 8 +- .../AssignedTaskTableModelBuilder.java | 32 +- .../cms/ui/workflow/BaseTaskForm.java | 52 +- .../cms/ui/workflow/BaseWorkflowForm.java | 4 - .../cms/ui/workflow/BaseWorkflowItemPane.java | 8 +- .../cms/ui/workflow/CommentAddForm.java | 4 - .../ui/workflow/ItemWorkflowAdminPane.java | 4 - .../cms/ui/workflow/ItemWorkflowItemPane.java | 4 - .../ui/workflow/ItemWorkflowSelectForm.java | 4 - .../cms/ui/workflow/TaskAddForm.java | 4 - .../cms/ui/workflow/TaskAddUser.java | 6 +- .../TaskCollectionOptionPrintListener.java | 4 +- .../cms/ui/workflow/TaskEditForm.java | 4 - .../cms/ui/workflow/TaskFinishForm.java | 4 - .../cms/ui/workflow/TaskItemPane.java | 26 +- .../cms/ui/workflow/TaskRequestLocal.java | 8 +- .../ui/workflow/TaskTableModelBuilder.java | 8 +- .../cms/ui/workflow/WorkflowAddForm.java | 4 - .../cms/ui/workflow/WorkflowAdminPane.java | 4 - .../cms/ui/workflow/WorkflowComponent.java | 5 +- .../cms/ui/workflow/WorkflowDeleteForm.java | 4 - .../cms/ui/workflow/WorkflowEditForm.java | 4 - .../cms/ui/workflow/WorkflowItemPane.java | 8 +- .../ui/workflow/WorkflowListModelBuilder.java | 4 - .../cms/ui/workflow/WorkflowRequestLocal.java | 8 +- .../WorkflowsOptionPrintListener.java | 4 +- .../arsdigita/cms/util/SecurityConstants.java | 5 +- .../workflow/AuthoringTaskURLGenerator.java | 4 +- .../com/arsdigita/cms/workflow/CMSTask.java | 3 +- .../arsdigita/cms/workflow/CMSTaskType.java | 6 +- .../cms/workflow/DeployTaskURLGenerator.java | 4 +- .../cms/workflow/EditingTaskURLGenerator.java | 4 +- .../cms/workflow/FinishTaskURLGenerator.java | 6 +- .../cms/workflow/PreviewTaskURLGenerator.java | 4 +- .../workflow/PublishedItemURLGenerator.java | 4 +- .../cms/workflow/TaskEventURLGenerator.java | 4 +- .../cms/workflow/TaskURLGenerator.java | 4 +- 318 files changed, 1263 insertions(+), 1879 deletions(-) rename ccm-cms/src/com/arsdigita/cms/ui/{HorizontalLine.java => HorizontalLine.java.nolongerInUse} (92%) diff --git a/ccm-cms/pdl/com/arsdigita/content-section/LifecycleService.pdl b/ccm-cms/pdl/com/arsdigita/content-section/LifecycleService.pdl index 373e353bb..e511dd042 100755 --- a/ccm-cms/pdl/com/arsdigita/content-section/LifecycleService.pdl +++ b/ccm-cms/pdl/com/arsdigita/content-section/LifecycleService.pdl @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// $Id: LifecycleService.pdl 287 2005-02-22 00:29:02Z sskracic $ +// $Id: LifecycleService.pdl 1973 2009-09-09 16:16:44Z clasohm $ // $DateTime: 2004/08/17 23:15:09 $ model com.arsdigita.cms; diff --git a/ccm-cms/pdl/com/arsdigita/content-section/query-getEnabledUserTasks.ora.pdl b/ccm-cms/pdl/com/arsdigita/content-section/query-getEnabledUserTasks.ora.pdl index 132debcd9..92706ce0d 100755 --- a/ccm-cms/pdl/com/arsdigita/content-section/query-getEnabledUserTasks.ora.pdl +++ b/ccm-cms/pdl/com/arsdigita/content-section/query-getEnabledUserTasks.ora.pdl @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// $Id: query-getEnabledUserTasks.ora.pdl 1280 2006-07-27 09:12:09Z cgyg9330 $ +// $Id: query-getEnabledUserTasks.ora.pdl 1973 2009-09-09 16:16:44Z clasohm $ // $DateTime: 2004/08/17 23:15:09 $ model com.arsdigita.cms.workflow; diff --git a/ccm-cms/pdl/com/arsdigita/content-section/query-getEnabledUserTasks.pg.pdl b/ccm-cms/pdl/com/arsdigita/content-section/query-getEnabledUserTasks.pg.pdl index c6c4ec9de..6b365af49 100755 --- a/ccm-cms/pdl/com/arsdigita/content-section/query-getEnabledUserTasks.pg.pdl +++ b/ccm-cms/pdl/com/arsdigita/content-section/query-getEnabledUserTasks.pg.pdl @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// $Id: query-getEnabledUserTasks.pg.pdl 1280 2006-07-27 09:12:09Z cgyg9330 $ +// $Id: query-getEnabledUserTasks.pg.pdl 1973 2009-09-09 16:16:44Z clasohm $ // $DateTime: 2004/08/17 23:15:09 $ model com.arsdigita.cms.workflow; diff --git a/ccm-cms/src/com/arsdigita/cms/Article.java b/ccm-cms/src/com/arsdigita/cms/Article.java index f16940c2b..435edb01e 100755 --- a/ccm-cms/src/com/arsdigita/cms/Article.java +++ b/ccm-cms/src/com/arsdigita/cms/Article.java @@ -33,7 +33,7 @@ import java.math.BigDecimal; * * @author Jack Chung (flattop@arsdigita.com) * @version $Revision: #28 $ $Date: 2004/08/17 $ - * @version $Id: Article.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: Article.java 2070 2010-01-28 08:47:41Z pboy $ */ public class Article extends TextPage { diff --git a/ccm-cms/src/com/arsdigita/cms/ArticleImageAssociation.java b/ccm-cms/src/com/arsdigita/cms/ArticleImageAssociation.java index 704ec3bae..f728a1279 100755 --- a/ccm-cms/src/com/arsdigita/cms/ArticleImageAssociation.java +++ b/ccm-cms/src/com/arsdigita/cms/ArticleImageAssociation.java @@ -58,7 +58,7 @@ public class ArticleImageAssociation extends ContentItem { } /** - * Constructor retrieved the contained DataObject from the + * Constructor retrieves the contained DataObject from the * persistent storage mechanism with an OID specified by * oid. * diff --git a/ccm-cms/src/com/arsdigita/cms/AuthoringKitStepAssociation.java b/ccm-cms/src/com/arsdigita/cms/AuthoringKitStepAssociation.java index 4cfa8bf2a..fbf6935a1 100755 --- a/ccm-cms/src/com/arsdigita/cms/AuthoringKitStepAssociation.java +++ b/ccm-cms/src/com/arsdigita/cms/AuthoringKitStepAssociation.java @@ -31,13 +31,10 @@ import java.math.BigDecimal; * authoring steps} in a particular order. * * @author Jack Chung (flattop@arsdigita.com) - * @version $Revision: #11 $ $Date: 2004/08/17 $ + * @version $Id: AuthoringKitStepAssociation.java 287 2005-02-22 00:29:02Z sskracic $ */ class AuthoringKitStepAssociation extends DomainObject { - public static final String versionId = "$Id: AuthoringKitStepAssociation.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - - public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.AuthoringKitStepAssociation"; diff --git a/ccm-cms/src/com/arsdigita/cms/AuthoringStep.java b/ccm-cms/src/com/arsdigita/cms/AuthoringStep.java index e6fcfa159..ade8f8540 100755 --- a/ccm-cms/src/com/arsdigita/cms/AuthoringStep.java +++ b/ccm-cms/src/com/arsdigita/cms/AuthoringStep.java @@ -30,13 +30,10 @@ import java.math.BigDecimal; * authoring kit}. * * @author Jack Chung (flattop@arsdigita.com) - * @version $Revision: #13 $ $Date: 2004/08/17 $ + * @version $Id: AuthoringStep.java 287 2005-02-22 00:29:02Z sskracic $ */ public class AuthoringStep extends ACSObject { - public static final String versionId = "$Id: AuthoringStep.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - - public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.AuthoringStep"; diff --git a/ccm-cms/src/com/arsdigita/cms/AuthoringStepCollection.java b/ccm-cms/src/com/arsdigita/cms/AuthoringStepCollection.java index bd8e230e8..685037e02 100755 --- a/ccm-cms/src/com/arsdigita/cms/AuthoringStepCollection.java +++ b/ccm-cms/src/com/arsdigita/cms/AuthoringStepCollection.java @@ -26,16 +26,14 @@ import com.arsdigita.persistence.DataCollection; * Describes a set of {@link com.arsdigita.cms.AuthoringStep authoring * steps}. * - * @author Jack Chung - * @version 1.0 - * * @see com.arsdigita.domain.DomainCollection * @see com.arsdigita.persistence.DataCollection + * + * @author Jack Chung + * @version $Id: AuthoringStepCollection.java 287 2005-02-22 00:29:02Z sskracic $ */ public class AuthoringStepCollection extends DomainCollection { - public static final String versionId = "$Id: AuthoringStepCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - /** * Constructor. * diff --git a/ccm-cms/src/com/arsdigita/cms/BinaryAsset.java b/ccm-cms/src/com/arsdigita/cms/BinaryAsset.java index d11c94358..2194ff76c 100755 --- a/ccm-cms/src/com/arsdigita/cms/BinaryAsset.java +++ b/ccm-cms/src/com/arsdigita/cms/BinaryAsset.java @@ -38,12 +38,10 @@ import java.io.OutputStream; * @author Jack Chung * @author Stanislav Freidin * - * @version $Revision: #13 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: BinaryAsset.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class BinaryAsset extends Asset { - public static final String versionId = "$Id: BinaryAsset.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - protected BinaryAsset(OID oid) throws DataObjectNotFoundException { super(oid); } diff --git a/ccm-cms/src/com/arsdigita/cms/CategoryTemplateMapping.java b/ccm-cms/src/com/arsdigita/cms/CategoryTemplateMapping.java index 06ca2ca2f..f010c6bfa 100755 --- a/ccm-cms/src/com/arsdigita/cms/CategoryTemplateMapping.java +++ b/ccm-cms/src/com/arsdigita/cms/CategoryTemplateMapping.java @@ -33,7 +33,7 @@ import java.math.BigDecimal; /** * Represents a mapping from (category + content type) to a template. * - * @version $Id: CategoryTemplateMapping.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: CategoryTemplateMapping.java 1940 2009-05-29 07:15:05Z terry $ */ public class CategoryTemplateMapping extends TemplateMapping { diff --git a/ccm-cms/src/com/arsdigita/cms/ContentBundle.java b/ccm-cms/src/com/arsdigita/cms/ContentBundle.java index 8288cdafc..0549f32ab 100755 --- a/ccm-cms/src/com/arsdigita/cms/ContentBundle.java +++ b/ccm-cms/src/com/arsdigita/cms/ContentBundle.java @@ -53,24 +53,24 @@ import org.apache.log4j.Logger; * * @author Shashin Shinde * @author Justin Ross <jross@redhat.com> - * @version $Id: ContentBundle.java 967 2005-10-28 18:08:42Z sskracic $ + * @version $Id: ContentBundle.java 2017 2009-10-04 09:03:45Z pboy $ */ public class ContentBundle extends ContentItem { private static final Logger s_log = Logger.getLogger(ContentBundle.class); - + private static DomainObjectObserver s_instancesObserver = - new AbstractDomainObjectObserver() { - public void add(DomainObject dom, String name, - DataObject dobj) { - if (INSTANCES.equals(name)) { - if (dobj != null) { - PermissionService.setContext(dobj.getOID(), dom.getOID()); + new AbstractDomainObjectObserver() { + public void add(DomainObject dom, String name, + DataObject dobj) { + if (INSTANCES.equals(name)) { + if (dobj != null) { + PermissionService.setContext(dobj.getOID(), dom.getOID()); + } } } - } - }; - + }; + /** * The base data object type of a bundle */ @@ -81,19 +81,19 @@ public class ContentBundle extends ContentItem { * The primary instances association */ public static final String INSTANCES = "instances"; - + /** * The association to AtoZ aliases */ public static final String ATOZ_ALIASING_PROVIDERS = "atozAliasingProviders"; - + /** * The default language property */ public static final String DEFAULT_LANGUAGE = "defaultLanguage"; - + private boolean m_wasNew = false; - + /** * Returns the data object type for this bundle. */ diff --git a/ccm-cms/src/com/arsdigita/cms/ContentPage.java b/ccm-cms/src/com/arsdigita/cms/ContentPage.java index 31d97f33f..5e68a42fe 100755 --- a/ccm-cms/src/com/arsdigita/cms/ContentPage.java +++ b/ccm-cms/src/com/arsdigita/cms/ContentPage.java @@ -42,7 +42,7 @@ import org.apache.log4j.Logger; * @author Uday Mathur * @author Jack Chung * @author Michael Pih - * @version $Id: ContentPage.java 1263 2006-07-17 08:18:47Z cgyg9330 $ + * @version $Id: ContentPage.java 2070 2010-01-28 08:47:41Z pboy $ */ public class ContentPage extends ContentItem { diff --git a/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java b/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java index b972f8927..bb408366a 100755 --- a/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java +++ b/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java @@ -94,7 +94,7 @@ import org.apache.log4j.Logger; * @see ContentSection#getConfig() * * @author Justin Ross <jross@redhat.com> - * @version $Id: ContentSectionConfig.java 1689 2007-10-26 11:06:23Z chrisg23 $ + * @version $Id: ContentSectionConfig.java 2070 2010-01-28 08:47:41Z pboy $ */ public final class ContentSectionConfig extends AbstractConfig { @@ -641,9 +641,6 @@ public final class ContentSectionConfig extends AbstractConfig { - - - private class DHTMLEditorConfigParameter extends StringParameter { public DHTMLEditorConfigParameter(final String name, final int multiplicity, @@ -819,9 +816,9 @@ public final class ContentSectionConfig extends AbstractConfig { * * @return */ - public boolean getHasContactsAuthoringStep() { - return ((Boolean) get(m_hasContactsAuthoringStep)).booleanValue(); - } + public boolean getHasContactsAuthoringStep() { + return ((Boolean) get(m_hasContactsAuthoringStep)).booleanValue(); + } public final boolean getHideTextAssetUploadFile() { return ((Boolean) get(m_hideTextAssetUploadFile)).booleanValue(); diff --git a/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig_parameter.properties b/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig_parameter.properties index a0c209361..f0958ba8d 100755 --- a/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig_parameter.properties +++ b/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig_parameter.properties @@ -2,7 +2,7 @@ com.arsdigita.cms.template_root_path.title=Template Root Path com.arsdigita.cms.template_root_path.purpose=Path for the default template folder. Path is relative to webapp root com.arsdigita.cms.template_root_path.example=/packages/content-section/templates com.arsdigita.cms.template_root_path.format=[string] - + com.arsdigita.cms.default_item_template_path.title=Default Item Template Path com.arsdigita.cms.default_item_template_path.purpose=Path for the default item template. Path is relative to the Template Root path. com.arsdigita.cms.default_item_template_path.example=/default/item.jsp diff --git a/ccm-cms/src/com/arsdigita/cms/ContentType.java b/ccm-cms/src/com/arsdigita/cms/ContentType.java index ac2ef0392..209eed469 100755 --- a/ccm-cms/src/com/arsdigita/cms/ContentType.java +++ b/ccm-cms/src/com/arsdigita/cms/ContentType.java @@ -52,7 +52,7 @@ import java.net.MalformedURLException; * * @author Michael Pih (pihman@arsdigita.com) * @author Jack Chung (flattop@arsdigita.com) - * @version $Id: ContentType.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ContentType.java 2070 2010-01-28 08:47:41Z pboy $ */ public class ContentType extends ACSObject { diff --git a/ccm-cms/src/com/arsdigita/cms/ContentTypeCollection.java b/ccm-cms/src/com/arsdigita/cms/ContentTypeCollection.java index 3cc0486f9..e73c9a5db 100755 --- a/ccm-cms/src/com/arsdigita/cms/ContentTypeCollection.java +++ b/ccm-cms/src/com/arsdigita/cms/ContentTypeCollection.java @@ -27,16 +27,14 @@ import com.arsdigita.persistence.Filter; * This class contains a collection of {@link * com.arsdigita.cms.ContentType content types}. * - * @author Jack Chung (flattop@arsdigita.com) - * @version $Revision: #11 $ $Date: 2004/08/17 $ - * * @see com.arsdigita.domain.DomainCollection * @see com.arsdigita.persistence.DataCollection + * + * @author Jack Chung (flattop@arsdigita.com) + * @version $Id: ContentTypeCollection.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ContentTypeCollection extends DomainCollection { - public static final String versionId = "$Id: ContentTypeCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - /** * Constructor. * diff --git a/ccm-cms/src/com/arsdigita/cms/ContentTypeLifecycleDefinition.java b/ccm-cms/src/com/arsdigita/cms/ContentTypeLifecycleDefinition.java index 807c880c7..36ce2a486 100755 --- a/ccm-cms/src/com/arsdigita/cms/ContentTypeLifecycleDefinition.java +++ b/ccm-cms/src/com/arsdigita/cms/ContentTypeLifecycleDefinition.java @@ -33,13 +33,10 @@ import java.math.BigDecimal; * * @author Jack Chung (flattop@arsdigita.com) * @author Michael Pih (pihman@arsdigita.com) - * @version $Revision: #9 $ $Date: 2004/08/17 $ + * @version $Id: ContentTypeLifecycleDefinition.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ContentTypeLifecycleDefinition extends DomainObject { - public static final String versionId = "$Id: ContentTypeLifecycleDefinition.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - - public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.ContentTypeLifecycleDefinition"; diff --git a/ccm-cms/src/com/arsdigita/cms/ContentTypeWorkflowTemplate.java b/ccm-cms/src/com/arsdigita/cms/ContentTypeWorkflowTemplate.java index 879d4a34e..b890919bd 100755 --- a/ccm-cms/src/com/arsdigita/cms/ContentTypeWorkflowTemplate.java +++ b/ccm-cms/src/com/arsdigita/cms/ContentTypeWorkflowTemplate.java @@ -37,13 +37,9 @@ import org.apache.log4j.Logger; * com.arsdigita.cms.ContentSection content section}. * * @author Michael Pih (pihman@arsdigita.com) - * @version $Id: ContentTypeWorkflowTemplate.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ContentTypeWorkflowTemplate.java 1942 2009-05-29 07:53:23Z terry $ */ public class ContentTypeWorkflowTemplate extends DomainObject { - public static final String versionId = - "$Id: ContentTypeWorkflowTemplate.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (ContentTypeWorkflowTemplate.class); diff --git a/ccm-cms/src/com/arsdigita/cms/DataQueryExistsListener.java b/ccm-cms/src/com/arsdigita/cms/DataQueryExistsListener.java index 92f533f08..614fe5e1c 100755 --- a/ccm-cms/src/com/arsdigita/cms/DataQueryExistsListener.java +++ b/ccm-cms/src/com/arsdigita/cms/DataQueryExistsListener.java @@ -35,11 +35,10 @@ import com.arsdigita.persistence.DataQuery; * * @author Uday Mathur (umathur@arsdigita.com) * @author Michael Pih (pihman@arsdigita.com) - * @version $Revision: #8 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: DataQueryExistsListener.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class DataQueryExistsListener implements FormValidationListener { - public static final String versionId = "$Id: DataQueryExistsListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; protected String m_errorMsg; diff --git a/ccm-cms/src/com/arsdigita/cms/DefaultDomainService.java b/ccm-cms/src/com/arsdigita/cms/DefaultDomainService.java index 94e292ea0..1a28f5ef8 100755 --- a/ccm-cms/src/com/arsdigita/cms/DefaultDomainService.java +++ b/ccm-cms/src/com/arsdigita/cms/DefaultDomainService.java @@ -24,10 +24,9 @@ import com.arsdigita.domain.DomainServiceInterfaceExposer; * Exposes all methods in {@link com.arsdigita.domain.DomainService}. * * @author Stanislav Freidin (sfreidin@arsdigita.com) - * @version $Id: DefaultDomainService.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: DefaultDomainService.java 1940 2009-05-29 07:15:05Z terry $ */ public class DefaultDomainService extends DomainServiceInterfaceExposer { - public static final String versionId = "$Id: DefaultDomainService.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; } diff --git a/ccm-cms/src/com/arsdigita/cms/DefaultTemplateManager.java b/ccm-cms/src/com/arsdigita/cms/DefaultTemplateManager.java index c86db2960..543887e3a 100755 --- a/ccm-cms/src/com/arsdigita/cms/DefaultTemplateManager.java +++ b/ccm-cms/src/com/arsdigita/cms/DefaultTemplateManager.java @@ -30,12 +30,10 @@ import com.arsdigita.mimetypes.MimeType; * com.arsdigita.cms.TemplateManager template manager}. * * @author Karl Goldstein (karlg@arsdigita.com) - * @version $Revision: #12 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: DefaultTemplateManager.java 287 2005-02-22 00:29:02Z sskracic $ */ public class DefaultTemplateManager implements TemplateManager { - public static final String versionId = "$Id: DefaultTemplateManager.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static final String SECTION_ID = "sectionID"; private static final String TYPE_ID = "typeID"; private static final String USE_CONTEXT = "useContext"; diff --git a/ccm-cms/src/com/arsdigita/cms/DomainCopier.java b/ccm-cms/src/com/arsdigita/cms/DomainCopier.java index 9e502d6b4..b7b8ab15e 100755 --- a/ccm-cms/src/com/arsdigita/cms/DomainCopier.java +++ b/ccm-cms/src/com/arsdigita/cms/DomainCopier.java @@ -42,13 +42,9 @@ import java.util.Iterator; * Recursively copies a domain object. * * @author Justin Ross <jross@redhat.com> - * @version $Id: DomainCopier.java 754 2005-09-02 13:26:17Z sskracic $ + * @version $Id: DomainCopier.java 1942 2009-05-29 07:53:23Z terry $ */ class DomainCopier extends DomainService { - public static final String versionId = - "$Id: DomainCopier.java 754 2005-09-02 13:26:17Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static Logger s_log = Logger.getLogger(DomainCopier.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ExtraXMLGenerator.java b/ccm-cms/src/com/arsdigita/cms/ExtraXMLGenerator.java index 7bbe565f4..7ee635f34 100755 --- a/ccm-cms/src/com/arsdigita/cms/ExtraXMLGenerator.java +++ b/ccm-cms/src/com/arsdigita/cms/ExtraXMLGenerator.java @@ -14,12 +14,10 @@ import com.arsdigita.xml.Element; * your content types may have. * * @author Fabrice Retkowsky (fabrice@runtime-collective.com) - * @version $Revision: #17 $ $Date: 2004/08/17 $ + * @version $Id: ContentType.java 285 2005-02-22 00:29:02Z sskracic $ */ public interface ExtraXMLGenerator { - public static final String versionId = "$Id: ContentType.java 285 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - /** * Specify the XML for a given content item. */ diff --git a/ccm-cms/src/com/arsdigita/cms/FileAsset.java b/ccm-cms/src/com/arsdigita/cms/FileAsset.java index f5f8d28f5..559973ba1 100755 --- a/ccm-cms/src/com/arsdigita/cms/FileAsset.java +++ b/ccm-cms/src/com/arsdigita/cms/FileAsset.java @@ -39,12 +39,10 @@ import java.util.Locale; * file, such as an image. * * @author Scott Seago (scott@arsdigita.com) - * @version $Revision: #15 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: FileAsset.java 287 2005-02-22 00:29:02Z sskracic $ */ public class FileAsset extends BinaryAsset { - public static final String versionId = "$Id: FileAsset.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.FileAsset"; diff --git a/ccm-cms/src/com/arsdigita/cms/FileAssetCollection.java b/ccm-cms/src/com/arsdigita/cms/FileAssetCollection.java index dd537cdf4..36da5abe1 100755 --- a/ccm-cms/src/com/arsdigita/cms/FileAssetCollection.java +++ b/ccm-cms/src/com/arsdigita/cms/FileAssetCollection.java @@ -27,16 +27,15 @@ import com.arsdigita.persistence.PersistenceException; /** * This class contains a collection of files. * - * @author Scott Seago - * @version 1.0 - * * @see com.arsdigita.domain.DomainCollection * @see com.arsdigita.persistence.DataCollection + * + * @author Scott Seago + * @version 1.0 + * @version $Id: FileAssetCollection.java 287 2005-02-22 00:29:02Z sskracic $ */ public class FileAssetCollection extends DomainCollection { - public static final String versionId = "$Id: FileAssetCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - /** * Constructor. * diff --git a/ccm-cms/src/com/arsdigita/cms/Folder.java b/ccm-cms/src/com/arsdigita/cms/Folder.java index d9ff7e9d3..531db831c 100755 --- a/ccm-cms/src/com/arsdigita/cms/Folder.java +++ b/ccm-cms/src/com/arsdigita/cms/Folder.java @@ -70,10 +70,6 @@ import java.util.Iterator; * @version $Id: Folder.java 1639 2007-09-17 13:20:13Z chrisg23 $ */ public class Folder extends ContentItem { - public static final String versionId = - "$Id: Folder.java 1639 2007-09-17 13:20:13Z chrisg23 $" + - "$Author: chrisg23 $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger(Folder.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ImageAsset.java b/ccm-cms/src/com/arsdigita/cms/ImageAsset.java index 0da19767a..97e8f6d67 100755 --- a/ccm-cms/src/com/arsdigita/cms/ImageAsset.java +++ b/ccm-cms/src/com/arsdigita/cms/ImageAsset.java @@ -49,13 +49,9 @@ import org.apache.log4j.Logger; * @author Jack Chung * @author Stanislav Freidin * - * @version $Revision: #20 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: ImageAsset.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ImageAsset extends BinaryAsset { - public static final String versionId = - "$Id: ImageAsset.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.ImageAsset"; diff --git a/ccm-cms/src/com/arsdigita/cms/ImageAssetCollection.java b/ccm-cms/src/com/arsdigita/cms/ImageAssetCollection.java index 6062f8714..b7e7a5809 100755 --- a/ccm-cms/src/com/arsdigita/cms/ImageAssetCollection.java +++ b/ccm-cms/src/com/arsdigita/cms/ImageAssetCollection.java @@ -27,16 +27,15 @@ import com.arsdigita.persistence.PersistenceException; /** * This class contains a collection of images. * - * @author Jack Chung - * @version 1.0 - * * @see com.arsdigita.domain.DomainCollection * @see com.arsdigita.persistence.DataCollection + * + * @author Jack Chung + * @version 1.0 + * @version $Id: ImageAssetCollection.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ImageAssetCollection extends DomainCollection { - public static final String versionId = "$Id: ImageAssetCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - /** * Constructor. * diff --git a/ccm-cms/src/com/arsdigita/cms/Initializer.java b/ccm-cms/src/com/arsdigita/cms/Initializer.java index 720fcbab7..723ff9671 100755 --- a/ccm-cms/src/com/arsdigita/cms/Initializer.java +++ b/ccm-cms/src/com/arsdigita/cms/Initializer.java @@ -83,7 +83,7 @@ import com.arsdigita.cms.util.LanguageUtil; * The CMS initializer. * * @author Justin Ross <jross@redhat.com> - * @version $Id: Initializer.java 1428 2007-01-24 12:39:56Z sskracic $ + * @version $Id: Initializer.java 2070 2010-01-28 08:47:41Z pboy $ */ public class Initializer extends CompoundInitializer { @@ -106,6 +106,9 @@ public class Initializer extends CompoundInitializer { /** * Initializes domain-coupling machinery, usually consisting of * registering object instantiators and observers. + * + * This starts up the search threads according to the values in the + * properties file */ public void init(DomainInitEvent e) { super.init(e); @@ -170,6 +173,19 @@ public class Initializer extends CompoundInitializer { XML.parse(ContentSection.getConfig().getItemAdapters(), new TraversalHandler()); + // Just set the class implementing methods run when for publishing + // or unpublishing to file. No initialisation of the class here. + try { + QueueManager.setListener((PublishToFileListener) + ContentSection.getConfig() + .getPublishToFileClass().newInstance()); + } catch (InstantiationException ex) { + throw new UncheckedWrapperException + ("Failed to instantiate the listener class", ex); + } catch (IllegalAccessException ex) { + throw new UncheckedWrapperException + ("Couldn't access the listener class", ex); + } MetadataProviderRegistry.registerAdapter( FileAsset.BASE_DATA_OBJECT_TYPE, diff --git a/ccm-cms/src/com/arsdigita/cms/ItemSelectionModel.java b/ccm-cms/src/com/arsdigita/cms/ItemSelectionModel.java index 3e915c06e..96e0367df 100755 --- a/ccm-cms/src/com/arsdigita/cms/ItemSelectionModel.java +++ b/ccm-cms/src/com/arsdigita/cms/ItemSelectionModel.java @@ -47,8 +47,6 @@ import java.math.BigDecimal; */ public class ItemSelectionModel extends ACSObjectSelectionModel { - public static final String versionId = "$Id: ItemSelectionModel.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private BigDecimal m_typeId; private static final Logger s_log = diff --git a/ccm-cms/src/com/arsdigita/cms/ItemTemplateCollection.java b/ccm-cms/src/com/arsdigita/cms/ItemTemplateCollection.java index 109cc9136..9e724ca0f 100755 --- a/ccm-cms/src/com/arsdigita/cms/ItemTemplateCollection.java +++ b/ccm-cms/src/com/arsdigita/cms/ItemTemplateCollection.java @@ -29,13 +29,12 @@ import com.arsdigita.mimetypes.MimeType; * com.arsdigita.cms.ItemTemplateMapping item template mappings}.

* * @author Stanislav Freidin (sfreidin@arsdigita.com) - * @version $Id: ItemTemplateCollection.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ItemTemplateCollection.java 1940 2009-05-29 07:15:05Z terry $ * @see com.arsdigita.domain.DomainCollection * @see com.arsdigita.persistence.DataCollection * @see com.arsdigita.cms.ItemTemplateCollection */ class ItemTemplateCollection extends TemplateCollection { - public static final String versionId = "$Id: ItemTemplateCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; /** * Constructor. diff --git a/ccm-cms/src/com/arsdigita/cms/ItemTemplateMapping.java b/ccm-cms/src/com/arsdigita/cms/ItemTemplateMapping.java index 2fdf9882a..793ae8a68 100755 --- a/ccm-cms/src/com/arsdigita/cms/ItemTemplateMapping.java +++ b/ccm-cms/src/com/arsdigita/cms/ItemTemplateMapping.java @@ -38,7 +38,7 @@ import java.math.BigDecimal; * internal templating implementation. * * @author Stanislav Freidin (sfreidin@arsdigita.com) - * @version $Id: ItemTemplateMapping.java 754 2005-09-02 13:26:17Z sskracic $ + * @version $Id: ItemTemplateMapping.java 1940 2009-05-29 07:15:05Z terry $ */ public class ItemTemplateMapping extends TemplateMapping { diff --git a/ccm-cms/src/com/arsdigita/cms/Loader.java b/ccm-cms/src/com/arsdigita/cms/Loader.java index 6b1aa242b..18e054fad 100755 --- a/ccm-cms/src/com/arsdigita/cms/Loader.java +++ b/ccm-cms/src/com/arsdigita/cms/Loader.java @@ -26,7 +26,7 @@ import org.apache.log4j.Logger; * The CMS loader. * * @author Justin Ross <jross@redhat.com> - * @version $Id: Loader.java 754 2005-09-02 13:26:17Z sskracic $ + * @version $Id: Loader.java 2070 2010-01-28 08:47:41Z pboy $ */ public class Loader extends PackageLoader { diff --git a/ccm-cms/src/com/arsdigita/cms/ObjectCopier.java b/ccm-cms/src/com/arsdigita/cms/ObjectCopier.java index 2951eaa4b..07d93d4e0 100755 --- a/ccm-cms/src/com/arsdigita/cms/ObjectCopier.java +++ b/ccm-cms/src/com/arsdigita/cms/ObjectCopier.java @@ -52,15 +52,11 @@ import org.apache.log4j.Logger; *

* * @author Stanislav Freidin - * @version $Id: ObjectCopier.java 754 2005-09-02 13:26:17Z sskracic $ + * @version $Id: ObjectCopier.java 1942 2009-05-29 07:53:23Z terry $ * @see ContentItem * @see ContentItem#copyProperty(ContentItem, String, ItemCopier) */ class ObjectCopier extends DomainCopier implements ItemCopier { - public static final String versionId = - "$Id: ObjectCopier.java 754 2005-09-02 13:26:17Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static Logger s_log = Logger.getLogger(ObjectCopier.class); diff --git a/ccm-cms/src/com/arsdigita/cms/PageLocations.java b/ccm-cms/src/com/arsdigita/cms/PageLocations.java index 2988d60fe..383b43fd3 100755 --- a/ccm-cms/src/com/arsdigita/cms/PageLocations.java +++ b/ccm-cms/src/com/arsdigita/cms/PageLocations.java @@ -24,12 +24,9 @@ package com.arsdigita.cms; * * @author Karl Goldstein (karlg at arsdigita dot com) * - * @version $Revision: #6 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: PageLocations.java 287 2005-02-22 00:29:02Z sskracic $ **/ public interface PageLocations { - - public String versionId = "$Id: PageLocations.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public String SECTION_PAGE = "admin/index.jsp"; public String ITEM_PAGE = "admin/item.jsp"; } diff --git a/ccm-cms/src/com/arsdigita/cms/ReusableImageAsset.java b/ccm-cms/src/com/arsdigita/cms/ReusableImageAsset.java index b4bc973a2..d44d6ddd2 100755 --- a/ccm-cms/src/com/arsdigita/cms/ReusableImageAsset.java +++ b/ccm-cms/src/com/arsdigita/cms/ReusableImageAsset.java @@ -48,13 +48,9 @@ import org.apache.log4j.Logger; * @author Scott Seago (sseago@redhat.com) * @author Stanislav Freidin * - * @version $Revision: #12 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: ReusableImageAsset.java 754 2005-09-02 13:26:17Z sskracic $ */ public class ReusableImageAsset extends ImageAsset { - public static final String versionId = - "$Id: ReusableImageAsset.java 754 2005-09-02 13:26:17Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger( ReusableImageAsset.class ); diff --git a/ccm-cms/src/com/arsdigita/cms/SearchFormatter.java b/ccm-cms/src/com/arsdigita/cms/SearchFormatter.java index 2c5429345..76c2d064f 100755 --- a/ccm-cms/src/com/arsdigita/cms/SearchFormatter.java +++ b/ccm-cms/src/com/arsdigita/cms/SearchFormatter.java @@ -25,7 +25,7 @@ import java.util.StringTokenizer; * search queries * * @author Stanislav Freidin (sfreidin@arsdigita.com) - * @version $Id: SearchFormatter.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: SearchFormatter.java 2070 2010-01-28 08:47:41Z pboy $ */ public class SearchFormatter { diff --git a/ccm-cms/src/com/arsdigita/cms/SectionLocaleCollection.java b/ccm-cms/src/com/arsdigita/cms/SectionLocaleCollection.java index 8d93c4a7d..fe98f13c9 100755 --- a/ccm-cms/src/com/arsdigita/cms/SectionLocaleCollection.java +++ b/ccm-cms/src/com/arsdigita/cms/SectionLocaleCollection.java @@ -28,16 +28,14 @@ import com.arsdigita.persistence.DataCollection; * This class contains a collection of Locales associated with a * {@link com.arsdigita.cms.ContentSection}. * - * @author Michael Pih (pihman@arsdigita.com) - * @version $Revision: #8 $ $DateTime: 2004/08/17 23:15:09 $ - * * @see com.arsdigita.domain.DomainCollection * @see com.arsdigita.persistence.DataCollection + * + * @author Michael Pih (pihman@arsdigita.com) + * @version $Id: SectionLocaleCollection.java 287 2005-02-22 00:29:02Z sskracic $ */ public class SectionLocaleCollection extends DomainCollection { - public static final String versionId = "$Id: SectionLocaleCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - /** * Constructor. */ diff --git a/ccm-cms/src/com/arsdigita/cms/SectionTemplateCollection.java b/ccm-cms/src/com/arsdigita/cms/SectionTemplateCollection.java index 372df6ced..2a7420129 100755 --- a/ccm-cms/src/com/arsdigita/cms/SectionTemplateCollection.java +++ b/ccm-cms/src/com/arsdigita/cms/SectionTemplateCollection.java @@ -25,7 +25,7 @@ import com.arsdigita.persistence.DataCollection; * This class contains a collection of {@link SectionTemplateMapping}s * * @author Stanislav Freidin (sfreidin@arsdigita.com) - * @version $Id: SectionTemplateCollection.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: SectionTemplateCollection.java 1940 2009-05-29 07:15:05Z terry $ * * @see com.arsdigita.domain.DomainCollection * @see com.arsdigita.persistence.DataCollection @@ -33,8 +33,6 @@ import com.arsdigita.persistence.DataCollection; */ class SectionTemplateCollection extends TemplateCollection { - public static final String versionId = "$Id: SectionTemplateCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - /** * Constructor. * diff --git a/ccm-cms/src/com/arsdigita/cms/SectionTemplateMapping.java b/ccm-cms/src/com/arsdigita/cms/SectionTemplateMapping.java index 2afda201e..72fc906a9 100755 --- a/ccm-cms/src/com/arsdigita/cms/SectionTemplateMapping.java +++ b/ccm-cms/src/com/arsdigita/cms/SectionTemplateMapping.java @@ -38,12 +38,10 @@ import org.apache.log4j.Logger; * internal templating implementation. * * @author Stanislav Freidin (sfreidin@arsdigita.com) - * @version $Id: SectionTemplateMapping.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: SectionTemplateMapping.java 1940 2009-05-29 07:15:05Z terry $ */ public class SectionTemplateMapping extends TemplateMapping { - public static final String versionId = "$Id: SectionTemplateMapping.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.SectionTemplateMapping"; diff --git a/ccm-cms/src/com/arsdigita/cms/Security.java b/ccm-cms/src/com/arsdigita/cms/Security.java index 69dfa94ce..e55431ef1 100755 --- a/ccm-cms/src/com/arsdigita/cms/Security.java +++ b/ccm-cms/src/com/arsdigita/cms/Security.java @@ -28,12 +28,10 @@ import com.arsdigita.kernel.Party; *

An interface for making access checks within a content section.

* * @author Michael Pih (pihman@arsdigita.com) - * @version $Revision: #8 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: Security.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface Security { - public static final String versionId = "$Id: Security.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - /** * Determine whether a party has access to a particular action. * diff --git a/ccm-cms/src/com/arsdigita/cms/SecurityManager.java b/ccm-cms/src/com/arsdigita/cms/SecurityManager.java index cd4eb1cac..8c6fc8957 100755 --- a/ccm-cms/src/com/arsdigita/cms/SecurityManager.java +++ b/ccm-cms/src/com/arsdigita/cms/SecurityManager.java @@ -49,13 +49,9 @@ import org.apache.log4j.Logger; * CMS.

* * @author Michael Pih - * @version $Revision: #24 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: SecurityManager.java 1344 2006-10-10 09:41:56Z sskracic $ */ public class SecurityManager implements Security, SecurityConstants { - public static final String versionId = - "$Id: SecurityManager.java 1344 2006-10-10 09:41:56Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (SecurityManager.class); diff --git a/ccm-cms/src/com/arsdigita/cms/Template.java b/ccm-cms/src/com/arsdigita/cms/Template.java index 5a05bc551..d320f64dd 100755 --- a/ccm-cms/src/com/arsdigita/cms/Template.java +++ b/ccm-cms/src/com/arsdigita/cms/Template.java @@ -34,7 +34,7 @@ import java.util.Map; * * @author Stanislav Freidin (sfreidin@arsdigita.com) * - * @version $Id: Template.java 754 2005-09-02 13:26:17Z sskracic $ + * @version $Id: Template.java 1942 2009-05-29 07:53:23Z terry $ */ public class Template extends TextAsset { diff --git a/ccm-cms/src/com/arsdigita/cms/TemplateCollection.java b/ccm-cms/src/com/arsdigita/cms/TemplateCollection.java index b0a19135d..c4efe550c 100755 --- a/ccm-cms/src/com/arsdigita/cms/TemplateCollection.java +++ b/ccm-cms/src/com/arsdigita/cms/TemplateCollection.java @@ -30,7 +30,7 @@ import com.arsdigita.mimetypes.MimeType; * link attributes. * * @author Stanislav Freidin (sfreidin@arsdigita.com) - * @version $Id: TemplateCollection.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: TemplateCollection.java 1940 2009-05-29 07:15:05Z terry $ * * @see com.arsdigita.domain.DomainCollection * @see com.arsdigita.persistence.DataCollection @@ -38,8 +38,6 @@ import com.arsdigita.mimetypes.MimeType; */ public abstract class TemplateCollection extends DomainCollection { - public static final String versionId = "$Id: TemplateCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public static final String USE_CONTEXT = "useContext"; public static final String IS_DEFAULT = "isDefault"; public static final String TEMPLATE = "template"; diff --git a/ccm-cms/src/com/arsdigita/cms/TemplateManager.java b/ccm-cms/src/com/arsdigita/cms/TemplateManager.java index ee5fca382..7bcfbbebd 100755 --- a/ccm-cms/src/com/arsdigita/cms/TemplateManager.java +++ b/ccm-cms/src/com/arsdigita/cms/TemplateManager.java @@ -60,11 +60,10 @@ import com.arsdigita.mimetypes.MimeType; * @author Karl Goldstein (karlg@arsdigita.com) * @author Stanislav Freidin (sfreidin@arsdigita.com) * @version $Revision: #9 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: TemplateManager.java 287 2005-02-22 00:29:02Z sskracic $ **/ public interface TemplateManager { - public static final String versionId = "$Id: TemplateManager.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - /** * The default use context for templates */ diff --git a/ccm-cms/src/com/arsdigita/cms/TemplateManagerFactory.java b/ccm-cms/src/com/arsdigita/cms/TemplateManagerFactory.java index 4dbba9205..b722cc792 100755 --- a/ccm-cms/src/com/arsdigita/cms/TemplateManagerFactory.java +++ b/ccm-cms/src/com/arsdigita/cms/TemplateManagerFactory.java @@ -26,11 +26,10 @@ package com.arsdigita.cms; * * @author Karl Goldstein (karlg@arsdigita.com) * @version $Revision: #8 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: TemplateManagerFactory.java 287 2005-02-22 00:29:02Z sskracic $ */ public class TemplateManagerFactory { - public static final String versionId = "$Id: TemplateManagerFactory.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static TemplateManager s_templateManager = new DefaultTemplateManager(); diff --git a/ccm-cms/src/com/arsdigita/cms/TextAsset.java b/ccm-cms/src/com/arsdigita/cms/TextAsset.java index 7cce3b231..713bf272f 100755 --- a/ccm-cms/src/com/arsdigita/cms/TextAsset.java +++ b/ccm-cms/src/com/arsdigita/cms/TextAsset.java @@ -37,11 +37,10 @@ import java.math.BigDecimal; * @author Jack Chung (flattop@arsdigita.com) * * @version $Revision: #14 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: TextAsset.java 287 2005-02-22 00:29:02Z sskracic $ */ public class TextAsset extends Asset { - public static final String versionId = "$Id: TextAsset.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.TextAsset"; diff --git a/ccm-cms/src/com/arsdigita/cms/TextPage.java b/ccm-cms/src/com/arsdigita/cms/TextPage.java index 3a456cd6e..c8aaa1c47 100755 --- a/ccm-cms/src/com/arsdigita/cms/TextPage.java +++ b/ccm-cms/src/com/arsdigita/cms/TextPage.java @@ -32,7 +32,7 @@ import java.math.BigDecimal; * @author Jack Chung (flattop@arsdigita.com) * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #20 $ $DateTime: 2004/08/17 23:15:09 $ - * @version $Id: TextPage.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: TextPage.java 2070 2010-01-28 08:47:41Z pboy $ **/ public class TextPage extends ContentPage { diff --git a/ccm-cms/src/com/arsdigita/cms/VersionCopier.java b/ccm-cms/src/com/arsdigita/cms/VersionCopier.java index 9bc93f803..7c36e86f6 100755 --- a/ccm-cms/src/com/arsdigita/cms/VersionCopier.java +++ b/ccm-cms/src/com/arsdigita/cms/VersionCopier.java @@ -34,13 +34,9 @@ import java.util.HashSet; * point only to other live versions. * * @author Stanislav Freidin - * @version $Id: VersionCopier.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: VersionCopier.java 1942 2009-05-29 07:53:23Z terry $ */ class VersionCopier extends ObjectCopier { - public static final String versionId = - "$Id: VersionCopier.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static Logger s_log = Logger.getLogger(VersionCopier.class); diff --git a/ccm-cms/src/com/arsdigita/cms/VersionUpdater.java b/ccm-cms/src/com/arsdigita/cms/VersionUpdater.java index 28f882d34..651c32452 100755 --- a/ccm-cms/src/com/arsdigita/cms/VersionUpdater.java +++ b/ccm-cms/src/com/arsdigita/cms/VersionUpdater.java @@ -38,13 +38,11 @@ import java.util.Set; * or care about this class. * * @author Stanislav Freidin - * @version $Id: VersionUpdater.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: VersionUpdater.java 1940 2009-05-29 07:15:05Z terry $ */ class VersionUpdater extends DomainService { - public static final String versionId = "$Id: VersionUpdater.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static org.apache.log4j.Logger s_log = org.apache.log4j.Logger.getLogger(VersionUpdater.class); diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentGroup.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentGroup.java index 18005c926..cb72c7c27 100755 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentGroup.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentGroup.java @@ -36,7 +36,7 @@ import java.math.BigDecimal; * * @author Randy Graebner (randyg@redhat.com) * - * @version $Id: ContentGroup.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ContentGroup.java 1967 2009-08-29 21:05:51Z pboy $ */ public class ContentGroup extends ContentItem { diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentGroupAssociation.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentGroupAssociation.java index 1e9ae4d6a..057ed9a01 100755 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentGroupAssociation.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContentGroupAssociation.java @@ -39,7 +39,7 @@ import com.arsdigita.util.Assert; * * @author Randy Graebner (randyg@redhat.com) * - * @version $Id: ContentGroupAssociation.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ContentGroupAssociation.java 1967 2009-08-29 21:05:51Z pboy $ */ public class ContentGroupAssociation extends ContentItem { diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ContentGroupItemList.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ContentGroupItemList.java index 2d5155971..bc9b3d61a 100755 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ContentGroupItemList.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ContentGroupItemList.java @@ -50,11 +50,10 @@ import java.math.BigDecimal; /** * This displays a sortable list of items within a given content group * - * @version $Id: ContentGroupItemList.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ContentGroupItemList.java 1967 2009-08-29 21:05:51Z pboy $ */ class ContentGroupItemList extends SortableList { - private static final org.apache.log4j.Logger s_log = org.apache.log4j.Logger.getLogger(ContentGroupItemList.class); diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ImageDisplay.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ImageDisplay.java index b8527f977..ebca00eac 100755 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ImageDisplay.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/ImageDisplay.java @@ -36,7 +36,7 @@ import java.math.BigDecimal; * be nice about it. * * @author Hugh Brock (hbrock@redhat.com) - * @version $Id: ImageDisplay.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ImageDisplay.java 1967 2009-08-29 21:05:51Z pboy $ */ public class ImageDisplay extends SimpleComponent { diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/BaseAsset.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/BaseAsset.java index 9432f0776..c2f9d2410 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/BaseAsset.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/BaseAsset.java @@ -39,7 +39,7 @@ import javax.servlet.ServletException; /** * - * @version $Id: BaseAsset.java 1571 2007-04-20 15:57:54Z apevec $ + * @version $Id: BaseAsset.java 1967 2009-08-29 21:05:51Z pboy $ */ class BaseAsset extends ResourceHandlerImpl { diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSDispatcher.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSDispatcher.java index f9d0d29ff..0cbc30610 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSDispatcher.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSDispatcher.java @@ -101,7 +101,7 @@ import org.apache.log4j.Logger; * @author Michael Pih (pihman@arsdigita.com) * @author Uday Mathur (umathur@arsdigita.com) * @author Jack Chung (flattop@arsdigita.com) - * @version $Id: CMSDispatcher.java 1795 2009-02-07 10:47:32Z pboy $ + * @version $Id: CMSDispatcher.java 1967 2009-08-29 21:05:51Z pboy $ */ public class CMSDispatcher implements Dispatcher, ChainedDispatcher { diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSPage.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSPage.java index 913edc939..1fdbc808f 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSPage.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/CMSPage.java @@ -68,7 +68,7 @@ import org.apache.log4j.Logger; * * @author Michael Pih (pihman@arsdigita.com) * @author Uday Mathur (umathur@arsdigita.com) - * @version $Id: CMSPage.java 1312 2006-09-04 11:26:55Z sskracic $ + * @version $Id: CMSPage.java 1967 2009-08-29 21:05:51Z pboy $ */ public class CMSPage extends Page implements ResourceHandler { diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/Cache.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/Cache.java index fc320cc98..6b93fb329 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/Cache.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/Cache.java @@ -22,7 +22,7 @@ package com.arsdigita.cms.dispatcher; *

An interface for caching objects.

* * @author Michael Pih (pihman@arsdigita.com) - * @version $Id: Cache.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: Cache.java 1967 2009-08-29 21:05:51Z pboy $ */ public interface Cache { diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/ContentCenterDispatcher.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/ContentCenterDispatcher.java index 246ea052b..7a715602d 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/ContentCenterDispatcher.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/ContentCenterDispatcher.java @@ -66,7 +66,7 @@ import org.apache.log4j.Logger; * * * @author Michael Pih (pihman@arsdigita.com) - * @version $Id: ContentCenterDispatcher.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ContentCenterDispatcher.java 1967 2009-08-29 21:05:51Z pboy $ */ public class ContentCenterDispatcher extends LockableImpl implements Dispatcher { diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/FileDispatcher.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/FileDispatcher.java index c84dea9f6..de0a30869 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/FileDispatcher.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/FileDispatcher.java @@ -38,11 +38,10 @@ import org.apache.log4j.Logger; * * @author Karl Goldstein (karlg@arsdigita.com) * @version $Revision: #13 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: FileDispatcher.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class FileDispatcher implements ChainedDispatcher { - public static final String versionId = "$Id: FileDispatcher.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static Logger s_log = Logger.getLogger(ChainedDispatcher.class); diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemResolver.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemResolver.java index 07848dc83..6e7d398d7 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemResolver.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemResolver.java @@ -45,11 +45,11 @@ import java.math.BigDecimal; * * @author Michael Pih (pihman@arsdigita.com) * @author Stanislav Freidin (sfreidin@arsdigita.com) - * @version $Revision: #10 $ $DateTime: 2004/08/17 23:15:09 $ */ + * @version $Revision: #10 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: ItemResolver.java 287 2005-02-22 00:29:02Z sskracic $ + */ public interface ItemResolver { - public static final String versionId = "$Id: ItemResolver.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - /** * Return a content item based on section, url, and use context. * diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/MasterPage.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/MasterPage.java index 335028e41..ef5921f4e 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/MasterPage.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/MasterPage.java @@ -35,11 +35,10 @@ import javax.servlet.http.HttpServletRequest; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #7 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: MasterPage.java 287 2005-02-22 00:29:02Z sskracic $ */ public class MasterPage extends CMSPage { - public static final String versionId = "$Id: MasterPage.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public MasterPage() { super("Master", new SimpleContainer()); setIdAttr("master_page"); diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java index 7bd3a88bd..5d3269a23 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java @@ -48,7 +48,7 @@ import java.util.StringTokenizer; * Created Mon Jan 20 14:30:03 2003. * * @author Michael Hanisch - * @version $Id: MultilingualItemResolver.java 1795 2009-02-07 10:47:32Z pboy $ + * @version $Id: MultilingualItemResolver.java 2026 2009-11-02 10:04:34Z pboy $ */ public class MultilingualItemResolver extends AbstractItemResolver implements ItemResolver { @@ -57,7 +57,7 @@ public class MultilingualItemResolver extends AbstractItemResolver implements It private static MasterPage s_masterP = null; private static final String ADMIN_PREFIX = "admin"; - + /** * The string identifying an item's ID in the query string of a * URL. @@ -659,7 +659,7 @@ public class MultilingualItemResolver extends AbstractItemResolver implements It pos++; // skip the "=" - // ID is the string between the isEqual (at pos) and the next separator + // ID is the string between the equal (at pos) and the next separator int i = item_id.indexOf(SEPARATOR); item_id = item_id.substring(pos, Math.min(i, item_id.length() -1)); @@ -691,48 +691,48 @@ public class MultilingualItemResolver extends AbstractItemResolver implements It Folder parentFolder) { if (s_log.isDebugEnabled()) { s_log.debug("Resolving the item for live URL " + url + - " and parent folder " + parentFolder); + " and parent folder " + parentFolder); } - + if (parentFolder == null || url == null || url.equals("")) { if (s_log.isDebugEnabled()) { s_log.debug("The url is null or parent folder was null " + - "or something else is wrong, so just return " + - "the parent folder"); + "or something else is wrong, so just return " + + "the parent folder"); } - + return parentFolder; } - + int len = url.length(); int index = url.indexOf('/'); - + if (index >= 0) { s_log.debug("The URL starts with a slash; paring off the first " + - "URL element and recursing"); - + "URL element and recursing"); + // If we got first slash (index == 0), ignore it and go // on, sample '/foo/bar/item.html.en', in next recursion // will have deal with 'foo' folder. - + String name = index > 0 ? url.substring(0, index) : ""; parentFolder = "".equals(name) ? parentFolder : (Folder) parentFolder.getItem(URLEncoder.encode(name), true); url = index + 1 < len ? url.substring(index + 1) : ""; - + return getItemFromLiveURL(url, parentFolder); } else { s_log.debug("Found a file element in the URL"); - - String[] nameAndLang = getNameAndLangFromURLFrag(url); + + String[] nameAndLang = getNameAndLangFromURLFrag(url); String name = nameAndLang[0]; String lang = nameAndLang[1]; - + ContentItem item = parentFolder.getItem(URLEncoder.encode(name), false); - return getItemFromLangAndBundle(lang, item); + return getItemFromLangAndBundle(lang, item); } } - + /** * Returns an array containing the the item's name and lang based * on the URL fragment. diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/PageResolver.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/PageResolver.java index 482c2483c..00341a41d 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/PageResolver.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/PageResolver.java @@ -32,11 +32,10 @@ import java.util.HashMap; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #8 $ $Date: 2004/08/17 $ + * @version $Id: PageResolver.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class PageResolver { - public static final String versionId = "$Id: PageResolver.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private BigDecimal m_sectionID; // Used for caching pages diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/Resource.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/Resource.java index 4fc2a23c7..7817858fe 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/Resource.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/Resource.java @@ -39,11 +39,10 @@ import java.sql.SQLException; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #9 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: Resource.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class Resource extends DomainObject { - public static final String versionId = "$Id: Resource.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.Resource"; diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceHandler.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceHandler.java index 7a2cf0361..5ea75baf6 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceHandler.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceHandler.java @@ -31,11 +31,10 @@ import javax.servlet.http.HttpServletRequest; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #8 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: ResourceHandler.java 287 2005-02-22 00:29:02Z sskracic $ **/ public interface ResourceHandler extends Dispatcher { - public static final String versionId = "$Id: ResourceHandler.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - /** * This method is called by the {@link com.arsdigita.dispatcher.Dispatcher} * that initializes this page. diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceHandlerImpl.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceHandlerImpl.java index 71b434bdd..839adf48f 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceHandlerImpl.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceHandlerImpl.java @@ -41,12 +41,10 @@ import javax.servlet.http.HttpServletResponse; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #10 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: ResourceHandlerImpl.java 287 2005-02-22 00:29:02Z sskracic $ **/ public abstract class ResourceHandlerImpl implements ResourceHandler { - public static final String versionId = "$Id: ResourceHandlerImpl.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - - /** * This method is called by the {@link com.arsdigita.dispatcher.Dispatcher} * that initializes this page. diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceMapping.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceMapping.java index bee290224..e8aac641d 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceMapping.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceMapping.java @@ -33,11 +33,10 @@ import java.math.BigDecimal; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #7 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: ResourceMapping.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class ResourceMapping extends DomainObject { - public static final String versionId = "$Id: ResourceMapping.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public static final String TYPE = "com.arsdigita.cms.ResourceMapping"; private static final String SECTION_ID = "sectionId"; diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceType.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceType.java index b29314240..bfc3c6b4f 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceType.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/ResourceType.java @@ -36,11 +36,10 @@ import com.arsdigita.persistence.SessionManager; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #9 $ $DateTime: 2004/08/17 23:15:09 $ - **/ + * @version $Id: ResourceType.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class ResourceType extends DomainObject { - public static final String versionId = "$Id: ResourceType.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.ResourceType"; diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/ServiceDispatcher.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/ServiceDispatcher.java index 0a5e8563c..b1b14b34c 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/ServiceDispatcher.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/ServiceDispatcher.java @@ -68,12 +68,10 @@ import java.util.Map; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #13 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: ServiceDispatcher.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ServiceDispatcher extends LockableImpl implements Dispatcher { - public static final String versionId = "$Id: ServiceDispatcher.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - - /** * The path of the file that maps resources. */ diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleCache.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleCache.java index 1675cb2cf..02791b3a6 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleCache.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleCache.java @@ -26,11 +26,10 @@ import java.util.Map; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #6 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: SimpleCache.java 287 2005-02-22 00:29:02Z sskracic $ */ public class SimpleCache extends Hashtable{ - public static final String versionId = "$Id: SimpleCache.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public SimpleCache() { super(); } diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleItemResolver.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleItemResolver.java index 72a128da8..9d12ebfeb 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleItemResolver.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleItemResolver.java @@ -55,11 +55,10 @@ import java.util.StringTokenizer; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #15 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: SimpleItemResolver.java 287 2005-02-22 00:29:02Z sskracic $ */ public class SimpleItemResolver extends AbstractItemResolver implements ItemResolver { - public static final String versionId = "$Id: SimpleItemResolver.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static final Logger s_log = Logger.getLogger(SimpleItemResolver.class.getName()); diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/SimplePageResolver.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/SimplePageResolver.java index c5d59771f..eddc6571f 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/SimplePageResolver.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/SimplePageResolver.java @@ -39,12 +39,9 @@ import javax.servlet.ServletException; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #11 $ $Date: 2004/08/17 $ + * @version $Id: SimplePageResolver.java 287 2005-02-22 00:29:02Z sskracic $ */ public class SimplePageResolver extends PageResolver { - public static final String versionId = - "$Id: SimplePageResolver.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (SimplePageResolver.class); diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleXMLGenerator.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleXMLGenerator.java index 5b3ea8ac7..cbb75a117 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleXMLGenerator.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleXMLGenerator.java @@ -51,11 +51,10 @@ import java.util.Iterator; * * @author Michael Pih * @version $Revision: #20 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: SimpleXMLGenerator.java 1651 2007-09-18 10:30:06Z chrisg23 $ */ public class SimpleXMLGenerator implements XMLGenerator { - public static final String versionId = "$Id: SimpleXMLGenerator.java 1651 2007-09-18 10:30:06Z chrisg23 $ by $Author: chrisg23 $, $DateTime: 2004/08/17 23:15:09 $"; - private static Logger s_log = Logger.getLogger(SimpleXMLGenerator.class); diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/StreamAsset.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/StreamAsset.java index cb14de400..7d60d786d 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/StreamAsset.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/StreamAsset.java @@ -30,11 +30,10 @@ import com.arsdigita.cms.BinaryAsset; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #13 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: StreamAsset.java 1166 2006-06-14 11:45:15Z fabrice $ */ public class StreamAsset extends BaseAsset { - public static final String versionId = "$Id: StreamAsset.java 1166 2006-06-14 11:45:15Z fabrice $ by $Author: fabrice $, $DateTime: 2004/08/17 23:15:09 $"; - private static final Logger s_log = Logger.getLogger(StreamAsset.class); public final static String ASSET_ID = BaseAsset.ASSET_ID; diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/StreamImage.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/StreamImage.java index a80c993ea..7f5df4671 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/StreamImage.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/StreamImage.java @@ -48,11 +48,10 @@ import org.apache.log4j.Logger; * @author Stanislav Freidin (sfreidin@arsdigita.com) * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #20 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: StreamImage.java 1571 2007-04-20 15:57:54Z apevec $ */ public class StreamImage extends ResourceHandlerImpl { - public static final String versionId = "$Id: StreamImage.java 1571 2007-04-20 15:57:54Z apevec $ by $Author: apevec $, $DateTime: 2004/08/17 23:15:09 $"; - public static final String IMAGE_ID = "image_id"; public static final String OID_PARAM = "oid"; diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/TemplateResolver.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/TemplateResolver.java index 84065b4a4..7b77c4a52 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/TemplateResolver.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/TemplateResolver.java @@ -40,7 +40,7 @@ import javax.servlet.http.HttpServletRequest; * * * @author Karl Goldstein (karlg@arsdigita.com) - * @version $Id: TemplateResolver.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: TemplateResolver.java 1967 2009-08-29 21:05:51Z pboy $ **/ public interface TemplateResolver { diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/Utilities.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/Utilities.java index 2f5025c30..59394574c 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/Utilities.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/Utilities.java @@ -50,7 +50,7 @@ import java.util.Map; * System.

* * @author Michael Pih (pihman@arsdigita.com) - * @version $Id: Utilities.java 1546 2007-03-28 14:28:57Z chrisgilbert23 $ + * @version $Id: Utilities.java 1967 2009-08-29 21:05:51Z pboy $ */ public class Utilities { diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/XMLGenerator.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/XMLGenerator.java index ed494dc27..b72a9dced 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/XMLGenerator.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/XMLGenerator.java @@ -36,7 +36,7 @@ import com.arsdigita.xml.Element; * formats it as an XML document.

* * @author Michael Pih (pihman@arsdigita.com) - * @version $Id: XMLGenerator.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: XMLGenerator.java 1967 2009-08-29 21:05:51Z pboy $ */ public interface XMLGenerator { diff --git a/ccm-cms/src/com/arsdigita/cms/enterprise.init b/ccm-cms/src/com/arsdigita/cms/enterprise.init index fed704e33..883cf6af7 100755 --- a/ccm-cms/src/com/arsdigita/cms/enterprise.init +++ b/ccm-cms/src/com/arsdigita/cms/enterprise.init @@ -1,6 +1,6 @@ // CMS initialization file // -// $Id: enterprise.init 1357 2006-11-06 13:02:24Z sskracic $ +// $Id: enterprise.init 2070 2010-01-28 08:47:41Z pboy $ // init com.arsdigita.cms.installer.Initializer { @@ -28,7 +28,6 @@ init com.arsdigita.cms.installer.SectionInitializer { // in integrations.properties of the respective bundle // - registerDomain(navigationKey, "/content/", null); in ldn.aplaws.Loader name = "content"; -//-- name = "intern"; // List of roles to create. First field is role name, // second is the description, third is a list of @@ -87,7 +86,6 @@ init com.arsdigita.cms.installer.SectionInitializer { // Wether to make content viewable to 'The Public', ie non-registered users public = true; -//-- public = false; // When to generate email alerts: by default, generate email alerts // on enable, finish, and rollback (happens on rejection) diff --git a/ccm-cms/src/com/arsdigita/cms/installer/SectionInitializer.java b/ccm-cms/src/com/arsdigita/cms/installer/SectionInitializer.java index 14aae18ce..2683f2ce6 100755 --- a/ccm-cms/src/com/arsdigita/cms/installer/SectionInitializer.java +++ b/ccm-cms/src/com/arsdigita/cms/installer/SectionInitializer.java @@ -44,19 +44,17 @@ import java.util.Timer; * section, the types is a list of content types * to register * - * @author Daniel Berrange (berrange@redhat.com) - * @author Michael Pih - * @version $Revision: #43 $ $DateTime: 2004/08/17 23:15:09 $ - * * XXX As of version 6.5 (pboy): * Commented out in cms.enterprise.init since several versions. Not invoked by * any other package of trunk. Some Parameters (as ITEM_RESOLVER_CLASS) are * configured in ContentSectionConfig.java as a temporary measure. + * + * @author Daniel Berrange (berrange@redhat.com) + * @author Michael Pih + * @version $Id: SectionInitializer.java 287 2005-02-22 00:29:02Z sskracic $ */ public class SectionInitializer extends com.arsdigita.kernel.BaseInitializer { - public static final String versionId = "$Id: SectionInitializer.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static org.apache.log4j.Logger s_log = org.apache.log4j.Logger.getLogger(SectionInitializer.class); diff --git a/ccm-cms/src/com/arsdigita/cms/installer/ServiceInstaller.java b/ccm-cms/src/com/arsdigita/cms/installer/ServiceInstaller.java index a748051c8..800b0e461 100755 --- a/ccm-cms/src/com/arsdigita/cms/installer/ServiceInstaller.java +++ b/ccm-cms/src/com/arsdigita/cms/installer/ServiceInstaller.java @@ -33,11 +33,10 @@ import com.arsdigita.kernel.SiteNode; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #7 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: ServiceInstaller.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ServiceInstaller implements PackageEventListener { - public static final String versionId = "$Id: ServiceInstaller.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public final static String PACKAGE_KEY = "cms-service"; diff --git a/ccm-cms/src/com/arsdigita/cms/installer/WorkspaceInstaller.java b/ccm-cms/src/com/arsdigita/cms/installer/WorkspaceInstaller.java index 638c3f7fb..152c4d8f0 100755 --- a/ccm-cms/src/com/arsdigita/cms/installer/WorkspaceInstaller.java +++ b/ccm-cms/src/com/arsdigita/cms/installer/WorkspaceInstaller.java @@ -34,11 +34,10 @@ import com.arsdigita.kernel.Stylesheet; * @author Michael Pih (pihman@arsdigita.com) * @author Jack Chung (flattop@arsdigita.com) * @version $Revision: #10 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: WorkspaceInstaller.java 287 2005-02-22 00:29:02Z sskracic $ */ public class WorkspaceInstaller implements PackageEventListener { - public static final String versionId = "$Id: WorkspaceInstaller.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public static final String PACKAGE_KEY = "content-center"; private static final String INSTANCE_NAME = "Content Center"; private static final String DISPATCHER_CLASS = diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/Duration.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/Duration.java index 602e443f8..3bbcf30b0 100755 --- a/ccm-cms/src/com/arsdigita/cms/lifecycle/Duration.java +++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/Duration.java @@ -25,7 +25,7 @@ import com.arsdigita.util.Assert; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #11 $ $Date: 2004/08/17 $ - * @version $Id: Duration.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: Duration.java 2070 2010-01-28 08:47:41Z pboy $ */ public class Duration { diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/Initializer.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/Initializer.java index 166b4a05f..e422c6e86 100755 --- a/ccm-cms/src/com/arsdigita/cms/lifecycle/Initializer.java +++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/Initializer.java @@ -34,7 +34,7 @@ import org.apache.log4j.Logger; * to the list of initializers to be executed * * @author Peter Boy (pboy@barkhof.uni-bremen.de) - * @version $Id: $ + * @version $Id: Initializer.java 2070 2010-01-28 08:47:41Z pboy $ * */ public class Initializer extends com.arsdigita.runtime.GenericInitializer { @@ -78,7 +78,7 @@ public class Initializer extends com.arsdigita.runtime.GenericInitializer { } s_log.debug("lifecycle background processing started"); - } + } /** * diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/Lifecycle.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/Lifecycle.java index d3328b180..6970a7ede 100755 --- a/ccm-cms/src/com/arsdigita/cms/lifecycle/Lifecycle.java +++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/Lifecycle.java @@ -44,7 +44,7 @@ import java.util.Date; * @author Jack Chung * @author Michael Pih * @version $Revision: 1.1 $ $DateTime: 2004/08/17 23:15:09 $ - * @version $Id: Lifecycle.java 1585 2007-05-29 13:12:44Z chrisgilbert23 $ + * @version $Id: Lifecycle.java 2070 2010-01-28 08:47:41Z pboy $ */ public class Lifecycle extends ACSObject { diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleDefinition.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleDefinition.java index 2ba7b3a81..0ee44b841 100755 --- a/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleDefinition.java +++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleDefinition.java @@ -39,7 +39,7 @@ import java.util.Date; * @author Jack Chung (flattop@arsdigita.com) * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #14 $ $Date: 2004/08/17 $ - * @version $Id: LifecycleDefinition.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: LifecycleDefinition.java 2070 2010-01-28 08:47:41Z pboy $ */ public class LifecycleDefinition extends ACSObject { diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleDefinitionCollection.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleDefinitionCollection.java index 23dc636d7..d53aa6153 100755 --- a/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleDefinitionCollection.java +++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleDefinitionCollection.java @@ -29,7 +29,7 @@ import com.arsdigita.persistence.DataCollection; * * @author Jack Chung (flattop@arsdigita.com) * @version $Revision: #8 $ $Date: 2004/08/17 $ - * @version $Id: LifecycleDefinitionCollection.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: LifecycleDefinitionCollection.java 2070 2010-01-28 08:47:41Z pboy $ */ public class LifecycleDefinitionCollection extends DomainCollection { diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleEvent.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleEvent.java index bedd45211..e978f40a8 100755 --- a/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleEvent.java +++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleEvent.java @@ -29,7 +29,7 @@ import java.util.Date; * * @author Jack Chung (flattop@arsdigita.com) * @version $Revision: #9 $ $DateTime: 2004/08/17 23:15:09 $ - * @version $Id: LifecycleEvent.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: LifecycleEvent.java 2070 2010-01-28 08:47:41Z pboy $ */ public class LifecycleEvent { diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleListener.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleListener.java index 7ff0b568e..c5a835e23 100755 --- a/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleListener.java +++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleListener.java @@ -25,7 +25,7 @@ package com.arsdigita.cms.lifecycle; * * @author Jack Chung (flattop@arsdigita.com) * @version $Revision: #7 $ $DateTime: 2004/08/17 23:15:09 $ - * @version $Id: LifecycleListener.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: LifecycleListener.java 2070 2010-01-28 08:47:41Z pboy $ */ diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleService.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleService.java index 783573171..e93dd6f61 100755 --- a/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleService.java +++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/LifecycleService.java @@ -40,7 +40,7 @@ import java.sql.SQLException; * * @author Jack Chung (flattop@arsdigita.com) * @version $Revision: #13 $ $DateTime: 2004/08/17 23:15:09 $ - * @version $Id: LifecycleService.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: LifecycleService.java 2070 2010-01-28 08:47:41Z pboy $ */ public class LifecycleService extends DomainObject{ diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/Phase.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/Phase.java index bdb7ae2d6..20da8e32b 100755 --- a/ccm-cms/src/com/arsdigita/cms/lifecycle/Phase.java +++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/Phase.java @@ -38,7 +38,7 @@ import java.util.Date; * @author Jack Chung (flattop@arsdigita.com) * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: 1.1 $ $DateTime: 2004/08/17 23:15:09 $ - * @version $Id: Phase.java 1583 2007-05-25 15:32:13Z chrisgilbert23 $ + * @version $Id: Phase.java 2070 2010-01-28 08:47:41Z pboy $ */ public class Phase extends ACSObject { diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/PublishLifecycleListener.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/PublishLifecycleListener.java index 24378c83d..76a7f5760 100755 --- a/ccm-cms/src/com/arsdigita/cms/lifecycle/PublishLifecycleListener.java +++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/PublishLifecycleListener.java @@ -30,7 +30,7 @@ import org.apache.log4j.Logger; * * @author Michael Pih * @author Stanislav Freidin - * @version $Id: PublishLifecycleListener.java 754 2005-09-02 13:26:17Z sskracic $ + * @version $Id: PublishLifecycleListener.java 1942 2009-05-29 07:53:23Z terry $ */ public class PublishLifecycleListener implements LifecycleListener { diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/Scheduler.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/Scheduler.java index 66007688b..98b0b80ea 100755 --- a/ccm-cms/src/com/arsdigita/cms/lifecycle/Scheduler.java +++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/Scheduler.java @@ -44,7 +44,7 @@ import org.apache.log4j.Logger; * @author Stanislav Freidin (stas@arsdigita.com) * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #20 $ $DateTime: 2004/08/17 23:15:09 $ - * @version $Id: Scheduler.java 1583 2007-05-25 15:32:13Z chrisgilbert23 $ + * @version $Id: Scheduler.java 2070 2010-01-28 08:47:41Z pboy $ */ public class Scheduler { diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/SchedulerTask.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/SchedulerTask.java index ed5946091..21c0a10e5 100755 --- a/ccm-cms/src/com/arsdigita/cms/lifecycle/SchedulerTask.java +++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/SchedulerTask.java @@ -29,7 +29,7 @@ import java.util.TimerTask; * created by Scheduler. It simply calls the run method of Scheduler. * * @author Jack Chung (flattop@arsdigita.com) - * @version $Id: SchedulerTask.java 754 2005-09-02 13:26:17Z sskracic $ + * @version $Id: SchedulerTask.java 2070 2010-01-28 08:47:41Z pboy $ **/ class SchedulerTask extends TimerTask { diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/package.html b/ccm-cms/src/com/arsdigita/cms/lifecycle/package.html index ffa436307..6d57f8161 100755 --- a/ccm-cms/src/com/arsdigita/cms/lifecycle/package.html +++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/package.html @@ -38,7 +38,7 @@ phase becomes active. The duration is the length of time that the phase remains active.

-

Last modified:
$Id: $

+

Last modified:
$Id: package.html 1967 2009-08-29 21:05:51Z pboy $

diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ACSObjectRequestLocal.java b/ccm-cms/src/com/arsdigita/cms/ui/ACSObjectRequestLocal.java index f98d5dae1..e75189ef5 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ACSObjectRequestLocal.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ACSObjectRequestLocal.java @@ -24,11 +24,11 @@ import com.arsdigita.kernel.ACSObject; import org.apache.log4j.Logger; +/** + * + * @version $Id: ACSObjectRequestLocal.java 754 2005-09-02 13:26:17Z sskracic $ + */ public class ACSObjectRequestLocal extends RequestLocal { - public static final String versionId = - "$Id: ACSObjectRequestLocal.java 754 2005-09-02 13:26:17Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (ACSObjectRequestLocal.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/AccessDenied.java b/ccm-cms/src/com/arsdigita/cms/ui/AccessDenied.java index b3633c099..da2f3e14f 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/AccessDenied.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/AccessDenied.java @@ -27,12 +27,10 @@ import com.arsdigita.cms.util.GlobalizationUtil; *

Access Denied page

* * @author Michael Pih (pihman@arsdigita.com) - * @version $Revision: #9 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: AccessDenied.java 287 2005-02-22 00:29:02Z sskracic $ */ public class AccessDenied extends CMSPage { - public static final String versionId = "$Id: AccessDenied.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public AccessDenied() { super("Access Denied"); setClassAttr("AccessDenied"); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ArticleImageDisplay.java b/ccm-cms/src/com/arsdigita/cms/ui/ArticleImageDisplay.java index d9497fb31..650f79f7d 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ArticleImageDisplay.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ArticleImageDisplay.java @@ -36,11 +36,10 @@ import com.arsdigita.xml.Element; * @version $Revision: #8 $ $DateTime: 2004/08/17 23:15:09 $ * @author Michael Pih (pihman@arsdigita.com) * @author Stanislav Freidin (stas@arsdigita.com) + * @version $Id: ArticleImageDisplay.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ArticleImageDisplay extends ImageDisplay { - public static final String versionId = "$Id: ArticleImageDisplay.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private final ItemSelectionModel m_article; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/BackButton.java b/ccm-cms/src/com/arsdigita/cms/ui/BackButton.java index e48e337a5..0323c1b24 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/BackButton.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/BackButton.java @@ -34,12 +34,10 @@ import javax.servlet.ServletException; * Just override the back(PageState s) method to use. * * @author Michael Pih (pihman@arsdigita.com) - * @version $Revision: #7 $ $Date: 2004/08/17 $ + * @version $Id: BackButton.java 287 2005-02-22 00:29:02Z sskracic $ */ public class BackButton extends ColumnPanel { - public static final String versionId = "$Id: BackButton.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private final static String BACK_EVENT = "back"; private final static String IMAGE_URL = Utilities.getGlobalAssetsURL() + "back.gif"; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/BaseAdminPane.java b/ccm-cms/src/com/arsdigita/cms/ui/BaseAdminPane.java index 399ee3668..b18c768bf 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/BaseAdminPane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/BaseAdminPane.java @@ -36,10 +36,6 @@ import org.apache.log4j.Logger; */ public abstract class BaseAdminPane extends SelectionPanel implements SecurityConstants { - public static final String versionId = - "$Id: BaseAdminPane.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (BaseAdminPane.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/BaseDeleteForm.java b/ccm-cms/src/com/arsdigita/cms/ui/BaseDeleteForm.java index 33d5c3192..efd0a2559 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/BaseDeleteForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/BaseDeleteForm.java @@ -31,10 +31,6 @@ import com.arsdigita.globalization.GlobalizedMessage; */ public abstract class BaseDeleteForm extends BaseForm implements FormProcessListener { - public static final String versionId = - "$Id: BaseDeleteForm.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; protected final Submit m_delete; protected final Submit m_cancel; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/BaseForm.java b/ccm-cms/src/com/arsdigita/cms/ui/BaseForm.java index d4d25de02..f9cd07ef3 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/BaseForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/BaseForm.java @@ -50,10 +50,6 @@ import org.apache.log4j.Logger; */ public abstract class BaseForm extends Form implements Cancellable, SecurityConstants { - public static final String versionId = - "$Id: BaseForm.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger(BaseForm.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/BaseItemPane.java b/ccm-cms/src/com/arsdigita/cms/ui/BaseItemPane.java index 3b0773c2a..249888994 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/BaseItemPane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/BaseItemPane.java @@ -30,10 +30,6 @@ import org.apache.log4j.Logger; */ public abstract class BaseItemPane extends ModalPanel implements SecurityConstants { - public static final String versionId = - "$Id: BaseItemPane.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (BaseItemPane.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/BaseTree.java b/ccm-cms/src/com/arsdigita/cms/ui/BaseTree.java index 133ef94b9..670876e55 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/BaseTree.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/BaseTree.java @@ -34,10 +34,6 @@ import org.apache.log4j.Logger; * @version $Id: BaseTree.java 287 2005-02-22 00:29:02Z sskracic $ */ public class BaseTree extends Tree { - public static final String versionId = - "$Id: BaseTree.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger(BaseTree.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/BrowsePane.java b/ccm-cms/src/com/arsdigita/cms/ui/BrowsePane.java index 96ef96da5..ae46e3176 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/BrowsePane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/BrowsePane.java @@ -52,10 +52,6 @@ import org.apache.log4j.Logger; * @version $Id: BrowsePane.java 1325 2006-09-22 08:11:33Z sskracic $ */ public class BrowsePane extends LayoutPanel implements Resettable { - public static final String versionId = - "$Id: BrowsePane.java 1325 2006-09-22 08:11:33Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger(BrowsePane.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/CMSContainer.java b/ccm-cms/src/com/arsdigita/cms/ui/CMSContainer.java index e39174ada..3412ed22d 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/CMSContainer.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/CMSContainer.java @@ -26,12 +26,10 @@ import com.arsdigita.bebop.SimpleContainer; * A simple container with XML wrapper tags. * * @author Michael Pih (pihman@arsdigita.com) - * @version $Revision: #10 $ $Date: 2004/08/17 $ + * @version $Id: CMSContainer.java 287 2005-02-22 00:29:02Z sskracic $ */ public class CMSContainer extends SimpleContainer { - public static final String versionId = "$Id: CMSContainer.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public final static String CMS_XML_NS = "http://www.arsdigita.com/cms/1.0"; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/CMSForm.java b/ccm-cms/src/com/arsdigita/cms/ui/CMSForm.java index 2c27240f3..22aef6565 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/CMSForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/CMSForm.java @@ -32,10 +32,6 @@ import com.arsdigita.toolbox.ui.Cancellable; * @version $Id: CMSForm.java 287 2005-02-22 00:29:02Z sskracic $ */ public class CMSForm extends Form implements Cancellable { - public static final String versionId = - "$Id: CMSForm.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; public static final String CLASS = "CMS Admin"; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/CategoryForm.java b/ccm-cms/src/com/arsdigita/cms/ui/CategoryForm.java index d33445a9b..a292be390 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/CategoryForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/CategoryForm.java @@ -70,7 +70,7 @@ import java.util.TreeMap; /** * This is an abstract class which displays the category assignment UI. * - * Displays two listboxes for assigning categories to items, with two + * Displays two listboxes for assigning categories to items, with two * submit buttons to move categories back and forth. The left * listbox displays all available categories which have not been * assigned to the current item. The right listbox displays all categories @@ -85,8 +85,6 @@ public abstract class CategoryForm extends Form implements FormProcessListener, FormValidationListener { - public static final String versionId = "$Id: CategoryForm.java 903 2005-09-22 05:39:04Z apevec $ by $Author: apevec $, $DateTime: 2004/08/17 23:15:09 $"; - private RequestLocal m_assigned; private Submit m_assign, m_remove; Label m_freeLabel, m_assignedLabel; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ContentItemContextBar.java b/ccm-cms/src/com/arsdigita/cms/ui/ContentItemContextBar.java index b71931954..83a8ea6d5 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ContentItemContextBar.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ContentItemContextBar.java @@ -39,10 +39,6 @@ import java.util.List; * @version $Id: ContentItemContextBar.java 287 2005-02-22 00:29:02Z sskracic $ */ class ContentItemContextBar extends ContentSectionContextBar { - public static final String versionId = - "$Id: ContentItemContextBar.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (ContentItemContextBar.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ContentItemNavbar.java b/ccm-cms/src/com/arsdigita/cms/ui/ContentItemNavbar.java index 2cf875682..31ae42d07 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ContentItemNavbar.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ContentItemNavbar.java @@ -34,11 +34,10 @@ import com.arsdigita.xml.Element; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #12 $ $Date: 2004/08/17 $ + * @version $Id: ContentItemNavbar.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ContentItemNavbar extends CMSContainer { - public static final String versionId = "$Id: ContentItemNavbar.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static org.apache.log4j.Logger s_log = org.apache.log4j.Logger.getLogger(ContentItemNavbar.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ContentItemPage.java b/ccm-cms/src/com/arsdigita/cms/ui/ContentItemPage.java index 67f12d3be..783f98cc2 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ContentItemPage.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ContentItemPage.java @@ -75,10 +75,6 @@ import org.apache.log4j.Logger; * @version $Id: ContentItemPage.java 754 2005-09-02 13:26:17Z sskracic $ */ public class ContentItemPage extends CMSPage implements ActionListener { - public static final String versionId = - "$Id: ContentItemPage.java 754 2005-09-02 13:26:17Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (ContentItemPage.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ContentPageTable.java b/ccm-cms/src/com/arsdigita/cms/ui/ContentPageTable.java index a4b6d753b..bcfd6cbc2 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ContentPageTable.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ContentPageTable.java @@ -69,8 +69,6 @@ import java.math.BigDecimal; * @version $Id: ContentPageTable.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ContentPageTable extends DataTable { - public static final String versionId = - "$Id: ContentPageTable.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; private ContentType m_type; private String m_queryName; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionComponent.java b/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionComponent.java index 5da0975e2..25c4d9294 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionComponent.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionComponent.java @@ -28,11 +28,11 @@ import com.arsdigita.xml.Element; /** * Show ContentSection info in generated xml. + * + * @version $Id: ContentSectionComponent.java,v 1.1 2003/09/26 20:49:24 cwolfe Exp $ by $ */ public class ContentSectionComponent extends SimpleComponent { - public static final String versionId = "$Id: ContentSectionComponent.java,v 1.1 2003/09/26 20:49:24 cwolfe Exp $ by $Author: cwolfe $, $DateTime: 2003/08/18 23:54:14 $"; - public ContentSectionComponent() { super(); } diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionContainer.java b/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionContainer.java index cc02bd8f9..8f99d4c9c 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionContainer.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionContainer.java @@ -73,13 +73,10 @@ import com.arsdigita.web.Web; * form. The same form is reused in every row of the table. * * @author Michael Bryzek - * @version $Revision: #13 $ $DateTime: 2004/08/17 23:15:09 $ - **/ + * @version $Id: ContentSectionContainer.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class ContentSectionContainer extends CMSContainer { - public static final String versionID = - "$Id: ContentSectionContainer.java 287 2005-02-22 00:29:02Z sskracic $"; - private ContentSectionTable m_table; private FormContainer m_formContainer; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionContextBar.java b/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionContextBar.java index 350eb4fbe..555053601 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionContextBar.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionContextBar.java @@ -43,10 +43,6 @@ import java.util.Stack; * @version $Id: ContentSectionContextBar.java 287 2005-02-22 00:29:02Z sskracic $ */ class ContentSectionContextBar extends WorkspaceContextBar { - public static final String versionId = - "$Id: ContentSectionContextBar.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (ContentSectionContextBar.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionNavbar.java b/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionNavbar.java index 930b4c253..6bd724e23 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionNavbar.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionNavbar.java @@ -33,13 +33,9 @@ import com.arsdigita.xml.Element; * Bread crumb trail for a content section. * * @author Michael Pih - * @version $Id: ContentSectionNavbar.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ContentSectionNavbar.java 1942 2009-05-29 07:53:23Z terry $ */ public class ContentSectionNavbar extends CMSContainer { - public static final String versionId = - "$Id: ContentSectionNavbar.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private DimensionalNavbar m_navbar; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionPage.java b/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionPage.java index b219c702b..542039f9c 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionPage.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionPage.java @@ -61,10 +61,6 @@ import javax.servlet.http.HttpServletRequest; * @version $Id: ContentSectionPage.java 754 2005-09-02 13:26:17Z sskracic $ */ public class ContentSectionPage extends CMSPage implements ActionListener { - public static final String versionId = - "$Id: ContentSectionPage.java 754 2005-09-02 13:26:17Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (ContentSectionPage.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionRequestLocal.java b/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionRequestLocal.java index e2b74bb99..f1c0c18e8 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionRequestLocal.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionRequestLocal.java @@ -24,11 +24,11 @@ import com.arsdigita.cms.CMS; import com.arsdigita.cms.ContentSection; import org.apache.log4j.Logger; +/** + * + * @version $Id: ContentSectionRequestLocal.java 287 2005-02-22 00:29:02Z sskracic $ + */ public final class ContentSectionRequestLocal extends RequestLocal { - public static final String versionId = - "$Id: ContentSectionRequestLocal.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (ContentSectionRequestLocal.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ControlButton.java b/ccm-cms/src/com/arsdigita/cms/ui/ControlButton.java index 73b17b854..32ac8aec7 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ControlButton.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ControlButton.java @@ -28,11 +28,11 @@ import com.arsdigita.cms.dispatcher.Utilities; /** * Creates a {@link ToggleLink} with a button-looking image * as a child + * + * @version $Id: ControlButton.java 754 2005-09-02 13:26:17Z sskracic $ */ public class ControlButton extends ControlLink { - public static final String versionId = "$Id: ControlButton.java 754 2005-09-02 13:26:17Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - /** * The URL of an "Edit" button */ diff --git a/ccm-cms/src/com/arsdigita/cms/ui/DataCollectionBuilder.java b/ccm-cms/src/com/arsdigita/cms/ui/DataCollectionBuilder.java index d47f56c3f..c248e3591 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/DataCollectionBuilder.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/DataCollectionBuilder.java @@ -26,12 +26,10 @@ import com.arsdigita.util.Lockable; /** * This class is used by the {@link DataTable} class in order * to construct a {@link DataCollection} during each request + * + * @version $Id: DataCollectionBuilder.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface DataCollectionBuilder extends Lockable { - public static final String versionId = - "$Id: DataCollectionBuilder.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; /** * Perform all neccessary database operations and return diff --git a/ccm-cms/src/com/arsdigita/cms/ui/DataCollectionOptionPrintListener.java b/ccm-cms/src/com/arsdigita/cms/ui/DataCollectionOptionPrintListener.java index edd508b50..b2a5a2efc 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/DataCollectionOptionPrintListener.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/DataCollectionOptionPrintListener.java @@ -24,10 +24,12 @@ import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataQuery; +/** + * + * @version $Id: DataQueryOptionPrintListener.java,v 1.1 2004/12/15 14:27:54 awux7820 Exp $ + */ public abstract class DataCollectionOptionPrintListener implements PrintListener { - public static final String versionId = "$Id: DataQueryOptionPrintListener.java,v 1.1 2004/12/15 14:27:54 awux7820 Exp $ by $Author: awux7820 $, $DateTime: 2004/04/07 16:07:11 $"; - public DataCollectionOptionPrintListener() { } diff --git a/ccm-cms/src/com/arsdigita/cms/ui/DataQueryOptionPrintListener.java b/ccm-cms/src/com/arsdigita/cms/ui/DataQueryOptionPrintListener.java index 211c843db..5c0aa1db0 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/DataQueryOptionPrintListener.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/DataQueryOptionPrintListener.java @@ -25,10 +25,12 @@ import com.arsdigita.bebop.form.Option; import com.arsdigita.bebop.form.OptionGroup; import com.arsdigita.persistence.DataQuery; +/** + * + * @version $Id: DataQueryOptionPrintListener.java 287 2005-02-22 00:29:02Z sskracic $ + */ public abstract class DataQueryOptionPrintListener implements PrintListener { - public static final String versionId = "$Id: DataQueryOptionPrintListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public DataQueryOptionPrintListener() { } diff --git a/ccm-cms/src/com/arsdigita/cms/ui/DefaultImageBrowserModel.java b/ccm-cms/src/com/arsdigita/cms/ui/DefaultImageBrowserModel.java index 0fe2d52ba..e3f11a644 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/DefaultImageBrowserModel.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/DefaultImageBrowserModel.java @@ -26,13 +26,11 @@ import com.arsdigita.cms.ImageAssetCollection; * given ImageAssetCollection * * @author Stanislav Freidin - * @version $Id: DefaultImageBrowserModel.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: DefaultImageBrowserModel.java 1940 2009-05-29 07:15:05Z terry $ * */ public class DefaultImageBrowserModel implements ImageBrowserModel { - public static final String versionId = "$Id: DefaultImageBrowserModel.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private ImageAssetCollection m_images; /** diff --git a/ccm-cms/src/com/arsdigita/cms/ui/DefaultImageBrowserModelBuilder.java b/ccm-cms/src/com/arsdigita/cms/ui/DefaultImageBrowserModelBuilder.java index 9cdf1a386..d1c5a7e2e 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/DefaultImageBrowserModelBuilder.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/DefaultImageBrowserModelBuilder.java @@ -36,13 +36,11 @@ import com.arsdigita.util.LockableImpl; * or null, the builder will return an {@link EmptyImageBrowserModel} * * @author Stanislav Freidin (sfreidin@arsdigita.com) - * @version $Id: DefaultImageBrowserModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: DefaultImageBrowserModelBuilder.java 1940 2009-05-29 07:15:05Z terry $ */ public class DefaultImageBrowserModelBuilder extends LockableImpl implements ImageBrowserModelBuilder, PaginationModelBuilder { - public static final String versionId = "$Id: DefaultImageBrowserModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private SingleSelectionModel m_keywordModel; private static ImageBrowserModel EMPTY_MODEL = new EmptyImageBrowserModel(); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/DomainObjectRenderer.java b/ccm-cms/src/com/arsdigita/cms/ui/DomainObjectRenderer.java index b3d0f55bc..dde764de1 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/DomainObjectRenderer.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/DomainObjectRenderer.java @@ -96,14 +96,12 @@ import java.util.Set; * Null values are not rendered at all in the XML. * * @author Stanislav Freidin - * @version $Id: DomainObjectRenderer.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: DomainObjectRenderer.java 1940 2009-05-29 07:15:05Z terry $ * */ public class DomainObjectRenderer extends SimpleContainer { - public static final String versionId = "$Id: DomainObjectRenderer.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private DomainObjectSelectionModel m_model; private int m_depth; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/EmptyImageBrowserModel.java b/ccm-cms/src/com/arsdigita/cms/ui/EmptyImageBrowserModel.java index 1d78d05a5..98c6b235b 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/EmptyImageBrowserModel.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/EmptyImageBrowserModel.java @@ -24,13 +24,11 @@ import com.arsdigita.cms.ImageAsset; * An {@link ImageBrowserModel} which is always empty * * @author Stanislav Freidin - * @version $Id: EmptyImageBrowserModel.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: EmptyImageBrowserModel.java 1940 2009-05-29 07:15:05Z terry $ * */ public class EmptyImageBrowserModel implements ImageBrowserModel { - public static final String versionId = "$Id: EmptyImageBrowserModel.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - /** * Construct a new EmptyImageBrowserModel */ diff --git a/ccm-cms/src/com/arsdigita/cms/ui/FileUploadSection.java b/ccm-cms/src/com/arsdigita/cms/ui/FileUploadSection.java index 0c0868130..42478c5d7 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/FileUploadSection.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/FileUploadSection.java @@ -43,12 +43,10 @@ import java.io.File; * return the mime type. * * @author Stanislav Freidin (sfreidin@arsdigita.com) - * @version $Id: FileUploadSection.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: FileUploadSection.java 1940 2009-05-29 07:15:05Z terry $ */ public class FileUploadSection extends FormSection { - public static final String versionId = "$Id: FileUploadSection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private SingleSelect m_mimeWidget; private FileUpload m_fileWidget; private String m_mimePrefix; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/FlatItemList.java b/ccm-cms/src/com/arsdigita/cms/ui/FlatItemList.java index aff1c778f..44c62fdbd 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/FlatItemList.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/FlatItemList.java @@ -82,15 +82,11 @@ import java.util.Map; * item listing. Also contains a new item form. * * @author Stanislav Freidin - * @version $Revision: $ $DateTime: $ + * @version $Id: FlatItemList.java 1538 2007-03-23 16:26:36Z apevec $ */ public class FlatItemList extends SegmentedPanel implements FormProcessListener, ChangeListener, FormSubmissionListener, Resettable, ActionListener { - public static final String versionId = - "$Id: FlatItemList.java 1538 2007-03-23 16:26:36Z apevec $" + - "$Author: apevec $" + - "$DateTime: $"; private static final String CONTENT_TYPE_ID = "ct"; private static final String CMS_PRIVILEGES = "com.arsdigita.cms.getPrivileges"; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/FolderBreadcrumbNav.java b/ccm-cms/src/com/arsdigita/cms/ui/FolderBreadcrumbNav.java index 435a6413c..65a6fa3df 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/FolderBreadcrumbNav.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/FolderBreadcrumbNav.java @@ -35,11 +35,10 @@ import org.apache.log4j.Logger; * section root folder. * * @author Crag Wolfe + * @version $Id: FolderBreadcrumbNav.java,v 1.2 2003/12/18 18:33:55 cwolfe Exp $ */ public class FolderBreadcrumbNav extends SimpleComponent { - public static final String versionId = "$Id: FolderBreadcrumbNav.java,v 1.2 2003/12/18 18:33:55 cwolfe Exp $ by $Author: cwolfe $, $DateTime: 2003/08/18 23:54:14 $"; - private static Logger s_log = Logger.getLogger(FolderBreadcrumbNav.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/FolderContent.java b/ccm-cms/src/com/arsdigita/cms/ui/FolderContent.java index 964ba6a8a..a248d6937 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/FolderContent.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/FolderContent.java @@ -55,12 +55,10 @@ import org.apache.log4j.Logger; * <jsp:scriptlet> *

* - * @version $Revision: 1.2 $ $Date: 2005/01/07 14:59:36 $ + * @version $Id: FolderContent.java 1166 2006-06-14 11:45:15Z fabrice $ */ public class FolderContent extends SimpleComponent { - public static final String versionId = "$Id: FolderContent.java 1166 2006-06-14 11:45:15Z fabrice $"; - private static Logger log = Logger.getLogger(FolderContent.class);; private static final String TAG_FOLDERCONTENT = "cms:folderContent"; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/FolderProperties.java b/ccm-cms/src/com/arsdigita/cms/ui/FolderProperties.java index 8ee2ed6bd..8cef2890a 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/FolderProperties.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/FolderProperties.java @@ -50,12 +50,10 @@ import com.arsdigita.xml.Element; * A pane for managing {@com.arsdigita.cms.Folder} properties. * * @author Michael Pih (pihman@arsdigita.com) - * @version $Revision: #10 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: FolderProperties.java 287 2005-02-22 00:29:02Z sskracic $ */ public class FolderProperties extends CMSContainer { - public static final String versionId = "$Id: FolderProperties.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private FolderInfo m_folderInfo; private EditFolder m_editFolder; private ToggleLink m_editLink; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/FormSecurityListener.java b/ccm-cms/src/com/arsdigita/cms/ui/FormSecurityListener.java index c79cdcef1..9291cf23f 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/FormSecurityListener.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/FormSecurityListener.java @@ -34,13 +34,9 @@ import org.apache.log4j.Logger; /** * @author Justin Ross <jross@redhat.com> - * @version $Id: FormSecurityListener.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: FormSecurityListener.java 1942 2009-05-29 07:53:23Z terry $ */ public class FormSecurityListener implements FormSubmissionListener { - public static final String versionId = - "$Id: FormSecurityListener.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static Logger s_log = Logger.getLogger(FormSecurityListener.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/GlobalNavbar.java b/ccm-cms/src/com/arsdigita/cms/ui/GlobalNavbar.java index 731d8d233..658e3003a 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/GlobalNavbar.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/GlobalNavbar.java @@ -28,13 +28,9 @@ import com.arsdigita.kernel.security.Initializer; * Delimited dimensional navbar. * * @author David Lutterkort <dlutter@redhat.com> - * @version $Id: GlobalNavbar.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: GlobalNavbar.java 1942 2009-05-29 07:53:23Z terry $ */ public class GlobalNavbar extends DimensionalNavbar { - public static final String versionId = - "$Id: GlobalNavbar.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; public GlobalNavbar() { super(); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/GlobalNavigation.java b/ccm-cms/src/com/arsdigita/cms/ui/GlobalNavigation.java index e1d76dead..24164aae4 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/GlobalNavigation.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/GlobalNavigation.java @@ -33,13 +33,9 @@ import javax.servlet.http.HttpServletRequest; *

Global navigation elements for the CMS admin UIs.

* * @author Justin Ross <jross@redhat.com> - * @version $Id: GlobalNavigation.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: GlobalNavigation.java 1942 2009-05-29 07:53:23Z terry $ */ class GlobalNavigation extends SimpleComponent { - public static final String versionId = - "$Id: GlobalNavigation.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (GlobalNavigation.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/HorizontalLine.java b/ccm-cms/src/com/arsdigita/cms/ui/HorizontalLine.java.nolongerInUse similarity index 92% rename from ccm-cms/src/com/arsdigita/cms/ui/HorizontalLine.java rename to ccm-cms/src/com/arsdigita/cms/ui/HorizontalLine.java.nolongerInUse index ee8cef560..79de85938 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/HorizontalLine.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/HorizontalLine.java.nolongerInUse @@ -27,7 +27,7 @@ import com.arsdigita.xml.Element; * A solid, horizontal line. * * @author Michael Pih (pihman@arsdigita.com) - * @version $Revision: #10 $ $Date: 2004/08/17 $ + * @version $Id: HorizontalLine.java 287 2005-02-22 00:29:02Z sskracic $ * @deprecated with no replacement */ // FIXME: Could this be done solely in XSL ? Or do some of these attributes @@ -35,8 +35,6 @@ import com.arsdigita.xml.Element; // this completely to XSL. public class HorizontalLine extends SimpleComponent { - public static final String versionId = "$Id: HorizontalLine.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private final static String CMS_XML_NS = "http://www.arsdigita.com/cms/1.0"; private String m_width; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ImageBrowser.java b/ccm-cms/src/com/arsdigita/cms/ui/ImageBrowser.java index 9dd88a10c..6760e85ec 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ImageBrowser.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ImageBrowser.java @@ -61,12 +61,10 @@ import org.apache.log4j.Logger; * * * @author Stanislav Freidin - * @version $Id: ImageBrowser.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ImageBrowser.java 1940 2009-05-29 07:15:05Z terry $ */ public class ImageBrowser extends Table { - public static final String versionId = "$Id: ImageBrowser.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private ImageBrowserModelBuilder m_builder; private static final String[] HEADERS = diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ImageBrowserModel.java b/ccm-cms/src/com/arsdigita/cms/ui/ImageBrowserModel.java index fc7bfecf8..d23213120 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ImageBrowserModel.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ImageBrowserModel.java @@ -23,12 +23,12 @@ import com.arsdigita.cms.ImageAsset; /** * The ImageBrowserModel is an abstraction used by the * {@link ImageBrowser} class in order to display a table of images. + * + * @version $Id: ImageBrowserModel.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface ImageBrowserModel { - public static final String versionId = "$Id: ImageBrowserModel.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - /** * Advance to the next row, if possible * diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ImageBrowserModelBuilder.java b/ccm-cms/src/com/arsdigita/cms/ui/ImageBrowserModelBuilder.java index a44beca51..94dfc6914 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ImageBrowserModelBuilder.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ImageBrowserModelBuilder.java @@ -25,11 +25,11 @@ import com.arsdigita.util.Lockable; * Constructs a new {@link ImageBrowserModel} * This class will be supplied to the {@link ImageBrowser} * class in order to provide it with the model. + * + * @version Id: ImageBrowserModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface ImageBrowserModelBuilder extends Lockable { - public static final String versionId = "$Id: ImageBrowserModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - /** * Construct a new ImageBrowserModel * diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ImageChooser.java b/ccm-cms/src/com/arsdigita/cms/ui/ImageChooser.java index 2dfeb6010..b6934f639 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ImageChooser.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ImageChooser.java @@ -47,12 +47,10 @@ import com.arsdigita.cms.util.GlobalizationUtil; * search images by keyword * * @author Stanislav Freidin (sfreidin@arsdigita.com) - * @version $Id: ImageChooser.java 754 2005-09-02 13:26:17Z sskracic $ + * @version $Id: ImageChooser.java 1940 2009-05-29 07:15:05Z terry $ */ public class ImageChooser extends BoxPanel { - public static final String versionId = "$Id: ImageChooser.java 754 2005-09-02 13:26:17Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private ImageKeywordForm m_form; private ImageBrowser m_browser; private Paginator m_paginator; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ImageDisplay.java b/ccm-cms/src/com/arsdigita/cms/ui/ImageDisplay.java index c0b5a0170..1c89d0f35 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ImageDisplay.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ImageDisplay.java @@ -38,12 +38,10 @@ import java.math.BigDecimal; * * @author Michael Pih (pihman@arsdigita.com) * @author Stanislav Freidin (sfreidin@arsdigita.com) - * @version $Revision: #13 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: ImageDisplay.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ImageDisplay extends SimpleComponent { - public static final String versionId = "$Id: ImageDisplay.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private final ItemSelectionModel m_item; /** diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ItemListModel.java b/ccm-cms/src/com/arsdigita/cms/ui/ItemListModel.java index 004f3d4fd..bb16b9158 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ItemListModel.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ItemListModel.java @@ -25,11 +25,11 @@ import com.arsdigita.cms.ItemCollection; /** * A {@link ListModel} that iterates over the passed in ItemCollection * This is an easy starting place for lists that need to dispaly items. + * + * @version $Id: ListModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ItemListModel implements ListModel { - public static final String versionId = "$Id: ItemListModel.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private ItemCollection m_collection; private ContentItem m_item; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ItemPropertySheet.java b/ccm-cms/src/com/arsdigita/cms/ui/ItemPropertySheet.java index 808770d40..3595abcec 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ItemPropertySheet.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ItemPropertySheet.java @@ -42,8 +42,6 @@ import com.arsdigita.cms.util.GlobalizationUtil; */ public class ItemPropertySheet extends PropertySheet { - public static final String versionId = "$Id: ItemPropertySheet.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private List m_props; private ItemSelectionModel m_itemModel; private AttributeFormatter m_toStringFormatter; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearch.java b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearch.java index bd0d26f1a..49daa152d 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearch.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearch.java @@ -32,13 +32,11 @@ import com.arsdigita.search.ui.QueryGenerator; * the form section in a form. * * @author Stanislav Freidin (sfreidin@arsdigita.com) - * @version $Id: ItemSearch.java 754 2005-09-02 13:26:17Z sskracic $ + * @version $Id: ItemSearch.java 1940 2009-05-29 07:15:05Z terry $ */ public class ItemSearch extends Form implements Resettable, QueryGenerator { - public static final String versionId = "$Id: ItemSearch.java 754 2005-09-02 13:26:17Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static final org.apache.log4j.Logger s_log = org.apache.log4j.Logger.getLogger(ItemSearch.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchBrowsePane.java b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchBrowsePane.java index a5d3a6074..b4b537634 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchBrowsePane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchBrowsePane.java @@ -67,8 +67,6 @@ public class ItemSearchBrowsePane extends CMSContainer private static final Logger s_log = Logger.getLogger( ItemSearchBrowsePane.class ); - public static final String versionId = "$Id: ItemSearchBrowsePane.java 1166 2006-06-14 11:45:15Z fabrice $ by $Author: fabrice $, $DateTime: 2004/08/17 23:15:09 $"; - private FolderSelectionModel m_folderSel; private Tree m_tree; private ItemSearchFolderBrowser m_browser; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchFolderBrowser.java b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchFolderBrowser.java index 4c4b5a4ac..571097cb2 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchFolderBrowser.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchFolderBrowser.java @@ -67,8 +67,6 @@ import java.math.BigDecimal; */ public class ItemSearchFolderBrowser extends Table { - public static final String versionId = "$Id: ItemSearchFolderBrowser.java 1478 2007-03-14 11:59:00Z apevec $ by $Author: apevec $, $DateTime: 2004/08/17 23:15:09 $"; - private static final org.apache.log4j.Logger s_log = org.apache.log4j.Logger.getLogger(ItemSearchFolderBrowser.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchSection.java b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchSection.java index 21df96c37..6b8271554 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchSection.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchSection.java @@ -42,13 +42,11 @@ import com.arsdigita.search.QuerySpecification; * the search and display the results * * @author Stanislav Freidin (sfreidin@arsdigita.com) - * @version $Id: ItemSearchSection.java 1397 2006-11-29 14:10:38Z sskracic $ + * @version $Id: ItemSearchSection.java 1940 2009-05-29 07:15:05Z terry $ */ public class ItemSearchSection extends FormSection implements Resettable, QueryGenerator { - public static final String versionId = "$Id: ItemSearchSection.java 1397 2006-11-29 14:10:38Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static final org.apache.log4j.Logger s_log = org.apache.log4j.Logger.getLogger(ItemSearchSection.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchSectionInline.java b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchSectionInline.java index f3f5efb9a..b36ec5bc0 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchSectionInline.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchSectionInline.java @@ -41,12 +41,10 @@ import com.arsdigita.search.ui.ResultsPane; * available. * * @author Stanislav Freidin (sfreidin@arsdigita.com) - * @version $Id: ItemSearchSectionInline.java 1397 2006-11-29 14:10:38Z sskracic $ + * @version $Id: ItemSearchSectionInline.java 1940 2009-05-29 07:15:05Z terry $ */ public class ItemSearchSectionInline extends ItemSearchSection { - public static final String versionId = "$Id: ItemSearchSectionInline.java 1397 2006-11-29 14:10:38Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static final org.apache.log4j.Logger s_log = org.apache.log4j.Logger.getLogger(ItemSearchSectionInline.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/LocalesListModelBuilder.java b/ccm-cms/src/com/arsdigita/cms/ui/LocalesListModelBuilder.java index a463cdf3c..62b1c7181 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/LocalesListModelBuilder.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/LocalesListModelBuilder.java @@ -34,13 +34,11 @@ import java.util.NoSuchElementException; * Builds a list of locales registered to a content section. * * @author Michael Pih (pihman@arsdigita.com) - * @version $Revision: #8 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: LocalesListModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ */ public class LocalesListModelBuilder extends LockableImpl implements ListModelBuilder { - public static final String versionId = "$Id: LocalesListModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public LocalesListModelBuilder() { super(); } diff --git a/ccm-cms/src/com/arsdigita/cms/ui/Logout.java b/ccm-cms/src/com/arsdigita/cms/ui/Logout.java index 2ef12629c..e42215219 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/Logout.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/Logout.java @@ -36,11 +36,10 @@ import org.apache.log4j.Logger; * A page that logs the current user out * * @author Michael Pih (pihman@arsdigita.com) - * @version $Revision: #12 $ + * @version $Id: Logout.java 287 2005-02-22 00:29:02Z sskracic $ */ public class Logout extends CMSPage { - public static final String versionId = "$Id: Logout.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; final static String URL_AFTER_LOGOUT = Utilities.getWebappContext() + "/"; private static final Logger s_log = Logger.getLogger(Logout.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/Navbar.java b/ccm-cms/src/com/arsdigita/cms/ui/Navbar.java index 81725f369..516ce6d2e 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/Navbar.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/Navbar.java @@ -25,11 +25,11 @@ import com.arsdigita.bebop.Label; /** * A navigation bar. Unlike a tabbed dialog, the navbar is completely * static. All of its links lead to other pages. + * + * @version $Id: Navbar.java 287 2005-02-22 00:29:02Z sskracic $ */ public class Navbar extends BoxPanel { - public static final String versionId = "$Id: Navbar.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private String currentLabel; /** diff --git a/ccm-cms/src/com/arsdigita/cms/ui/PartyAddForm.java b/ccm-cms/src/com/arsdigita/cms/ui/PartyAddForm.java index bdf1d93d3..8ab8d24bd 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/PartyAddForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/PartyAddForm.java @@ -50,13 +50,11 @@ import java.util.TooManyListenersException; * Form for adding multiple parties to a role. * * @author Scott Seago (scott@arsdigita.com) - * @version $Revision: #11 $ $DateTime: 2004/08/17 23:15:09 $ + * @version Id: PartyAddForm.java 754 2005-09-02 13:26:17Z sskracic $ */ public abstract class PartyAddForm extends SimpleContainer implements FormInitListener, FormProcessListener { - public static final String versionId = "$Id: PartyAddForm.java 754 2005-09-02 13:26:17Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private final static String SEARCH_QUERY = "searchQuery"; private final static String PARTIES = "parties"; private final static String SUBMIT = "addSubmit"; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/PartySearchForm.java b/ccm-cms/src/com/arsdigita/cms/ui/PartySearchForm.java index 3f5fdf116..58c31c97a 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/PartySearchForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/PartySearchForm.java @@ -29,13 +29,9 @@ import com.arsdigita.util.Assert; * Form to search for parties to be added to a staff group. * * @author Scott Seago <sseago@redhat.com> - * @version $Id: PartySearchForm.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: PartySearchForm.java 1942 2009-05-29 07:53:23Z terry $ */ public class PartySearchForm extends BaseForm { - public static final String versionId = - "$Id: PartySearchForm.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private final static String SEARCH_LABEL = "Search"; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ReportPane.java b/ccm-cms/src/com/arsdigita/cms/ui/ReportPane.java index b754384f1..04de51549 100644 --- a/ccm-cms/src/com/arsdigita/cms/ui/ReportPane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ReportPane.java @@ -15,7 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - + package com.arsdigita.cms.ui; import java.util.ArrayList; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/SearchResultRedirector.java b/ccm-cms/src/com/arsdigita/cms/ui/SearchResultRedirector.java index 5865e414e..5734f7f09 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/SearchResultRedirector.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/SearchResultRedirector.java @@ -40,13 +40,11 @@ import org.apache.log4j.Logger; * displayed. * * @author Jeff Teeters (teeters@arsdigita.com) - * @version $Revision: #11 $ $Date: 2004/08/17 $ + * @version $Id: SearchResultRedirector.java 287 2005-02-22 00:29:02Z sskracic $ * */ public class SearchResultRedirector extends CMSPage /* implements ActionListener */ { - public static final String versionId = "$Id: SearchResultRedirector.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - /** * Names of required parameters passed in the request */ diff --git a/ccm-cms/src/com/arsdigita/cms/ui/SectionConfigurationPage.java b/ccm-cms/src/com/arsdigita/cms/ui/SectionConfigurationPage.java index cc3fc0553..ae245fe7f 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/SectionConfigurationPage.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/SectionConfigurationPage.java @@ -67,12 +67,10 @@ import java.util.TooManyListenersException; * Contains the entire admin UI for a content section. * * @author Michael Pih (pihman@arsdigita.com) - * @version $Revision: #12 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: SectionConfigurationPage.java 287 2005-02-22 00:29:02Z sskracic $ */ public class SectionConfigurationPage extends CMSPage implements Resettable { - public static final String versionId = "$Id: SectionConfigurationPage.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private SectionInfo m_sectionInfo; private EditSection m_editSection; private AddLocale m_addLocale; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/SecurityPropertyEditor.java b/ccm-cms/src/com/arsdigita/cms/ui/SecurityPropertyEditor.java index db98d10ae..bf991f0aa 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/SecurityPropertyEditor.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/SecurityPropertyEditor.java @@ -62,17 +62,16 @@ import java.util.Map; * * @author Michael Pih (pihman@arsdigita.com) * @author Stanislav Freidin (sfreidin@arsdigita.com) - * @version $Revision: #10 $ $DateTime: 2004/08/17 23:15:09 $ */ + * @version Id: SecurityPropertyEditor.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class SecurityPropertyEditor extends PropertyEditor { - public static final String versionId = "$Id: SecurityPropertyEditor.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private HashMap m_accessChecks; /** * Construct a new, empty PropertyEditor. The {@link * #setDisplayComponent(Component)} method must be called before this - * component is isLocked. + * component is locked. */ public SecurityPropertyEditor() { this(null); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/SingleImageSelectionModel.java b/ccm-cms/src/com/arsdigita/cms/ui/SingleImageSelectionModel.java index 50ea78101..caf8351ac 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/SingleImageSelectionModel.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/SingleImageSelectionModel.java @@ -32,17 +32,15 @@ import com.arsdigita.domain.DomainObject; /** * Selects a single image for an article. * - * @version $IdS - * @author Stanislav Freidin - * * @see com.arsdigita.cms.ui.authoring.ArticleImage * @see com.arsdigita.cms.ui.ArticleImageDisplay + * + * @version $Id: SingleImageSelectionModel.java 287 2005-02-22 00:29:02Z sskracic $ + * @author Stanislav Freidin */ public class SingleImageSelectionModel extends ItemSelectionModel { - public static final String versionId = "$Id: SingleImageSelectionModel.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private ItemSelectionModel m_articleModel; /** diff --git a/ccm-cms/src/com/arsdigita/cms/ui/SortableList.java b/ccm-cms/src/com/arsdigita/cms/ui/SortableList.java index 32dc4517d..3589120f3 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/SortableList.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/SortableList.java @@ -45,12 +45,10 @@ import java.io.IOException; * n is the number of items in the list. This clearly is not a good setup. * * @author Randy Graebner (randyg@alum.mit.edu) - * @version $Revision: #9 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: SortableList.java 1618 2007-09-13 12:14:51Z chrisg23 $ */ public abstract class SortableList extends List { - public static final String versionId = "$Id: SortableList.java 1618 2007-09-13 12:14:51Z chrisg23 $ by $Author: chrisg23 $, $DateTime: 2004/08/17 23:15:09 $"; - private static final org.apache.log4j.Logger s_log = org.apache.log4j.Logger.getLogger(SortableList.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/TasksPanel.java b/ccm-cms/src/com/arsdigita/cms/ui/TasksPanel.java index db25112b4..632b08686 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/TasksPanel.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/TasksPanel.java @@ -80,10 +80,12 @@ import com.arsdigita.workflow.simple.Engine; import com.arsdigita.workflow.simple.Workflow; import com.arsdigita.xml.Element; +/** + * + * @version $Id: TasksPanel.java 1280 2006-07-27 09:12:09Z cgyg9330 $ + */ public class TasksPanel extends CMSContainer { - public static final String versionId = "$Id: TasksPanel.java 1280 2006-07-27 09:12:09Z cgyg9330 $ by $Author: cgyg9330 $, $DateTime: 2004/08/17 23:15:09 $"; - private static Logger s_log = Logger.getLogger(TasksPanel.class); @@ -656,7 +658,7 @@ public class TasksPanel extends CMSContainer { if (taskType.equals(CMSTaskType.DEPLOY) ) { tabNumber = ContentItemPage.PUBLISHING_TAB; } else { - // see if item is isLocked; if not, lock + // see if item is locked; if not, lock if ( !task.isLocked() ) { task.lock(user); } diff --git a/ccm-cms/src/com/arsdigita/cms/ui/UniqueItemNameValidationListener.java b/ccm-cms/src/com/arsdigita/cms/ui/UniqueItemNameValidationListener.java index 3c1a03025..7c779cd3d 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/UniqueItemNameValidationListener.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/UniqueItemNameValidationListener.java @@ -34,14 +34,11 @@ import com.arsdigita.cms.ui.util.UniqueStringValidationListener; * * * @author Michael Pih (pihman@arsdigita.com) - * @version $Revision: #8 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: UniqueItemNameValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ */ public class UniqueItemNameValidationListener extends UniqueStringValidationListener { - public static final String versionId = "$Id: UniqueItemNameValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - - private final static String ERROR_MSG = "An item with this name already exists."; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/UserAddForm.java b/ccm-cms/src/com/arsdigita/cms/ui/UserAddForm.java index 3749b0b82..c038324b6 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/UserAddForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/UserAddForm.java @@ -51,13 +51,11 @@ import java.util.TooManyListenersException; * * @author Michael Pih (pihman@arsdigita.com) * @author Uday Mathur (umathur@arsdigita.com) - * @version $Revision: #19 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: UserAddForm.java 754 2005-09-02 13:26:17Z sskracic $ */ public abstract class UserAddForm extends SimpleContainer implements FormProcessListener { - public static final String versionId = "$Id: UserAddForm.java 754 2005-09-02 13:26:17Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private final static String SEARCH_QUERY = "searchQuery"; private final static String USERS = "users"; private final static String SUBMIT = "addSubmit"; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/UserSearchForm.java b/ccm-cms/src/com/arsdigita/cms/ui/UserSearchForm.java index 5e399e91d..bb89b26ce 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/UserSearchForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/UserSearchForm.java @@ -31,12 +31,10 @@ import com.arsdigita.cms.util.GlobalizationUtil; * Form to search for users to be added to a staff group. * * @author Michael Pih (pihman@arsdigita.com) - * @version $Revision: #13 $ $Date: 2004/08/17 $ + * @version $Id: UserSearchForm.java 287 2005-02-22 00:29:02Z sskracic $ */ public class UserSearchForm extends CMSForm { - public static final String versionId = "$Id: UserSearchForm.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private final static String SEARCH_LABEL = "Search"; private TextField m_search; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/WorkspaceContextBar.java b/ccm-cms/src/com/arsdigita/cms/ui/WorkspaceContextBar.java index 39e33360e..70cb55c97 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/WorkspaceContextBar.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/WorkspaceContextBar.java @@ -30,13 +30,9 @@ import java.util.List; *

The context bar of the content center UI.

* * @author Justin Ross <jross@redhat.com> - * @version $Id: WorkspaceContextBar.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: WorkspaceContextBar.java 1942 2009-05-29 07:53:23Z terry $ */ class WorkspaceContextBar extends ContextBar { - public static final String versionId = - "$Id: WorkspaceContextBar.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (WorkspaceContextBar.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/WorkspacePage.java b/ccm-cms/src/com/arsdigita/cms/ui/WorkspacePage.java index 4e09f3bd2..d4d239c70 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/WorkspacePage.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/WorkspacePage.java @@ -45,13 +45,9 @@ import com.arsdigita.ui.DebugPanel; * * @author Jack Chung (flattop@arsdigita.com) * @author Michael Pih (pihman@arsdigita.com) - * @version $Revision: #22 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: WorkspacePage.java 754 2005-09-02 13:26:17Z sskracic $ */ public class WorkspacePage extends CMSPage implements ActionListener { - public static final String versionId = - "$Id: WorkspacePage.java 754 2005-09-02 13:26:17Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private final static String XSL_CLASS = "CMS Admin"; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/ArticleImage.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/ArticleImage.java index eaf2e4131..5f7a4f2b9 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/ArticleImage.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/ArticleImage.java @@ -77,11 +77,10 @@ import org.apache.log4j.Logger; * @author Stanislav Freidin (sfreidin@arsdigita.com) * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #20 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: ArticleImage.java 754 2005-09-02 13:26:17Z sskracic $ */ public class ArticleImage extends SimpleContainer implements AuthoringStepComponent { - public static final String versionId = "$Id: ArticleImage.java 754 2005-09-02 13:26:17Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static final String IMAGE_ASSET = "image_asset"; private static Logger s_log = Logger.getLogger(ArticleImage.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/ArticleImageChooser.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/ArticleImageChooser.java index e2dc670bf..b34040c6c 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/ArticleImageChooser.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/ArticleImageChooser.java @@ -52,13 +52,12 @@ import java.math.BigDecimal; * @author Stanislav Freidin * @author Michael Pih * @version $Revision: #12 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: ArticleImageChooser.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ArticleImageChooser extends SimpleContainer { public static final String CHOSEN_IMAGE = "chim"; - public static final String versionId = "$Id: ArticleImageChooser.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static Logger s_log = Logger.getLogger(ArticleImageChooser.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/AuthoringKitSelector.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/AuthoringKitSelector.java index e2bbf04e5..0b981ac1b 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/AuthoringKitSelector.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/AuthoringKitSelector.java @@ -39,11 +39,11 @@ import java.util.Map; /** * Selects a component based on content type. Helper class for {@link * com.arsdigita.cms.ui.authoring.WizardSelector}. + * + * @version $Id: AuthoringKitSelector.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class AuthoringKitSelector extends SimpleContainer { - public static final String versionId = "$Id: AuthoringKitSelector.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static Logger s_log = Logger.getLogger(AuthoringKitSelector.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/AuthoringKitWizard.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/AuthoringKitWizard.java index 97f8f486f..fb4277587 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/AuthoringKitWizard.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/AuthoringKitWizard.java @@ -86,13 +86,9 @@ import java.util.ArrayList; * This constructor will be called when the component is automatically * instantiated by the AuthoringKitWizard.

* - * @version $Id: AuthoringKitWizard.java 1434 2007-02-07 09:09:58Z chrisgilbert23 $ + * @version $Id: AuthoringKitWizard.java 1942 2009-05-29 07:53:23Z terry $ */ public class AuthoringKitWizard extends LayoutPanel implements Resettable { - public static final String versionId = - "$Id: AuthoringKitWizard.java 1434 2007-02-07 09:09:58Z chrisgilbert23 $" + - "$Author: chrisgilbert23 $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (AuthoringKitWizard.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicImageForm.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicImageForm.java index 0c990535b..d4d562c07 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicImageForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicImageForm.java @@ -41,12 +41,12 @@ import com.arsdigita.cms.util.GlobalizationUtil; * A form for modifying a single image asset attached to the article. * This is just a convenience class; children should override * the addWidgets, init and process methods. + * + * @version $Id: BasicImageForm.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class BasicImageForm extends Form implements FormInitListener, FormProcessListener { - public static final String versionId = "$Id: BasicImageForm.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private ItemSelectionModel m_itemModel, m_assetModel; private SaveCancelSection m_saveCancelSection; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/CreationSelector.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/CreationSelector.java index 95b3835bb..6ba194bd8 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/CreationSelector.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/CreationSelector.java @@ -74,13 +74,9 @@ import java.math.BigDecimal; * * in order to get the current content section. * - * @version $Id: CreationSelector.java 754 2005-09-02 13:26:17Z sskracic $ + * @version $Id: CreationSelector.java 1942 2009-05-29 07:53:23Z terry $ */ public class CreationSelector extends MetaForm { - public static final String versionId = - "$Id: CreationSelector.java 754 2005-09-02 13:26:17Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static Logger s_log = Logger.getLogger(CreationSelector.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/ImageSelectionForm.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/ImageSelectionForm.java index 09f3a100b..786ddee87 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/ImageSelectionForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/ImageSelectionForm.java @@ -37,11 +37,10 @@ import org.apache.log4j.Logger; * @author Stanislav Freidin (stas@arsdigita.com) * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #9 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: ImageSelectionForm.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ImageSelectionForm extends BasicImageForm { - public static final String versionId = "$Id: ImageSelectionForm.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static Logger s_log = Logger.getLogger(ImageSelectionForm.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/ImageUploadForm.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/ImageUploadForm.java index 944f53a62..2a0b2d7ca 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/ImageUploadForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/ImageUploadForm.java @@ -43,11 +43,10 @@ import org.apache.log4j.Logger; * @author Stanislav Freidin (stas@arsdigita.com) * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #16 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: ImageUploadForm.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ImageUploadForm extends BasicImageForm implements FormSubmissionListener { - public static final String versionId = "$Id: ImageUploadForm.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static Logger s_log = Logger.getLogger(ImageUploadForm.class); private FileUploadSection m_fileUploadSection; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/NameValidationListener.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/NameValidationListener.java index e4c60abd3..cfaa7ebd9 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/NameValidationListener.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/NameValidationListener.java @@ -30,13 +30,9 @@ import java.util.StringTokenizer; * contains no reserved characters. * * @author Justin Ross <jross@redhat.com> - * @version $Id: NameValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: NameValidationListener.java 1942 2009-05-29 07:53:23Z terry $ */ public class NameValidationListener implements ParameterListener { - public static final String versionId = - "$Id: NameValidationListener.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (NameValidationListener.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/NewItemForm.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/NewItemForm.java index 7a1bc9dac..2169df244 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/NewItemForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/NewItemForm.java @@ -53,11 +53,10 @@ import java.math.BigDecimal; * * @author Stanislav Freidin (sfreidin@arsdigtia.com) * @version $Revision: #12 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: NewItemForm.java 1652 2007-09-18 10:35:42Z chrisg23 $ */ public abstract class NewItemForm extends Form { - public static final String versionId = "$Id: NewItemForm.java 1652 2007-09-18 10:35:42Z chrisg23 $ by $Author: chrisg23 $, $DateTime: 2004/08/17 23:15:09 $"; - public static final String RESOURCE_BUNDLE = "com.arsdigita.cms.ui.authoring.AuthoringResources"; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageCreate.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageCreate.java index 6f8e76e6d..7616dc438 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageCreate.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageCreate.java @@ -43,13 +43,10 @@ import org.apache.log4j.Logger; * * @author Stanislav Freidin (stas@arsdigita.com) * @version $Revision: #21 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: PageCreate.java 287 2005-02-22 00:29:02Z sskracic $ */ public class PageCreate extends BasicPageForm implements FormSubmissionListener, CreationComponent { - public static final String versionId = - "$Id: PageCreate.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger(PageCreate.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageCreateDynamic.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageCreateDynamic.java index 71fb918c2..442a2c24b 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageCreateDynamic.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageCreateDynamic.java @@ -236,19 +236,20 @@ public class PageCreateDynamic extends FormSection } - /** + /* * (no Javadoc here!) * Add various widgets to the form. Child classes should override * this method to perform all their widget-adding needs * adds both the name and titlle widgets and * the persistent widgets stored in the persistent form * associated with this content item - */ - - /* Quasimodo BEGIN + * + * Quasimodo BEGIN + * =============== * disabled to get an ordinary create step. This method will ask * for ALL additional fields of a UDCT regardless if it is mandatory or not. * So, to prevent this I have modified the UDCT-Widgets to allway be optional * as the hardcoded content types and this method becomes obsolete. + * protected void addWidgets() { PersistentForm pForm = null; try { diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageEdit.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageEdit.java index 191804114..6b2257835 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageEdit.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageEdit.java @@ -48,11 +48,10 @@ import java.text.DateFormat; * * @author Stanislav Freidin * @version $Revision: #14 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: PageEdit.java 287 2005-02-22 00:29:02Z sskracic $ */ public class PageEdit extends SimpleEditStep { - public static final String versionId = "$Id: PageEdit.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static Logger s_log = Logger.getLogger(PageEdit.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/SimpleEditStep.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/SimpleEditStep.java index 996166e50..3fa09ca8b 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/SimpleEditStep.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/SimpleEditStep.java @@ -51,6 +51,7 @@ import org.apache.log4j.Logger; * b). call add() zero or more times * * @author Stanislav Freidin + * @version $Id: SimpleEditStep.java 1638 2007-09-17 11:48:34Z chrisg23 $ */ public class SimpleEditStep extends SecurityPropertyEditor implements AuthoringStepComponent, RequestListener { @@ -58,8 +59,6 @@ public class SimpleEditStep extends SecurityPropertyEditor private static final Logger s_log = Logger.getLogger( SimpleEditStep.class ); - public static final String versionId = "$Id: SimpleEditStep.java 1638 2007-09-17 11:48:34Z chrisg23 $ by $Author: chrisg23 $, $DateTime: 2004/08/17 23:15:09 $"; - private AuthoringKitWizard m_parent; private ItemSelectionModel m_itemModel; private String m_defaultEditKey = null; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextAssetBody.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextAssetBody.java index df474055d..aeae6e894 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextAssetBody.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextAssetBody.java @@ -85,12 +85,11 @@ import com.arsdigita.util.UncheckedWrapperException; * {@link com.arsdigita.cms.ui.templates.TemplateBody} * * @author Stanislav Freidin (sfreidin@arsdigita.com) - * @version $Id: TextAssetBody.java 1478 2007-03-14 11:59:00Z apevec $ + * @version $Id: TextAssetBody.java 1949 2009-06-25 08:30:50Z terry $ */ public abstract class TextAssetBody extends SecurityPropertyEditor implements Resettable, AuthoringStepComponent, RequestListener { - public static final String versionId = "$Id: TextAssetBody.java 1478 2007-03-14 11:59:00Z apevec $ by $Author: apevec $, $DateTime: $"; private static Logger s_log = Logger.getLogger(TextAssetBody.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextAssetBodyPropertySheet.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextAssetBodyPropertySheet.java index f6153de35..26fe48343 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextAssetBodyPropertySheet.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextAssetBodyPropertySheet.java @@ -40,11 +40,10 @@ import com.arsdigita.bebop.Table; /** * This extends DomainObjectPropertySheet and has a lot of duplicate * code from it because it uses so many private inner classes + * @version $Id: TextAssetBodyPropertySheet.java 754 2005-09-02 13:26:17Z sskracic $ */ public class TextAssetBodyPropertySheet extends DomainObjectPropertySheet { - public static final String versionId = "$Id: TextAssetBodyPropertySheet.java 754 2005-09-02 13:26:17Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - /** * Construct a new TextAssetBodyPropertySheet * diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextPageBody.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextPageBody.java index 9bdfa14b3..ff75d3f8b 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextPageBody.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextPageBody.java @@ -44,12 +44,10 @@ import com.arsdigita.util.Assert; * this class. * * @author Stanislav Freidin (sfreidin@arsdigita.com) - * @version $Id: TextPageBody.java 1621 2007-09-13 12:43:12Z chrisg23 $ + * @version $Id: TextPageBody.java 1949 2009-06-25 08:30:50Z terry $ */ public class TextPageBody extends TextAssetBody { - public static final String versionId = "$Id: TextPageBody.java 1621 2007-09-13 12:43:12Z chrisg23 $ by $Author: chrisg23 $, $DateTime: 2004/08/17 23:15:09 $"; - private AuthoringKitWizard m_parent; private ItemSelectionModel m_itemModel; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/WizardSelector.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/WizardSelector.java index 5e2aed1b9..70c4aabee 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/WizardSelector.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/WizardSelector.java @@ -43,12 +43,12 @@ import java.math.BigDecimal; *

* Essentially, this component is a hack which is used to get around * the fact that we cannot instantiate stateful components dynamically. + * + * @version $Id: WizardSelector.java 287 2005-02-22 00:29:02Z sskracic $ */ public class WizardSelector extends AuthoringKitSelector implements Resettable { - public static final String versionId = "$Id: WizardSelector.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private ItemSelectionModel m_itemSel; /** diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/AddStep.java b/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/AddStep.java index bf1c7a0f5..221623345 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/AddStep.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/AddStep.java @@ -56,12 +56,11 @@ import java.sql.SQLException; * * @author Jack Chung (flattop@arsdigita.com) * @version $Revision: #13 $ $Date: 2004/08/17 $ + * @version $Id: AddStep.java 754 2005-09-02 13:26:17Z sskracic $ */ public class AddStep extends Form implements FormProcessListener, FormInitListener { - public static final String versionId = "$Id: AddStep.java 754 2005-09-02 13:26:17Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static Logger s_log = Logger.getLogger(AddStep.class.getName()); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/DeleteStep.java b/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/DeleteStep.java index a065916e9..8b8488cfe 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/DeleteStep.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/DeleteStep.java @@ -46,12 +46,11 @@ import java.math.BigDecimal; * * @author Jack Chung (flattop@arsdigita.com) * @version $Revision: #11 $ $Date: 2004/08/17 $ + * @version $Id: DeleteStep.java 754 2005-09-02 13:26:17Z sskracic $ */ public class DeleteStep extends Form implements FormProcessListener, FormSubmissionListener { - public static final String versionId = "$Id: DeleteStep.java 754 2005-09-02 13:26:17Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private final SingleSelectionModel m_steps; protected final ContentTypeRequestLocal m_type; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/EditKit.java b/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/EditKit.java index 0fa0cba45..6de1a36c1 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/EditKit.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/EditKit.java @@ -51,12 +51,11 @@ import java.math.BigDecimal; * * @author Jack Chung (flattop@arsdigita.com) * @version $Revision: #12 $ $Date: 2004/08/17 $ + * @version $Id: EditKit.java 754 2005-09-02 13:26:17Z sskracic $ */ public class EditKit extends Form implements FormProcessListener, FormInitListener { - public static final String versionId = "$Id: EditKit.java 754 2005-09-02 13:26:17Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - protected final ContentTypeRequestLocal m_type; protected Hidden m_id; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/EditStep.java b/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/EditStep.java index 3dced01ca..cbd11327d 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/EditStep.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/EditStep.java @@ -36,11 +36,10 @@ import java.math.BigDecimal; * * @author Jack Chung (flattop@arsdigita.com) * @version $Revision: #10 $ $Date: 2004/08/17 $ + * @version $Id: EditStep.java 287 2005-02-22 00:29:02Z sskracic $ */ public class EditStep extends AddStep { - public static final String versionId = "$Id: EditStep.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - protected final SingleSelectionModel m_steps; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/KitInfo.java b/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/KitInfo.java index 1da8c3ae2..f559e18ea 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/KitInfo.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/KitInfo.java @@ -44,11 +44,10 @@ import java.math.BigDecimal; * @author Jack Chung (flattop@arsdigita.com) * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #10 $ $Date: 2004/08/17 $ + * @version $Id: KitInfo.java 287 2005-02-22 00:29:02Z sskracic $ */ public class KitInfo extends CMSContainer { - public static final String versionId = "$Id: KitInfo.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private final SingleSelectionModel m_types; private final Table m_stepTable; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/KitPanel.java b/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/KitPanel.java index c6ce81d07..70721c903 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/KitPanel.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoringkit/KitPanel.java @@ -62,14 +62,13 @@ import org.apache.log4j.Logger; * * @author Jack Chung * @version $Revision: #15 $ $Date: 2004/08/17 $ + * @version $Id: KitPanel.java 754 2005-09-02 13:26:17Z sskracic $ */ public class KitPanel extends BoxPanel implements ActionListener, TableActionListener { private static final Logger s_log = Logger.getLogger( KitPanel.class ); - public static final String versionId = "$Id: KitPanel.java 754 2005-09-02 13:26:17Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public final static Integer EDIT_COLUMN = new Integer(4); public final static Integer DELETE_COLUMN = new Integer(5); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/AddUseContextForm.java b/ccm-cms/src/com/arsdigita/cms/ui/category/AddUseContextForm.java index aa743c113..5030e6792 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/category/AddUseContextForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/category/AddUseContextForm.java @@ -40,13 +40,9 @@ import org.apache.log4j.Logger; /** * @author Scott Seago - * @version $Id: AddUseContextForm.java 754 2005-09-02 13:26:17Z sskracic $ + * @version $Id: AddUseContextForm.java 1942 2009-05-29 07:53:23Z terry $ */ class AddUseContextForm extends BaseForm { - public static final String versionId = - "$Id: AddUseContextForm.java 754 2005-09-02 13:26:17Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger(AddUseContextForm.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/BaseCategoryForm.java b/ccm-cms/src/com/arsdigita/cms/ui/category/BaseCategoryForm.java index 06be016ca..221c37166 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/category/BaseCategoryForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/category/BaseCategoryForm.java @@ -1,185 +1,185 @@ -/* - * Copyright (C) 2003-2004 Red Hat Inc. All Rights Reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ -package com.arsdigita.cms.ui.category; - -import com.arsdigita.bebop.FormProcessException; -import com.arsdigita.bebop.Label; -import com.arsdigita.bebop.PageState; -import com.arsdigita.bebop.event.ParameterEvent; -import com.arsdigita.bebop.event.ParameterListener; -import com.arsdigita.bebop.form.Option; -import com.arsdigita.bebop.form.RadioGroup; -import com.arsdigita.bebop.form.TextArea; -import com.arsdigita.bebop.form.TextField; -import com.arsdigita.bebop.form.Widget; -import com.arsdigita.bebop.parameters.NotNullValidationListener; -import com.arsdigita.bebop.parameters.TrimmedStringParameter; -import com.arsdigita.categorization.Category; -import com.arsdigita.categorization.CategoryCollection; -import com.arsdigita.cms.ui.BaseForm; -import com.arsdigita.globalization.GlobalizedMessage; -import com.arsdigita.xml.Element; - -import org.apache.log4j.Logger; - - -/** - * A form which creates a new category. Extends the edit form for - * convenience. - * - * @author Michael Pih - * @author Stanislav Freidin <sfreidin@redhat.com> - * @author Justin Ross <jross@redhat.com> - * @version $Id: BaseCategoryForm.java 543 2005-06-03 23:03:45Z sskracic $ - */ -class BaseCategoryForm extends BaseForm { - private static final Logger s_log = Logger.getLogger - (BaseCategoryForm.class); - - final CategoryRequestLocal m_parent; - final TextField m_name; - final TextArea m_description; - final TextField m_url; - final RadioGroup m_isAbstract; - final RadioGroup m_isEnabled; - private Label m_script = new Label("", false); - - - - private final static String NAME = "name"; - private final static String DESCRIPTION = "description"; - private final static String URL = "url"; - private final static String IS_ABSTRACT = "isAbstract"; - private final static String IS_ENABLED = "isEnabled"; - - /** - * Constructor. - */ - BaseCategoryForm(final String key, - final GlobalizedMessage heading, - final CategoryRequestLocal parent) { - super(key, heading); - - m_parent = parent; - - m_name = new TextField(new TrimmedStringParameter(NAME)); - addField(gz("cms.ui.name"), m_name); - - m_name.setSize(30); - m_name.setMaxLength(200); - m_name.addValidationListener(new NotNullValidationListener()); - m_name.setOnFocus("if (this.form." + URL + ".value == '') { " + - " defaulting = true; this.form." + URL + - ".value = urlize(this.value); }"); - m_name.setOnKeyUp("if (defaulting) { this.form." + URL + - ".value = urlize(this.value) }"); - - // is abstract? - m_isAbstract = new RadioGroup(IS_ABSTRACT); - m_isAbstract.addOption(new Option("no", new Label(gz("cms.ui.no")))); - m_isAbstract.addOption(new Option("yes", new Label(gz("cms.ui.yes")))); - addField(gz("cms.ui.category.is_not_abstract"),m_isAbstract); - - // is enabled? - m_isEnabled = new RadioGroup(IS_ENABLED); - m_isEnabled.addOption(new Option("no", new Label(gz("cms.ui.no")))); - m_isEnabled.addOption(new Option("yes", new Label(gz("cms.ui.yes")))); - addField(gz("cms.ui.category.is_enabled"),m_isEnabled); - - - m_description = new TextArea - (new TrimmedStringParameter(DESCRIPTION)); - addField(gz("cms.ui.description"), m_description); - - m_description.setWrap(TextArea.SOFT); - m_description.setRows(5); - m_description.setCols(40); - - // URL - // JavaScript auto-url generation is off by default. - // It is turned on under the following circumstances - // - // * If the url is null, upon starting edit of the title - // * If the url is null, upon finishing edit of name - // - // The rationale is that, auto-url generation is useful - // if the url is currently null, but once a name has been - // created you don't want to subsequently change it since - // it breaks URLs & potentially overwrites the user's - // customizations. - m_url = new TextField(new TrimmedStringParameter(URL)); - m_url.setSize(30); - m_url.setMaxLength(200); - m_url.addValidationListener(new NotNullValidationListener()); - m_url.setOnFocus("defaulting = false"); - m_url.setOnBlur("if (this.value == '') " + - "{ defaulting = true; this.value = urlize(this.form." + NAME + - ".value) } " + - "else { this.value = urlize(this.value); }"); - addField(gz("cms.ui.category.url"),m_url); - - addAction(new Finish()); - addAction(new Cancel()); - } - - public void generateXML(PageState ps, Element parent) { - m_script.generateXML(ps, parent); - super.generateXML(ps, parent); - } - - class NameUniqueListener implements ParameterListener { - private final CategoryRequestLocal m_category; - private final Widget m_widget; - private final int m_type; - public final static int NAME_FIELD = 1; - public final static int URL_FIELD = 2; - - NameUniqueListener(final CategoryRequestLocal category) { - this(category,m_name,NAME_FIELD); - } - NameUniqueListener(final CategoryRequestLocal category, - Widget widget, int type) { - m_category = category; - m_widget = widget; - m_type = type; - } - - public final void validate(final ParameterEvent e) - throws FormProcessException { - final PageState state = e.getPageState(); - final String title = (String) m_widget.getValue(state); - - final Category parent = m_parent.getCategory(state); - - final CategoryCollection children = parent.getChildren(); - - while (children.next()) { - final Category child = children.getCategory(); - String compField = - (m_type == URL_FIELD) ? child.getURL() : child.getName(); - if (compField.equalsIgnoreCase(title) - && (m_category == null - || !m_category.getCategory(state).equals(child))) { - throw new FormProcessException - (lz("cms.ui.category.name_not_unique")); - } - } - } - } -} +/* + * Copyright (C) 2003-2004 Red Hat Inc. All Rights Reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ +package com.arsdigita.cms.ui.category; + +import com.arsdigita.bebop.FormProcessException; +import com.arsdigita.bebop.Label; +import com.arsdigita.bebop.PageState; +import com.arsdigita.bebop.event.ParameterEvent; +import com.arsdigita.bebop.event.ParameterListener; +import com.arsdigita.bebop.form.Option; +import com.arsdigita.bebop.form.RadioGroup; +import com.arsdigita.bebop.form.TextArea; +import com.arsdigita.bebop.form.TextField; +import com.arsdigita.bebop.form.Widget; +import com.arsdigita.bebop.parameters.NotNullValidationListener; +import com.arsdigita.bebop.parameters.TrimmedStringParameter; +import com.arsdigita.categorization.Category; +import com.arsdigita.categorization.CategoryCollection; +import com.arsdigita.cms.ui.BaseForm; +import com.arsdigita.globalization.GlobalizedMessage; +import com.arsdigita.xml.Element; + +import org.apache.log4j.Logger; + + +/** + * A form which creates a new category. Extends the edit form for + * convenience. + * + * @author Michael Pih + * @author Stanislav Freidin <sfreidin@redhat.com> + * @author Justin Ross <jross@redhat.com> + * @version $Id: BaseCategoryForm.java 1951 2009-06-30 04:35:04Z terry $ + */ +class BaseCategoryForm extends BaseForm { + private static final Logger s_log = Logger.getLogger + (BaseCategoryForm.class); + + final CategoryRequestLocal m_parent; + final TextField m_name; + final TextArea m_description; + final TextField m_url; + final RadioGroup m_isAbstract; + final RadioGroup m_isEnabled; + private Label m_script = new Label("", false); + + + + private final static String NAME = "name"; + private final static String DESCRIPTION = "description"; + private final static String URL = "url"; + private final static String IS_ABSTRACT = "isAbstract"; + private final static String IS_ENABLED = "isEnabled"; + + /** + * Constructor. + */ + BaseCategoryForm(final String key, + final GlobalizedMessage heading, + final CategoryRequestLocal parent) { + super(key, heading); + + m_parent = parent; + + m_name = new TextField(new TrimmedStringParameter(NAME)); + addField(gz("cms.ui.name"), m_name); + + m_name.setSize(30); + m_name.setMaxLength(200); + m_name.addValidationListener(new NotNullValidationListener()); + m_name.setOnFocus("if (this.form." + URL + ".value == '') { " + + " defaulting = true; this.form." + URL + + ".value = urlize(this.value); }"); + m_name.setOnKeyUp("if (defaulting) { this.form." + URL + + ".value = urlize(this.value) }"); + + // is abstract? + m_isAbstract = new RadioGroup(IS_ABSTRACT); + m_isAbstract.addOption(new Option("no", new Label(gz("cms.ui.no")))); + m_isAbstract.addOption(new Option("yes", new Label(gz("cms.ui.yes")))); + addField(gz("cms.ui.category.is_not_abstract"),m_isAbstract); + + // is enabled? + m_isEnabled = new RadioGroup(IS_ENABLED); + m_isEnabled.addOption(new Option("no", new Label(gz("cms.ui.no")))); + m_isEnabled.addOption(new Option("yes", new Label(gz("cms.ui.yes")))); + addField(gz("cms.ui.category.is_enabled"),m_isEnabled); + + + m_description = new TextArea + (new TrimmedStringParameter(DESCRIPTION)); + addField(gz("cms.ui.description"), m_description); + + m_description.setWrap(TextArea.SOFT); + m_description.setRows(5); + m_description.setCols(40); + + // URL + // JavaScript auto-url generation is off by default. + // It is turned on under the following circumstances + // + // * If the url is null, upon starting edit of the title + // * If the url is null, upon finishing edit of name + // + // The rationale is that, auto-url generation is useful + // if the url is currently null, but once a name has been + // created you don't want to subsequently change it since + // it breaks URLs & potentially overwrites the user's + // customizations. + m_url = new TextField(new TrimmedStringParameter(URL)); + m_url.setSize(30); + m_url.setMaxLength(200); + m_url.addValidationListener(new NotNullValidationListener()); + m_url.setOnFocus("defaulting = false"); + m_url.setOnBlur("if (this.value == '') " + + "{ defaulting = true; this.value = urlize(this.form." + NAME + + ".value) } " + + "else { this.value = urlize(this.value); }"); + addField(gz("cms.ui.category.url"),m_url); + + addAction(new Finish()); + addAction(new Cancel()); + } + + public void generateXML(PageState ps, Element parent) { + m_script.generateXML(ps, parent); + super.generateXML(ps, parent); + } + + class NameUniqueListener implements ParameterListener { + private final CategoryRequestLocal m_category; + private final Widget m_widget; + private final int m_type; + public final static int NAME_FIELD = 1; + public final static int URL_FIELD = 2; + + NameUniqueListener(final CategoryRequestLocal category) { + this(category,m_name,NAME_FIELD); + } + NameUniqueListener(final CategoryRequestLocal category, + Widget widget, int type) { + m_category = category; + m_widget = widget; + m_type = type; + } + + public final void validate(final ParameterEvent e) + throws FormProcessException { + final PageState state = e.getPageState(); + final String title = (String) m_widget.getValue(state); + + final Category parent = m_parent.getCategory(state); + + final CategoryCollection children = parent.getChildren(); + + while (children.next()) { + final Category child = children.getCategory(); + String compField = + (m_type == URL_FIELD) ? child.getURL() : child.getName(); + if (compField.equalsIgnoreCase(title) + && (m_category == null + || !m_category.getCategory(state).equals(child))) { + throw new FormProcessException + (lz("cms.ui.category.name_not_unique")); + } + } + } + } +} diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/CategorizedObjectsList.java b/ccm-cms/src/com/arsdigita/cms/ui/category/CategorizedObjectsList.java index 48ffefe8a..572e58f7a 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/category/CategorizedObjectsList.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/category/CategorizedObjectsList.java @@ -41,12 +41,9 @@ import javax.servlet.ServletException; * * @author Randy Graebner (randyg@redhat.com) * @version $Revision: #18 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Revision: #18 $Id: CategorizedObjectsList.java 287 2005-02-22 00:29:02Z sskracic $ */ public class CategorizedObjectsList extends SortableCategoryList { - public static final String versionId = - "$Id: CategorizedObjectsList.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; public final static String CATEGORIZED_OBJECTS = "co"; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryAddForm.java b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryAddForm.java index 83b94a702..480c48048 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryAddForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryAddForm.java @@ -30,13 +30,9 @@ import org.apache.log4j.Logger; /** * @author Justin Ross <jross@redhat.com> - * @version $Id: CategoryAddForm.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: CategoryAddForm.java 1942 2009-05-29 07:53:23Z terry $ */ final class CategoryAddForm extends BaseCategoryForm { - public static final String versionId = - "$Id: CategoryAddForm.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (CategoryAddForm.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryAdminContainer.java b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryAdminContainer.java index a43e2717a..ec9d2e5de 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryAdminContainer.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryAdminContainer.java @@ -34,11 +34,10 @@ import com.arsdigita.toolbox.ui.SecurityContainer; * * @author Michael Pih (pihman@arsdigita.com) * @version $Revision: #9 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: CategoryAdminContainer.java 287 2005-02-22 00:29:02Z sskracic $ */ public class CategoryAdminContainer extends SecurityContainer { - public static final String versionId = "$Id: CategoryAdminContainer.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private ACSObjectSelectionModel m_object; private PrivilegeDescriptor m_priv; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryAdminPane.java b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryAdminPane.java index 8b7853ed7..b1446e7f9 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryAdminPane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryAdminPane.java @@ -66,10 +66,6 @@ import org.apache.log4j.Logger; * @version $Id: CategoryAdminPane.java 1795 2009-02-07 10:47:32Z pboy $ */ public final class CategoryAdminPane extends BaseAdminPane { - public static final String versionId = - "$Id: CategoryAdminPane.java 1795 2009-02-07 10:47:32Z pboy $" + - "$Author: pboy $" + - "$DateTime: 2004/08/17 23:15:09 $"; public static final String CONTEXT_SELECTED="sel_context"; private static final String DEFAULT_USE_CONTEXT = diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryEditForm.java b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryEditForm.java index 0dd48c7f8..0745eab73 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryEditForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryEditForm.java @@ -31,13 +31,9 @@ import org.apache.log4j.Logger; * XXX * * @author Justin Ross <jross@redhat.com> - * @version $Id: CategoryEditForm.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: CategoryEditForm.java 1942 2009-05-29 07:53:23Z terry $ */ final class CategoryEditForm extends BaseCategoryForm { - public static final String versionId = - "$Id: CategoryEditForm.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (CategoryEditForm.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryItemPane.java b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryItemPane.java index 4914643f4..18c89ebf5 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryItemPane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryItemPane.java @@ -1,614 +1,614 @@ -/* - * Copyright (C) 2003-2004 Red Hat Inc. All Rights Reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ -package com.arsdigita.cms.ui.category; - -import com.arsdigita.bebop.ActionLink; -import com.arsdigita.bebop.BaseLink; -import com.arsdigita.bebop.Component; -import com.arsdigita.bebop.Form; -import com.arsdigita.bebop.Label; -import com.arsdigita.bebop.Link; -import com.arsdigita.bebop.PageState; -import com.arsdigita.bebop.SimpleContainer; -import com.arsdigita.bebop.SingleSelectionModel; -import com.arsdigita.bebop.event.ActionEvent; -import com.arsdigita.bebop.event.ActionListener; -import com.arsdigita.bebop.event.ChangeEvent; -import com.arsdigita.bebop.event.ChangeListener; -import com.arsdigita.bebop.form.Submit; -import com.arsdigita.categorization.CategorizationConfig; -import com.arsdigita.categorization.CategorizedCollection; -import com.arsdigita.categorization.Category; -import com.arsdigita.categorization.CategoryCollection; -import com.arsdigita.categorization.CategoryNotFoundException; -import com.arsdigita.cms.ContentBundle; -import com.arsdigita.cms.ContentItem; -import com.arsdigita.cms.ui.BaseItemPane; -import com.arsdigita.cms.ui.CMSForm; -import com.arsdigita.cms.ui.ContentItemPage; -import com.arsdigita.cms.ui.VisibilityComponent; -import com.arsdigita.cms.ui.permissions.CMSPermissionsPane; -import com.arsdigita.cms.ui.templates.CategoryTemplates; -import com.arsdigita.kernel.ACSObject; -import com.arsdigita.kernel.User; -import com.arsdigita.kernel.permissions.ObjectPermissionCollection; -import com.arsdigita.kernel.permissions.PermissionDescriptor; -import com.arsdigita.kernel.permissions.PermissionService; -import com.arsdigita.kernel.permissions.PrivilegeDescriptor; -import com.arsdigita.kernel.ui.ACSObjectSelectionModel; -import com.arsdigita.persistence.DataObject; -import com.arsdigita.persistence.OID; -import com.arsdigita.toolbox.ui.ActionGroup; -import com.arsdigita.toolbox.ui.PropertyList; -import com.arsdigita.toolbox.ui.Section; -import com.arsdigita.util.Assert; -import com.arsdigita.web.Web; - -import java.math.BigDecimal; -import java.net.URLEncoder; -import java.util.HashMap; -import java.util.Iterator; - -import org.apache.log4j.Logger; - -/** - * Edits a single category. - * - * @author Justin Ross <jross@redhat.com> - * @author Sören Bernstein (quasimodo) quasi@zes.uni-bremen.de - * @version $Id: CategoryItemPane.java 1329 2006-09-27 11:47:05Z sskracic $ - */ -class CategoryItemPane extends BaseItemPane { - - private static final Logger s_log = Logger.getLogger - (CategoryItemPane.class); - - private final SingleSelectionModel m_model; - private final CategoryRequestLocal m_category; - - private final SimpleContainer m_detailPane; - - public CategoryItemPane(final SingleSelectionModel model, - final CategoryRequestLocal category, - final ActionLink addLink, - final ActionLink editLink, - final ActionLink deleteLink) { - m_model = model; - m_category = category; - - // Details - - m_detailPane = new SimpleContainer(); - add(m_detailPane); - setDefault(m_detailPane); - - final ActionLink orderItemsLink = new ActionLink(new Label( - gz("cms.ui.category.categorized_objects"))) { - public boolean isVisible(PageState state) { - // update for live items only - if (!super.isVisible(state)) { - return false; - } - CategorizedCollection items = m_category.getCategory - (state).getObjects(ContentItem.BASE_DATA_OBJECT_TYPE); - items.addEqualsFilter(ContentItem.VERSION,ContentItem.LIVE); - boolean canOrder = items.size() > 1; - items.close(); - return canOrder; - } - }; - - - final Form orderItemsForm = new OrderItemsForm(m_category); - final Form orderItemsForm2 = new OrderItemsForm(m_category); - add(orderItemsForm); - add(orderItemsForm2); - - // Change index item - final ActionLink indexLink = new ActionLink(new Label(gz( - "cms.ui.category.change_index_item"))); - final Form indexForm = new IndexItemSelectionForm(m_category); - add(indexForm); - - ViewItemLink viewIndexLink = new ViewItemLink(new Label(gz( - "cms.ui.category.view_index_item")),""); - EditItemLink editIndexLink = new EditItemLink(new Label(gz( - "cms.ui.category.edit_index_item")),""); - - // Summary - m_detailPane.add(new SummarySection(editLink, deleteLink, indexLink, - viewIndexLink, editIndexLink, orderItemsLink)); - - // Quasimodo: BEGIN - // Localizations - ActionLink addCategoryLocalizationLink = new ActionLink(new Label(gz( - "cms.ui.category.localization.add"))) { - public boolean isVisible(PageState state) { - // Only show addLanguage button, if there are langauges to add - int countSupportedLanguages = ( - new CategorizationConfig()).getSupportedLanguages() - .countTokens(); - long countLanguages = - m_category.getCategory(state) - .getCategoryLocalizationCollection().size(); - - if(countLanguages < countSupportedLanguages) { - return true; - } else { - return false; - } - } - }; - - CategoryLocalizationAddForm addCategoryLocalizationForm = - new CategoryLocalizationAddForm(m_category); - m_detailPane.add(new CategoryLocalizationSection(addCategoryLocalizationLink)); - add(addCategoryLocalizationForm); - connect(addCategoryLocalizationLink, addCategoryLocalizationForm); - connect(addCategoryLocalizationForm); - // Quasimodo: END - - // Subcategories - m_detailPane.add(new SubcategorySection(addLink)); - - // Linked categories - final ActionLink linkAddLink = new ActionLink - (new Label(gz("cms.ui.category.linked.add"))); - - final Form linkForm = new LinkForm(m_category); - add(linkForm); - - linkAddLink.addActionListener(new NavigationListener(linkForm)); - linkForm.addSubmissionListener(new CancelListener(linkForm)); - - m_detailPane.add(new LinkedCategorySection(linkAddLink)); - - // Templates - m_detailPane.add(new AdminVisible(new CategoryTemplateSection())); - - // Permissions - m_detailPane.add(new PermissionsSection()); - - connect(indexLink, indexForm); - connect(indexForm); - - connect(orderItemsLink, orderItemsForm); - connect(orderItemsForm); - - } - - private class EditVisible extends VisibilityComponent { - EditVisible(final Component child) { - super(child, null); - } - - public boolean hasPermission(PageState ps) { - return m_category.getCategory(ps).canEdit(); - } - } - - private class AdminVisible extends VisibilityComponent { - AdminVisible(final Component child) { - super(child, null); - } - - public boolean hasPermission(PageState ps) { - return m_category.getCategory(ps).canAdmin(); - } - } - - private class SummarySection extends Section { - - SummarySection(final ActionLink editLink, - final ActionLink deleteLink, - final ActionLink indexLink, - final ActionLink orderItemsLink) { - setHeading(new Label(gz("cms.ui.category.details"))); - - final ActionGroup group = new ActionGroup(); - setBody(group); - - group.setSubject(new Properties()); - - group.addAction(new EditVisible(editLink), ActionGroup.EDIT); - group.addAction(new EditVisible(orderItemsLink)); - group.addAction(new EditVisible(indexLink)); - group.addAction(new AdminVisible(deleteLink), ActionGroup.DELETE); - } - - /* - * This alternative constructor sets two additional links, allowing - * the user to view and edit the content index item. - */ - SummarySection(final ActionLink editLink, - final ActionLink deleteLink, - final ActionLink indexLink, - final BaseLink viewIndexItem, - final BaseLink editIndexItem, - final ActionLink orderItemsLink) { - setHeading(new Label(gz("cms.ui.category.details"))); - - final ActionGroup group = new ActionGroup(); - setBody(group); - - group.setSubject(new Properties()); - - group.addAction(new EditVisible(editLink), ActionGroup.EDIT); - group.addAction(new EditVisible(orderItemsLink)); - group.addAction(new EditVisible(indexLink)); - group.addAction(new EditVisible(viewIndexItem)); - group.addAction(new EditVisible(editIndexItem)); - group.addAction(new AdminVisible(deleteLink), ActionGroup.DELETE); - } - - private class Properties extends PropertyList { - protected final java.util.List properties(final PageState state) { - final java.util.List props = super.properties(state); - final Category category = m_category.getCategory(state); - final ACSObject item = category.getDirectIndexObject(); - - String itemTitle = "None"; - - if (item != null) { - itemTitle = item.getDisplayName(); - } else if (!category.ignoreParentIndexItem() - && category.getParentCategoryCount() > 0) - { - Category ancestor = findParentCategoryWithNonInheritedIndexItem(category); - if (ancestor != null) { - if (ancestor.getIndexObject() != null) { - itemTitle = ancestor.getIndexObject().getDisplayName(); - } - itemTitle += " (Inherited from " - + ancestor.getDisplayName() + ")"; - } else { - // The complete hierarchy is set to inherit. - // Just leave the itemTitle as None. - } - } - - props.add(new Property(gz("cms.ui.name"), - category.getName(""))); - props.add(new Property(gz("cms.ui.description"), - category.getDescription(""))); - props.add(new Property(gz("cms.ui.category.url"), - category.getURL(""))); - props.add(new Property(gz("cms.ui.category.is_not_abstract"), - category.isAbstract() ? - gz("cms.ui.no") : - gz("cms.ui.yes"))); - props.add(new Property(gz("cms.ui.category.is_enabled"), - category.isEnabled("") ? - gz("cms.ui.yes") : - gz("cms.ui.no"))); - props.add(new Property(gz("cms.ui.category.index_item"), - itemTitle)); - - return props; - } - } - } - - // Loop over the parents and recurse up the hierarchy the find the first - // parent with an explicit index item ignoreParentIndexItem is true. - private Category findParentCategoryWithNonInheritedIndexItem(Category c) { - if (c.getParentCategoryCount() == 0) { - return null; - } - CategoryCollection parents = c.getParents(); - while (parents.next()) { - Category p = parents.getCategory(); - if (p.getDirectIndexObject() != null || p.ignoreParentIndexItem()) { - return p; - } - // Try the parents of this parent. - Category gp = findParentCategoryWithNonInheritedIndexItem(p); - if (gp != null) { - return gp; - } - } - return null; - } - - // Quasimodo: BEGIN - // CategoryLocalizationSection - private class CategoryLocalizationSection extends Section { - CategoryLocalizationSection(ActionLink addLink) { - setHeading(new Label(gz("cms.ui.category.localizations"))); - - final ActionGroup group = new ActionGroup(); - setBody(group); - - group.setSubject(new CategoryLocalizationTable(m_category, m_model)); - group.addAction(new AdminVisible(addLink), ActionGroup.ADD); - } - } - - private class SubcategorySection extends Section { - SubcategorySection(final ActionLink addLink) { - setHeading(new Label(gz("cms.ui.category.subcategories"))); - - final ActionGroup group = new ActionGroup(); - setBody(group); - - group.setSubject(new SubcategoryList(m_category, m_model)); - group.addAction(new AdminVisible(addLink), ActionGroup.ADD); - } - } - - private class LinkedCategorySection extends Section { - LinkedCategorySection(final ActionLink linkAddLink) { - setHeading(new Label(gz("cms.ui.category.linked"))); - - final ActionGroup group = new ActionGroup(); - setBody(group); - - group.setSubject(new CategoryLinks(m_category, m_model)); - group.addAction(new EditVisible(linkAddLink), ActionGroup.EDIT); - } - - public final boolean isVisible(final PageState state) { - return !m_category.getCategory(state).isRoot(); - } - } - - private class CategoryTemplateSection extends Section { - CategoryTemplateSection() { - setHeading(new Label(gz("cms.ui.category.templates"))); - - final ActionGroup group = new ActionGroup(); - setBody(group); - - group.setSubject(new CategoryTemplates(m_category)); - // XXX secvis - //group.addAction(link); - } - } - - private class PermissionsSection extends Section { - public boolean isVisible(PageState ps) { - Category cat = m_category.getCategory(ps); - return !cat.isRoot() && cat.canAdmin(); - } - - PermissionsSection() { - setHeading(new Label(gz("cms.ui.permissions"))); - - final ActionGroup group = new ActionGroup(); - setBody(group); - - PrivilegeDescriptor[] privs = new PrivilegeDescriptor[] { - PrivilegeDescriptor.EDIT, - Category.MAP_DESCRIPTOR, - PrivilegeDescriptor.DELETE, - PrivilegeDescriptor.ADMIN - }; - - HashMap privMap = new HashMap(); - privMap.put("edit", "Edit"); - privMap.put("delete", "Delete"); - privMap.put(Category.MAP_DESCRIPTOR.getName(), "Categorize Items"); - privMap.put("admin", "Admin"); - - final CMSPermissionsPane permPane = new CMSPermissionsPane - (privs, privMap, new ACSObjectSelectionModel(m_model)) { - public void showAdmin(PageState ps) { - Assert.exists(m_model.getSelectedKey(ps)); - - super.showAdmin(ps); - getAdminListingPanel().setVisible(ps, false); - } - }; - - final ActionLink restoreDefault = new ActionLink(new Label(gz( - "cms.ui.restore_default_permissions"))) { - public boolean isVisible(PageState ps) { - Category cat = m_category.getCategory(ps); - return PermissionService.getContext(cat) == null; - } - }; - - final ActionLink useCustom = new ActionLink(new Label(gz( - "cms.ui.use_custom_permissions"))) { - public boolean isVisible(PageState ps) { - Category cat = m_category.getCategory(ps); - return PermissionService.getContext(cat) != null; - } - }; - - ActionListener al = new ActionListener() { - public void actionPerformed(ActionEvent event) { - PageState state = event.getPageState(); - // if this is the root then we cannot revert to anything - // since there is not a parent - Category cat = m_category.getCategory(state); - if (!cat.canAdmin()) { - throw new com.arsdigita.cms.dispatcher.AccessDeniedException(); - } - DataObject context = PermissionService.getContext(cat); - if (context != null) { - PermissionService.clonePermissions(cat); - } else { - ACSObject parent; - try { - parent = cat.getDefaultParentCategory(); - } catch (CategoryNotFoundException ce) { - throw new IllegalStateException( - "link shouldn't exist for root categories"); - } - PermissionService.setContext(cat, parent); - - // revoke all direct permissions so category will only - // have inherited permissions - ObjectPermissionCollection perms = - PermissionService.getDirectGrantedPermissions( - cat.getOID()); - while (perms.next()) { - PermissionService.revokePermission( - new PermissionDescriptor( - perms.getPrivilege(), cat.getOID(), - perms.getGranteeOID())); - } - } - permPane.reset(state); - } - }; - - restoreDefault.addActionListener(al); - useCustom.addActionListener(al); - - SimpleContainer links = new SimpleContainer(); - links.add(restoreDefault); - links.add(useCustom); - - group.setSubject(permPane); - group.addAction(links); - - m_model.addChangeListener(new ChangeListener() { - public void stateChanged(ChangeEvent e) { - PageState ps = e.getPageState(); - } - }); - } - } - - private static class OrderItemsForm extends CMSForm { - - public OrderItemsForm(CategoryRequestLocal category) { - super("orderItems", new SimpleContainer()); - Label header = new Label(gz("cms.ui.category.categorized_objects")); - header.setFontWeight(Label.BOLD); - add(header); - add(new CategorizedObjectsList(category)); - - add(new Submit("Done")); - - } - - } - - /* - * This private class creates a link to the index item for a category. - */ - private class ViewItemLink extends Link { - ViewItemLink(Component c, String s) { - super(c,s); - } - - // Build the preview link. This uses a standard redirect link to find - // the content. The prepareURL method is called by the printwriter - protected String prepareURL(final PageState state, String location) { - - ContentItem indexItem = ((ContentBundle)(m_category.getCategory(state) - .getDirectIndexObject())) - .getPrimaryInstance(); - if(indexItem==null) { - return ""; - } else { - return "/redirect/?oid=" + URLEncoder.encode(indexItem.getOID().toString()); - } - } - - // We only show this link when an index item exists for this category - public boolean isVisible(PageState state) { - if (!super.isVisible(state)) { - return false; - } - ACSObject indexItem = m_category.getCategory(state).getDirectIndexObject(); - if(indexItem==null) { - return false; - } else { - return true; - } - } - }; - - private class EditItemLink extends Link { - EditItemLink(Component c, String s) { - super(c,s); - } - - /** - * Build the preview link. This is based on code in the - * ContentSoonExpiredPane class. The prepareURL method of the parent - * is overwritten. This method is called by the printwriter - */ - @Override - protected String prepareURL(final PageState state, String location) { - boolean canEdit = false; - ContentItem indexItem = ((ContentBundle)(m_category.getCategory(state) - .getDirectIndexObject())) - .getPrimaryInstance(); - if(indexItem==null) { - return ""; - } - if (!isItemEditable(indexItem,state)) { - return ""; - } else { - BigDecimal draftID = indexItem.getDraftVersion().getID(); - return "item.jsp?item_id=" + draftID + "&set_tab=" + - ContentItemPage.AUTHORING_TAB; - } - } - - /** - * We only show this link when an index item exists for this category - * and the user is allowed to edit this item. - * @param state - * @return - */ - @Override - public boolean isVisible(PageState state) { - if (!super.isVisible(state)) { - return false; - } - ACSObject indexItem = m_category.getCategory(state).getDirectIndexObject(); - if(indexItem==null) { - return false; - } else { - return isItemEditable((ContentItem)indexItem,state); - } - } - - /** - * This method checks whether a usern is allowed to edit a - * particular item. - * - * @param item - * @param state - * @return - */ - private boolean isItemEditable(ContentItem item, PageState state) { - BigDecimal id = item.getID(); - User user = Web.getContext().getUser(); - ContentItem ci = new ContentItem(new OID(ContentItem.class.getName(), - Integer.parseInt(id.toString()))); - Iterator permissions = PermissionService.getImpliedPrivileges( - ci.getOID(), user.getOID()); - while (permissions.hasNext()) { - PrivilegeDescriptor permission = (PrivilegeDescriptor)permissions.next(); - if (permission.equals(PrivilegeDescriptor.ADMIN) || - permission.equals(PrivilegeDescriptor.EDIT)) { - return true; - } - } - return false; - } - }; -} +/* + * Copyright (C) 2003-2004 Red Hat Inc. All Rights Reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ +package com.arsdigita.cms.ui.category; + +import com.arsdigita.bebop.ActionLink; +import com.arsdigita.bebop.BaseLink; +import com.arsdigita.bebop.Component; +import com.arsdigita.bebop.Form; +import com.arsdigita.bebop.Label; +import com.arsdigita.bebop.Link; +import com.arsdigita.bebop.PageState; +import com.arsdigita.bebop.SimpleContainer; +import com.arsdigita.bebop.SingleSelectionModel; +import com.arsdigita.bebop.event.ActionEvent; +import com.arsdigita.bebop.event.ActionListener; +import com.arsdigita.bebop.event.ChangeEvent; +import com.arsdigita.bebop.event.ChangeListener; +import com.arsdigita.bebop.form.Submit; +import com.arsdigita.categorization.CategorizationConfig; +import com.arsdigita.categorization.CategorizedCollection; +import com.arsdigita.categorization.Category; +import com.arsdigita.categorization.CategoryCollection; +import com.arsdigita.categorization.CategoryNotFoundException; +import com.arsdigita.cms.ContentBundle; +import com.arsdigita.cms.ContentItem; +import com.arsdigita.cms.ui.BaseItemPane; +import com.arsdigita.cms.ui.CMSForm; +import com.arsdigita.cms.ui.ContentItemPage; +import com.arsdigita.cms.ui.VisibilityComponent; +import com.arsdigita.cms.ui.permissions.CMSPermissionsPane; +import com.arsdigita.cms.ui.templates.CategoryTemplates; +import com.arsdigita.kernel.ACSObject; +import com.arsdigita.kernel.User; +import com.arsdigita.kernel.permissions.ObjectPermissionCollection; +import com.arsdigita.kernel.permissions.PermissionDescriptor; +import com.arsdigita.kernel.permissions.PermissionService; +import com.arsdigita.kernel.permissions.PrivilegeDescriptor; +import com.arsdigita.kernel.ui.ACSObjectSelectionModel; +import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.OID; +import com.arsdigita.toolbox.ui.ActionGroup; +import com.arsdigita.toolbox.ui.PropertyList; +import com.arsdigita.toolbox.ui.Section; +import com.arsdigita.util.Assert; +import com.arsdigita.web.Web; + +import java.math.BigDecimal; +import java.net.URLEncoder; +import java.util.HashMap; +import java.util.Iterator; + +import org.apache.log4j.Logger; + +/** + * Edits a single category. + * + * @author Justin Ross <jross@redhat.com> + * @author Sören Bernstein (quasimodo) quasi@zes.uni-bremen.de + * @version $Id: CategoryItemPane.java 1967 2009-08-29 21:05:51Z pboy $ + */ +class CategoryItemPane extends BaseItemPane { + + private static final Logger s_log = Logger.getLogger + (CategoryItemPane.class); + + private final SingleSelectionModel m_model; + private final CategoryRequestLocal m_category; + + private final SimpleContainer m_detailPane; + + public CategoryItemPane(final SingleSelectionModel model, + final CategoryRequestLocal category, + final ActionLink addLink, + final ActionLink editLink, + final ActionLink deleteLink) { + m_model = model; + m_category = category; + + // Details + + m_detailPane = new SimpleContainer(); + add(m_detailPane); + setDefault(m_detailPane); + + final ActionLink orderItemsLink = new ActionLink(new Label( + gz("cms.ui.category.categorized_objects"))) { + public boolean isVisible(PageState state) { + // update for live items only + if (!super.isVisible(state)) { + return false; + } + CategorizedCollection items = m_category.getCategory + (state).getObjects(ContentItem.BASE_DATA_OBJECT_TYPE); + items.addEqualsFilter(ContentItem.VERSION,ContentItem.LIVE); + boolean canOrder = items.size() > 1; + items.close(); + return canOrder; + } + }; + + + final Form orderItemsForm = new OrderItemsForm(m_category); + final Form orderItemsForm2 = new OrderItemsForm(m_category); + add(orderItemsForm); + add(orderItemsForm2); + + // Change index item + final ActionLink indexLink = new ActionLink(new Label(gz( + "cms.ui.category.change_index_item"))); + final Form indexForm = new IndexItemSelectionForm(m_category); + add(indexForm); + + ViewItemLink viewIndexLink = new ViewItemLink(new Label(gz( + "cms.ui.category.view_index_item")),""); + EditItemLink editIndexLink = new EditItemLink(new Label(gz( + "cms.ui.category.edit_index_item")),""); + + // Summary + m_detailPane.add(new SummarySection(editLink, deleteLink, indexLink, + viewIndexLink, editIndexLink, orderItemsLink)); + + // Quasimodo: BEGIN + // Localizations + ActionLink addCategoryLocalizationLink = new ActionLink(new Label(gz( + "cms.ui.category.localization.add"))) { + public boolean isVisible(PageState state) { + // Only show addLanguage button, if there are langauges to add + int countSupportedLanguages = ( + new CategorizationConfig()).getSupportedLanguages() + .countTokens(); + long countLanguages = + m_category.getCategory(state) + .getCategoryLocalizationCollection().size(); + + if(countLanguages < countSupportedLanguages) { + return true; + } else { + return false; + } + } + }; + + CategoryLocalizationAddForm addCategoryLocalizationForm = + new CategoryLocalizationAddForm(m_category); + m_detailPane.add(new CategoryLocalizationSection(addCategoryLocalizationLink)); + add(addCategoryLocalizationForm); + connect(addCategoryLocalizationLink, addCategoryLocalizationForm); + connect(addCategoryLocalizationForm); + // Quasimodo: END + + // Subcategories + m_detailPane.add(new SubcategorySection(addLink)); + + // Linked categories + final ActionLink linkAddLink = new ActionLink + (new Label(gz("cms.ui.category.linked.add"))); + + final Form linkForm = new LinkForm(m_category); + add(linkForm); + + linkAddLink.addActionListener(new NavigationListener(linkForm)); + linkForm.addSubmissionListener(new CancelListener(linkForm)); + + m_detailPane.add(new LinkedCategorySection(linkAddLink)); + + // Templates + m_detailPane.add(new AdminVisible(new CategoryTemplateSection())); + + // Permissions + m_detailPane.add(new PermissionsSection()); + + connect(indexLink, indexForm); + connect(indexForm); + + connect(orderItemsLink, orderItemsForm); + connect(orderItemsForm); + + } + + private class EditVisible extends VisibilityComponent { + EditVisible(final Component child) { + super(child, null); + } + + public boolean hasPermission(PageState ps) { + return m_category.getCategory(ps).canEdit(); + } + } + + private class AdminVisible extends VisibilityComponent { + AdminVisible(final Component child) { + super(child, null); + } + + public boolean hasPermission(PageState ps) { + return m_category.getCategory(ps).canAdmin(); + } + } + + private class SummarySection extends Section { + + SummarySection(final ActionLink editLink, + final ActionLink deleteLink, + final ActionLink indexLink, + final ActionLink orderItemsLink) { + setHeading(new Label(gz("cms.ui.category.details"))); + + final ActionGroup group = new ActionGroup(); + setBody(group); + + group.setSubject(new Properties()); + + group.addAction(new EditVisible(editLink), ActionGroup.EDIT); + group.addAction(new EditVisible(orderItemsLink)); + group.addAction(new EditVisible(indexLink)); + group.addAction(new AdminVisible(deleteLink), ActionGroup.DELETE); + } + + /* + * This alternative constructor sets two additional links, allowing + * the user to view and edit the content index item. + */ + SummarySection(final ActionLink editLink, + final ActionLink deleteLink, + final ActionLink indexLink, + final BaseLink viewIndexItem, + final BaseLink editIndexItem, + final ActionLink orderItemsLink) { + setHeading(new Label(gz("cms.ui.category.details"))); + + final ActionGroup group = new ActionGroup(); + setBody(group); + + group.setSubject(new Properties()); + + group.addAction(new EditVisible(editLink), ActionGroup.EDIT); + group.addAction(new EditVisible(orderItemsLink)); + group.addAction(new EditVisible(indexLink)); + group.addAction(new EditVisible(viewIndexItem)); + group.addAction(new EditVisible(editIndexItem)); + group.addAction(new AdminVisible(deleteLink), ActionGroup.DELETE); + } + + private class Properties extends PropertyList { + protected final java.util.List properties(final PageState state) { + final java.util.List props = super.properties(state); + final Category category = m_category.getCategory(state); + final ACSObject item = category.getDirectIndexObject(); + + String itemTitle = "None"; + + if (item != null) { + itemTitle = item.getDisplayName(); + } else if (!category.ignoreParentIndexItem() + && category.getParentCategoryCount() > 0) + { + Category ancestor = findParentCategoryWithNonInheritedIndexItem(category); + if (ancestor != null) { + if (ancestor.getIndexObject() != null) { + itemTitle = ancestor.getIndexObject().getDisplayName(); + } + itemTitle += " (Inherited from " + + ancestor.getDisplayName() + ")"; + } else { + // The complete hierarchy is set to inherit. + // Just leave the itemTitle as None. + } + } + + props.add(new Property(gz("cms.ui.name"), + category.getName(""))); + props.add(new Property(gz("cms.ui.description"), + category.getDescription(""))); + props.add(new Property(gz("cms.ui.category.url"), + category.getURL(""))); + props.add(new Property(gz("cms.ui.category.is_not_abstract"), + category.isAbstract() ? + gz("cms.ui.no") : + gz("cms.ui.yes"))); + props.add(new Property(gz("cms.ui.category.is_enabled"), + category.isEnabled("") ? + gz("cms.ui.yes") : + gz("cms.ui.no"))); + props.add(new Property(gz("cms.ui.category.index_item"), + itemTitle)); + + return props; + } + } + } + + // Loop over the parents and recurse up the hierarchy the find the first + // parent with an explicit index item ignoreParentIndexItem is true. + private Category findParentCategoryWithNonInheritedIndexItem(Category c) { + if (c.getParentCategoryCount() == 0) { + return null; + } + CategoryCollection parents = c.getParents(); + while (parents.next()) { + Category p = parents.getCategory(); + if (p.getDirectIndexObject() != null || p.ignoreParentIndexItem()) { + return p; + } + // Try the parents of this parent. + Category gp = findParentCategoryWithNonInheritedIndexItem(p); + if (gp != null) { + return gp; + } + } + return null; + } + + // Quasimodo: BEGIN + // CategoryLocalizationSection + private class CategoryLocalizationSection extends Section { + CategoryLocalizationSection(ActionLink addLink) { + setHeading(new Label(gz("cms.ui.category.localizations"))); + + final ActionGroup group = new ActionGroup(); + setBody(group); + + group.setSubject(new CategoryLocalizationTable(m_category, m_model)); + group.addAction(new AdminVisible(addLink), ActionGroup.ADD); + } + } + + private class SubcategorySection extends Section { + SubcategorySection(final ActionLink addLink) { + setHeading(new Label(gz("cms.ui.category.subcategories"))); + + final ActionGroup group = new ActionGroup(); + setBody(group); + + group.setSubject(new SubcategoryList(m_category, m_model)); + group.addAction(new AdminVisible(addLink), ActionGroup.ADD); + } + } + + private class LinkedCategorySection extends Section { + LinkedCategorySection(final ActionLink linkAddLink) { + setHeading(new Label(gz("cms.ui.category.linked"))); + + final ActionGroup group = new ActionGroup(); + setBody(group); + + group.setSubject(new CategoryLinks(m_category, m_model)); + group.addAction(new EditVisible(linkAddLink), ActionGroup.EDIT); + } + + public final boolean isVisible(final PageState state) { + return !m_category.getCategory(state).isRoot(); + } + } + + private class CategoryTemplateSection extends Section { + CategoryTemplateSection() { + setHeading(new Label(gz("cms.ui.category.templates"))); + + final ActionGroup group = new ActionGroup(); + setBody(group); + + group.setSubject(new CategoryTemplates(m_category)); + // XXX secvis + //group.addAction(link); + } + } + + private class PermissionsSection extends Section { + public boolean isVisible(PageState ps) { + Category cat = m_category.getCategory(ps); + return !cat.isRoot() && cat.canAdmin(); + } + + PermissionsSection() { + setHeading(new Label(gz("cms.ui.permissions"))); + + final ActionGroup group = new ActionGroup(); + setBody(group); + + PrivilegeDescriptor[] privs = new PrivilegeDescriptor[] { + PrivilegeDescriptor.EDIT, + Category.MAP_DESCRIPTOR, + PrivilegeDescriptor.DELETE, + PrivilegeDescriptor.ADMIN + }; + + HashMap privMap = new HashMap(); + privMap.put("edit", "Edit"); + privMap.put("delete", "Delete"); + privMap.put(Category.MAP_DESCRIPTOR.getName(), "Categorize Items"); + privMap.put("admin", "Admin"); + + final CMSPermissionsPane permPane = new CMSPermissionsPane + (privs, privMap, new ACSObjectSelectionModel(m_model)) { + public void showAdmin(PageState ps) { + Assert.exists(m_model.getSelectedKey(ps)); + + super.showAdmin(ps); + getAdminListingPanel().setVisible(ps, false); + } + }; + + final ActionLink restoreDefault = new ActionLink(new Label(gz( + "cms.ui.restore_default_permissions"))) { + public boolean isVisible(PageState ps) { + Category cat = m_category.getCategory(ps); + return PermissionService.getContext(cat) == null; + } + }; + + final ActionLink useCustom = new ActionLink(new Label(gz( + "cms.ui.use_custom_permissions"))) { + public boolean isVisible(PageState ps) { + Category cat = m_category.getCategory(ps); + return PermissionService.getContext(cat) != null; + } + }; + + ActionListener al = new ActionListener() { + public void actionPerformed(ActionEvent event) { + PageState state = event.getPageState(); + // if this is the root then we cannot revert to anything + // since there is not a parent + Category cat = m_category.getCategory(state); + if (!cat.canAdmin()) { + throw new com.arsdigita.cms.dispatcher.AccessDeniedException(); + } + DataObject context = PermissionService.getContext(cat); + if (context != null) { + PermissionService.clonePermissions(cat); + } else { + ACSObject parent; + try { + parent = cat.getDefaultParentCategory(); + } catch (CategoryNotFoundException ce) { + throw new IllegalStateException( + "link shouldn't exist for root categories"); + } + PermissionService.setContext(cat, parent); + + // revoke all direct permissions so category will only + // have inherited permissions + ObjectPermissionCollection perms = + PermissionService.getDirectGrantedPermissions( + cat.getOID()); + while (perms.next()) { + PermissionService.revokePermission( + new PermissionDescriptor( + perms.getPrivilege(), cat.getOID(), + perms.getGranteeOID())); + } + } + permPane.reset(state); + } + }; + + restoreDefault.addActionListener(al); + useCustom.addActionListener(al); + + SimpleContainer links = new SimpleContainer(); + links.add(restoreDefault); + links.add(useCustom); + + group.setSubject(permPane); + group.addAction(links); + + m_model.addChangeListener(new ChangeListener() { + public void stateChanged(ChangeEvent e) { + PageState ps = e.getPageState(); + } + }); + } + } + + private static class OrderItemsForm extends CMSForm { + + public OrderItemsForm(CategoryRequestLocal category) { + super("orderItems", new SimpleContainer()); + Label header = new Label(gz("cms.ui.category.categorized_objects")); + header.setFontWeight(Label.BOLD); + add(header); + add(new CategorizedObjectsList(category)); + + add(new Submit("Done")); + + } + + } + + /* + * This private class creates a link to the index item for a category. + */ + private class ViewItemLink extends Link { + ViewItemLink(Component c, String s) { + super(c,s); + } + + // Build the preview link. This uses a standard redirect link to find + // the content. The prepareURL method is called by the printwriter + protected String prepareURL(final PageState state, String location) { + + ContentItem indexItem = ((ContentBundle)(m_category.getCategory(state) + .getDirectIndexObject())) + .getPrimaryInstance(); + if(indexItem==null) { + return ""; + } else { + return "/redirect/?oid=" + URLEncoder.encode(indexItem.getOID().toString()); + } + } + + // We only show this link when an index item exists for this category + public boolean isVisible(PageState state) { + if (!super.isVisible(state)) { + return false; + } + ACSObject indexItem = m_category.getCategory(state).getDirectIndexObject(); + if(indexItem==null) { + return false; + } else { + return true; + } + } + }; + + private class EditItemLink extends Link { + EditItemLink(Component c, String s) { + super(c,s); + } + + /** + * Build the preview link. This is based on code in the + * ContentSoonExpiredPane class. The prepareURL method of the parent + * is overwritten. This method is called by the printwriter + */ + @Override + protected String prepareURL(final PageState state, String location) { + boolean canEdit = false; + ContentItem indexItem = ((ContentBundle)(m_category.getCategory(state) + .getDirectIndexObject())) + .getPrimaryInstance(); + if(indexItem==null) { + return ""; + } + if (!isItemEditable(indexItem,state)) { + return ""; + } else { + BigDecimal draftID = indexItem.getDraftVersion().getID(); + return "item.jsp?item_id=" + draftID + "&set_tab=" + + ContentItemPage.AUTHORING_TAB; + } + } + + /** + * We only show this link when an index item exists for this category + * and the user is allowed to edit this item. + * @param state + * @return + */ + @Override + public boolean isVisible(PageState state) { + if (!super.isVisible(state)) { + return false; + } + ACSObject indexItem = m_category.getCategory(state).getDirectIndexObject(); + if(indexItem==null) { + return false; + } else { + return isItemEditable((ContentItem)indexItem,state); + } + } + + /** + * This method checks whether a usern is allowed to edit a + * particular item. + * + * @param item + * @param state + * @return + */ + private boolean isItemEditable(ContentItem item, PageState state) { + BigDecimal id = item.getID(); + User user = Web.getContext().getUser(); + ContentItem ci = new ContentItem(new OID(ContentItem.class.getName(), + Integer.parseInt(id.toString()))); + Iterator permissions = PermissionService.getImpliedPrivileges( + ci.getOID(), user.getOID()); + while (permissions.hasNext()) { + PrivilegeDescriptor permission = (PrivilegeDescriptor)permissions.next(); + if (permission.equals(PrivilegeDescriptor.ADMIN) || + permission.equals(PrivilegeDescriptor.EDIT)) { + return true; + } + } + return false; + } + }; +} diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryItemsBrowser.java b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryItemsBrowser.java index 7e228ff7f..d12060e81 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryItemsBrowser.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryItemsBrowser.java @@ -52,11 +52,10 @@ import com.arsdigita.util.Assert; * * WARNING: The code to actually list the items is currently a travesty. * It needs to be re-written from scratch, by using custom data queries. + * @version $Id: CategoryItemsBrowser.java 754 2005-09-02 13:26:17Z sskracic $ */ public class CategoryItemsBrowser extends Grid { - public static final String versionId = "$Id: CategoryItemsBrowser.java 754 2005-09-02 13:26:17Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static final org.apache.log4j.Logger s_log = org.apache.log4j.Logger.getLogger(CategoryItemsBrowser.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryIteratorListModel.java b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryIteratorListModel.java index 63df0a562..46d772995 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryIteratorListModel.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryIteratorListModel.java @@ -25,11 +25,10 @@ import java.util.Iterator; /** * A {@link ListModel} that iterates over categories via an iterator + * @version $Id: CategoryIteratorListModel.java 287 2005-02-22 00:29:02Z sskracic $ */ public class CategoryIteratorListModel implements ListModel { - public static final String versionId = "$Id: CategoryIteratorListModel.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private Iterator m_iter; private Category m_cat; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationAddForm.java b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationAddForm.java index bb94a55c9..873a69a9d 100644 --- a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationAddForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationAddForm.java @@ -42,14 +42,10 @@ import org.apache.log4j.Logger; * in order to present forms for managing the multi-language categories. * * @author Sören Bernstein (quasimodo) quasi@zes.uni-bremen.de + * @version $Id: CategoryLocalizationAddForm.java 287 2005-02-22 00:29:02Z sskracic $ */ public class CategoryLocalizationAddForm extends CategoryLocalizationForm { - public static final String versionId = - "$Id: CategoryLocalizationAddForm.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; - private static final Logger s_log = Logger.getLogger (CategoryAddForm.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationEditForm.java b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationEditForm.java index 58ce135f6..cbbc273f0 100644 --- a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationEditForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationEditForm.java @@ -37,14 +37,10 @@ import org.apache.log4j.Logger; * in order to present forms for managing the multi-language categories. * * @author Sören Bernstein (quasimodo) quasi@zes.uni-bremen.de + * @version $Id: CategoryLocalizationEditForm.java $ */ public class CategoryLocalizationEditForm extends CategoryLocalizationForm { - public static final String versionId = - "$Id: CategoryLocalizationEditForm.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; - private static final Logger s_log = Logger.getLogger (CategoryLocalizationEditForm.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationForm.java b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationForm.java index e2d1daf37..e0ee54ef8 100644 --- a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryLocalizationForm.java @@ -49,6 +49,7 @@ import com.arsdigita.xml.Element; * in order to present forms for managing the multi-language categories. * * @author Sören Bernstein (quasimodo) quasi@zes.uni-bremen.de + * @version $Id: $ */ public class CategoryLocalizationForm extends BaseForm { diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryRequestLocal.java b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryRequestLocal.java index a617d44b2..c843dc971 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryRequestLocal.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryRequestLocal.java @@ -24,10 +24,6 @@ import com.arsdigita.categorization.Category; import org.apache.log4j.Logger; public class CategoryRequestLocal extends RequestLocal { - public static final String versionId = - "$Id: CategoryRequestLocal.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (CategoryRequestLocal.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryTreeModelBuilder.java b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryTreeModelBuilder.java index b1cc2db95..ac73f02e3 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryTreeModelBuilder.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryTreeModelBuilder.java @@ -33,7 +33,7 @@ import com.arsdigita.util.LockableImpl; * Lists category tree. * * @author Tri Tran (tri@arsdigita.com) - * @version $Id: CategoryTreeModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: CategoryTreeModelBuilder.java 1942 2009-05-29 07:53:23Z terry $ */ class CategoryTreeModelBuilder extends LockableImpl implements TreeModelBuilder { @@ -49,10 +49,6 @@ class CategoryTreeModelBuilder extends LockableImpl m_contextModel = contextModel; } - public static final String versionId = - "$Id: CategoryTreeModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; public final TreeModel makeModel(final Tree tree, final PageState state) { final ContentSection section = CMS.getContext().getContentSection(); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryUseContextModelBuilder.java b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryUseContextModelBuilder.java index 80cb3bb1f..dcc7e32a0 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryUseContextModelBuilder.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/category/CategoryUseContextModelBuilder.java @@ -33,13 +33,9 @@ import org.apache.log4j.Logger; * content section. * * @author Scott Seago - * @version $Id: CategoryUseContextModelBuilder.java 754 2005-09-02 13:26:17Z sskracic $ + * @version $Id: CategoryUseContextModelBuilder.java 1942 2009-05-29 07:53:23Z terry $ */ class CategoryUseContextModelBuilder extends AbstractListModelBuilder { - public static final String versionId = - "$Id: CategoryUseContextModelBuilder.java 754 2005-09-02 13:26:17Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; public static String DEFAULT_USE_CONTEXT = ""; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/OrderedCategorizedObjectsList.java b/ccm-cms/src/com/arsdigita/cms/ui/category/OrderedCategorizedObjectsList.java index 992ca8e65..e9c4158d6 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/category/OrderedCategorizedObjectsList.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/category/OrderedCategorizedObjectsList.java @@ -48,11 +48,10 @@ import javax.servlet.ServletException; * * @author Randy Graebner (randyg@alum.mit.edu) * @version $Revision: #11 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: OrderedCategorizedObjectsList.java 287 2005-02-22 00:29:02Z sskracic $ */ public class OrderedCategorizedObjectsList extends CategorizedObjectsList { - public static final String versionId = "$Id: OrderedCategorizedObjectsList.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static final org.apache.log4j.Logger s_log = org.apache.log4j.Logger.getLogger(OrderedCategorizedObjectsList.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/SortableCategoryList.java b/ccm-cms/src/com/arsdigita/cms/ui/category/SortableCategoryList.java index be711c435..9c065c317 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/category/SortableCategoryList.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/category/SortableCategoryList.java @@ -49,13 +49,9 @@ import java.math.BigDecimal; * This clearly is not a good setup. * * @author Randy Graebner (randyg@alum.mit.edu) - * @version $Id: SortableCategoryList.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: SortableCategoryList.java 1942 2009-05-29 07:53:23Z terry $ */ abstract class SortableCategoryList extends SortableList { - public static final String versionId = - "$Id: SortableCategoryList.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (SortableCategoryList.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderAddForm.java b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderAddForm.java index ac02214a5..e5aa1b5d2 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderAddForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderAddForm.java @@ -27,10 +27,6 @@ import com.arsdigita.cms.Folder; import org.apache.log4j.Logger; class FolderAddForm extends FolderBaseForm { - public static final String versionId = - "$Id: FolderAddForm.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static Logger s_log = Logger.getLogger(FolderAddForm.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderAdminPane.java b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderAdminPane.java index 1437bce53..15d0e79f3 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderAdminPane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderAdminPane.java @@ -43,13 +43,9 @@ import java.math.BigDecimal; * manipulator on the right. * * @author Justin Ross <jross@redhat.com> - * @version $Id: FolderAdminPane.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: FolderAdminPane.java 1942 2009-05-29 07:53:23Z terry $ */ public class FolderAdminPane extends SelectionPanel { - public static final String versionId = - "$Id: FolderAdminPane.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (FolderAdminPane.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderBaseForm.java b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderBaseForm.java index f61ad2378..8e6979ff6 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderBaseForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderBaseForm.java @@ -37,13 +37,9 @@ import org.apache.log4j.Logger; * folders. * * @author Jon Orris <jorris@redhat.com> - * @version $Id: FolderBaseForm.java 543 2005-06-03 23:03:45Z sskracic $ + * @version $Id: FolderBaseForm.java 1951 2009-06-30 04:35:04Z terry $ */ abstract class FolderBaseForm extends CMSForm { - public static final String versionId = - "$Id: FolderBaseForm.java 543 2005-06-03 23:03:45Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static Logger s_log = Logger.getLogger(FolderBaseForm.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderBrowser.java b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderBrowser.java index 9b7c7178a..a94db7224 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderBrowser.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderBrowser.java @@ -76,7 +76,7 @@ import javax.servlet.ServletException; * separate item selection model is updated. * * @author David Lutterkort - * @version $Id: FolderBrowser.java 1540 2007-03-26 20:44:49Z apevec $ + * @version $Id: FolderBrowser.java 2017 2009-10-04 09:03:45Z pboy $ */ public class FolderBrowser extends Table { diff --git a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderCreator.java b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderCreator.java index e81fadf32..59700eae7 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderCreator.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderCreator.java @@ -34,8 +34,6 @@ import java.math.BigDecimal; public class FolderCreator extends FolderForm { - public static final String versionId = "$Id: FolderCreator.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static Logger s_log = Logger.getLogger(FolderCreator.class.getName()); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderEditForm.java b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderEditForm.java index 7d3f612e8..a8db6350a 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderEditForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderEditForm.java @@ -28,10 +28,6 @@ import com.arsdigita.cms.Folder; import org.apache.log4j.Logger; class FolderEditForm extends FolderBaseForm { - public static final String versionId = - "$Id: FolderEditForm.java 774 2005-09-12 14:53:47Z fabrice $" + - "$Author: fabrice $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static Logger s_log = Logger.getLogger(FolderEditForm.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderEditor.java b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderEditor.java index 05a52f0ab..afdf6aea9 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderEditor.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderEditor.java @@ -32,10 +32,10 @@ import com.arsdigita.cms.Folder; * @author Jon Orris (jorris@arsdigita.com) * * @version $Revision: #9 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: FolderEditor.java 287 2005-02-22 00:29:02Z sskracic $ */ public class FolderEditor extends FolderForm { - public static final String versionId = "$Id: FolderEditor.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; public FolderEditor(String name, FolderSelectionModel folder) { super(name, folder); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderForm.java b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderForm.java index 04cc60dc1..4d8c9ef64 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderForm.java @@ -33,11 +33,10 @@ import com.arsdigita.util.Assert; * @author Jon Orris (jorris@arsdigita.com) * * @version $Revision #1 $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: FolderForm.java 774 2005-09-12 14:53:47Z fabrice $ */ public abstract class FolderForm extends BasicItemForm{ - public static final String versionId = "$Id: FolderForm.java 774 2005-09-12 14:53:47Z fabrice $ by $Author: fabrice $, $DateTime: 2004/08/17 23:15:09 $"; - FolderSelectionModel m_currentFolder; /** diff --git a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderItemPane.java b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderItemPane.java index de69caf25..e333ab71a 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderItemPane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderItemPane.java @@ -73,14 +73,11 @@ import java.util.Map; 2 * * @author Stanislav Freidin * @version $Revision: #6 $ $DateTime: 2004/08/17 23:15:09 $ + * @version Id: FolderItemPane.java 287 2005-02-22 00:29:02Z sskracic $ */ public class FolderItemPane extends SegmentedPanel implements FormProcessListener, ChangeListener, FormSubmissionListener, Resettable, ActionListener { - public static final String versionId = - "$Id: FolderItemPane.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final String CONTENT_TYPE_ID = "ct"; private static final String CMS_PRIVILEGES = "com.arsdigita.cms.getPrivileges"; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderManipulator.java b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderManipulator.java index 5d736fc6c..ce2eb9769 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderManipulator.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderManipulator.java @@ -87,14 +87,12 @@ import java.util.Arrays; * (move/copy/delete). * * @author David Lutterkort - * @version $Id: FolderManipulator.java 754 2005-09-02 13:26:17Z sskracic $ + * @version $Id: FolderManipulator.java 1940 2009-05-29 07:15:05Z terry $ */ public class FolderManipulator extends SimpleContainer implements FormProcessListener, FormValidationListener, FormSubmissionListener, Resettable { - public static final String versionId = "$Id: FolderManipulator.java 754 2005-09-02 13:26:17Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static Logger s_log = Logger.getLogger(FolderManipulator.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderRequestLocal.java b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderRequestLocal.java index e67e873d5..40cfe32de 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderRequestLocal.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderRequestLocal.java @@ -27,10 +27,6 @@ import org.apache.log4j.Logger; import java.math.BigDecimal; public class FolderRequestLocal extends ACSObjectRequestLocal { - public static final String versionId = - "$Id: FolderRequestLocal.java 754 2005-09-02 13:26:17Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (FolderRequestLocal.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderSelectionModel.java b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderSelectionModel.java index 3e24feea0..77cdaf8dd 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderSelectionModel.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderSelectionModel.java @@ -34,13 +34,11 @@ import java.math.BigDecimal; * com.arsdigita.cms.Folder}. * * @author David Lutterkort - * @version $Id: FolderSelectionModel.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: FolderSelectionModel.java 1940 2009-05-29 07:15:05Z terry $ */ public class FolderSelectionModel extends ItemSelectionModel { - public static final String versionId = "$Id: FolderSelectionModel.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public FolderSelectionModel(String name) { super(Folder.BASE_DATA_OBJECT_TYPE, Folder.BASE_DATA_OBJECT_TYPE, name); } diff --git a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderTree.java b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderTree.java index 136aa5c62..df6599e5f 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderTree.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderTree.java @@ -22,8 +22,6 @@ import com.arsdigita.bebop.Tree; public class FolderTree extends Tree { - public static final String versionId = "$Id: FolderTree.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public FolderTree(FolderSelectionModel folderSel) { super(new FolderTreeModelBuilder()); setSelectionModel(folderSel); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderTreeModelBuilder.java b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderTreeModelBuilder.java index e871a6978..ca72143f3 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderTreeModelBuilder.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderTreeModelBuilder.java @@ -54,7 +54,7 @@ import org.apache.log4j.Logger; * @author Tri Tran * @author David Lutterkort * - * @version $Id: FolderTreeModelBuilder.java 1313 2006-09-06 12:40:30Z sskracic $ + * @version $Id: FolderTreeModelBuilder.java 1940 2009-05-29 07:15:05Z terry $ */ public class FolderTreeModelBuilder extends LockableImpl @@ -62,8 +62,6 @@ public class FolderTreeModelBuilder extends LockableImpl private static final Logger s_log = Logger.getLogger(FolderTreeModelBuilder.class); - public static final String versionId = "$Id: FolderTreeModelBuilder.java 1313 2006-09-06 12:40:30Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private PrivilegeDescriptor TREE_DESCRIPTOR = SecurityManager.CMS_PREVIEW_ITEM_DESCRIPTOR; /** diff --git a/ccm-cms/src/com/arsdigita/cms/ui/folder/ItemPath.java b/ccm-cms/src/com/arsdigita/cms/ui/folder/ItemPath.java index 4d56610d9..01057a6aa 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/folder/ItemPath.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/folder/ItemPath.java @@ -30,11 +30,10 @@ import com.arsdigita.util.LockableImpl; * to the item itself. * * @author David Lutterkort - * @version $Id: ItemPath.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ItemPath.java 1940 2009-05-29 07:15:05Z terry $ */ public class ItemPath extends List { - public static final String versionId = "$Id: ItemPath.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; public ItemPath(ItemSelectionModel folderSel) { super(new ListModelBuilder(folderSel)); setAttribute("type", "item-path"); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/item/ContentItemRequestLocal.java b/ccm-cms/src/com/arsdigita/cms/ui/item/ContentItemRequestLocal.java index c9fd1eb9e..e45bfd599 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/item/ContentItemRequestLocal.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/item/ContentItemRequestLocal.java @@ -24,11 +24,11 @@ import com.arsdigita.cms.ContentItem; import com.arsdigita.util.Assert; import org.apache.log4j.Logger; +/** + * + * @version $Id: ContentItemRequestLocal.java 287 2005-02-22 00:29:02Z sskracic $ + */ public abstract class ContentItemRequestLocal extends RequestLocal { - public static final String versionId = - "$Id: ContentItemRequestLocal.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (ContentItemRequestLocal.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/item/ItemLanguages.java b/ccm-cms/src/com/arsdigita/cms/ui/item/ItemLanguages.java index f3cf8e03f..5ae4634e6 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/item/ItemLanguages.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/item/ItemLanguages.java @@ -63,12 +63,9 @@ import java.util.TooManyListenersException; * Displays the "Language instances" pane, with all the language instances in the Bundle. * * @author Alan Pevec (apevec@redhat.com) + * @version $Id: ItemLanguages.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ItemLanguages extends LayoutPanel { - public static final String versionId = - "$Id: ItemLanguages.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger(ItemLanguages.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/item/ItemWorkflowRequestLocal.java b/ccm-cms/src/com/arsdigita/cms/ui/item/ItemWorkflowRequestLocal.java index b4027f9f2..7f43d87c0 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/item/ItemWorkflowRequestLocal.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/item/ItemWorkflowRequestLocal.java @@ -25,11 +25,11 @@ import com.arsdigita.cms.ui.workflow.WorkflowRequestLocal; import com.arsdigita.workflow.simple.Workflow; import org.apache.log4j.Logger; +/** + * + * @version $Id: ItemWorkflowRequestLocal.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class ItemWorkflowRequestLocal extends WorkflowRequestLocal { - public static final String versionId = - "$Id: ItemWorkflowRequestLocal.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (ItemWorkflowRequestLocal.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/item/Summary.java b/ccm-cms/src/com/arsdigita/cms/ui/item/Summary.java index 28fffdd89..41c440fe9 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/item/Summary.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/item/Summary.java @@ -75,12 +75,10 @@ import com.arsdigita.xml.Element; * to convert content items into XML.

* * @author Michael Pih (pihman@arsdigita.com) - * @version $Id: Summary.java 1295 2006-08-25 18:04:11Z apevec $ + * @version $Id: Summary.java 1940 2009-05-29 07:15:05Z terry $ */ public class Summary extends CMSContainer { - public static final String versionId = "$Id: Summary.java 1295 2006-08-25 18:04:11Z apevec $ by $Author: apevec $, $DateTime: 2004/08/17 23:15:09 $"; - private static final String SUMMARY = "itemAdminSummary"; private static final String RESTART_WORKFLOW = "restartWorkflow"; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/AddPhaseForm.java b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/AddPhaseForm.java index 0725e2f96..a46ff1970 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/AddPhaseForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/AddPhaseForm.java @@ -62,12 +62,9 @@ import java.sql.SQLException; * @author Xixi D'Moon * @author Michael Pih * @version $Revision: #10 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: AddPhaseForm.java 287 2005-02-22 00:29:02Z sskracic $ */ class AddPhaseForm extends CMSForm { - public static final String versionId = - "$Id: AddPhaseForm.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private final static String PHASE_ID = "id"; private final static String LABEL = "label"; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/BaseLifecycleForm.java b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/BaseLifecycleForm.java index 8838e791c..5b324bb35 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/BaseLifecycleForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/BaseLifecycleForm.java @@ -38,13 +38,9 @@ import org.apache.log4j.Logger; /** * @author Justin Ross <jross@redhat.com> - * @version $Id: BaseLifecycleForm.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: BaseLifecycleForm.java 1942 2009-05-29 07:53:23Z terry $ */ class BaseLifecycleForm extends BaseForm { - public static final String versionId = - "$Id: BaseLifecycleForm.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (BaseLifecycleForm.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/DeletePhaseForm.java b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/DeletePhaseForm.java index f982a1113..88e6cf2df 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/DeletePhaseForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/DeletePhaseForm.java @@ -42,14 +42,10 @@ import java.math.BigDecimal; * This class handles the deleting of a phase definition. * * @author Jack Chung (flattop@arsdigita.com) - * @version $Revision: #7 $ $Date: 2004/08/17 $ + * @version $Id: DeletePhaseForm.java 287 2005-02-22 00:29:02Z sskracic $ */ class DeletePhaseForm extends CMSForm implements FormProcessListener, FormInitListener { - public static final String versionId = - "$Id: DeletePhaseForm.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private final PhaseRequestLocal m_phase; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/EditPhaseForm.java b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/EditPhaseForm.java index bf90cf7a7..c74d854a2 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/EditPhaseForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/EditPhaseForm.java @@ -52,13 +52,9 @@ import com.arsdigita.globalization.GlobalizedMessage; * @author Jack Chung * @author Xixi D'Moon * @author Michael Pih - * @version $Revision: #9 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: EditPhaseForm.java 287 2005-02-22 00:29:02Z sskracic $ */ class EditPhaseForm extends CMSForm { - public static final String versionId = - "$Id: EditPhaseForm.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private final static String PHASE_ID = "id"; private final static String LABEL = "label"; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleAdminPane.java b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleAdminPane.java index 95cb681ab..fc579d851 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleAdminPane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleAdminPane.java @@ -35,13 +35,9 @@ import org.apache.log4j.Logger; * @author Michael Pih * @author Jack Chung * @author Justin Ross <jross@redhat.com> - * @version $Id: ItemLifecycleAdminPane.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ItemLifecycleAdminPane.java 1942 2009-05-29 07:53:23Z terry $ */ public class ItemLifecycleAdminPane extends BaseItemPane { - public static final String versionId = - "$Id: ItemLifecycleAdminPane.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (ItemLifecycleAdminPane.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleItemPane.java b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleItemPane.java index 5d3a0124b..7526ea85f 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleItemPane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleItemPane.java @@ -60,13 +60,9 @@ import com.arsdigita.xml.Element; * @author Jack Chung * @author Xixi D'Moon <xdmoon@redhat.com> * @author Justin Ross <jross@redhat.com> - * @version $Id: ItemLifecycleItemPane.java 1563 2007-04-18 15:58:17Z apevec $ + * @version $Id: ItemLifecycleItemPane.java 1942 2009-05-29 07:53:23Z terry $ */ class ItemLifecycleItemPane extends BaseItemPane { - public static final String versionId = - "$Id: ItemLifecycleItemPane.java 1563 2007-04-18 15:58:17Z apevec $" + - "$Author: apevec $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (ItemLifecycleItemPane.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleSelectForm.java b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleSelectForm.java index d216a6b27..03b8c91e0 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleSelectForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleSelectForm.java @@ -88,10 +88,6 @@ import com.arsdigita.workflow.simple.WorkflowTemplate; * @version $Id: ItemLifecycleSelectForm.java 1643 2007-09-17 14:19:06Z chrisg23 $ */ class ItemLifecycleSelectForm extends BaseForm { - public static final String versionId = - "$Id: ItemLifecycleSelectForm.java 1643 2007-09-17 14:19:06Z chrisg23 $" + - "$Author: chrisg23 $" + - "$DateTime: $"; private static final Logger s_log = Logger.getLogger (ItemLifecycleSelectForm.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/ItemPhaseTableModelBuilder.java b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/ItemPhaseTableModelBuilder.java index 22797daff..294496e05 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/ItemPhaseTableModelBuilder.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/ItemPhaseTableModelBuilder.java @@ -33,13 +33,9 @@ import java.text.DateFormat; * @author Xixi D'Moon <xdmoon@arsdigita.com> * @author Michael Pih * @author Justin Ross <jross@redhat.com> - * @version $Id: ItemPhaseTableModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ItemPhaseTableModelBuilder.java 1942 2009-05-29 07:53:23Z terry $ */ class ItemPhaseTableModelBuilder extends AbstractTableModelBuilder { - public static final String versionId = - "$Id: ItemPhaseTableModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private final LifecycleRequestLocal m_lifecycle; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleAddForm.java b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleAddForm.java index 9c5a9e8d8..008c470f7 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleAddForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleAddForm.java @@ -33,13 +33,9 @@ import org.apache.log4j.Logger; * @author Jack Chung * @author Xixi D'Moon <xdmoon@redhat.com> * @author Justin Ross <jross@redhat.com> - * @version $Id: LifecycleAddForm.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: LifecycleAddForm.java 1942 2009-05-29 07:53:23Z terry $ */ class LifecycleAddForm extends BaseLifecycleForm { - public static final String versionId = - "$Id: LifecycleAddForm.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (LifecycleAddForm.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleAdminContainer.java b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleAdminContainer.java index d1834edf2..be126145f 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleAdminContainer.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleAdminContainer.java @@ -35,8 +35,6 @@ import com.arsdigita.toolbox.ui.SecurityContainer; */ public class LifecycleAdminContainer extends SecurityContainer { - public static final String versionId = "$Id: LifecycleAdminContainer.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - /** * This default constructor should be followed by calls to diff --git a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleAdminPane.java b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleAdminPane.java index b527fae61..a375e8f39 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleAdminPane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleAdminPane.java @@ -41,13 +41,9 @@ import java.math.BigDecimal; * @author Michael Pih * @author Jack Chung * @author Justin Ross <jross@redhat.com> - * @version $Id: LifecycleAdminPane.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: LifecycleAdminPane.java 1942 2009-05-29 07:53:23Z terry $ */ public class LifecycleAdminPane extends BaseAdminPane { - public static final String versionId = - "$Id: LifecycleAdminPane.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static Logger s_log = Logger.getLogger(LifecycleAdminPane.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleDefinitionRequestLocal.java b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleDefinitionRequestLocal.java index c45c545fd..bd3a5e73a 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleDefinitionRequestLocal.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleDefinitionRequestLocal.java @@ -24,10 +24,6 @@ import com.arsdigita.cms.lifecycle.LifecycleDefinition; import org.apache.log4j.Logger; public abstract class LifecycleDefinitionRequestLocal extends RequestLocal { - public static final String versionId = - "$Id: LifecycleDefinitionRequestLocal.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (LifecycleDefinitionRequestLocal.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleEditForm.java b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleEditForm.java index e6ac8f985..1ae76b0c0 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleEditForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleEditForm.java @@ -33,13 +33,9 @@ import org.apache.log4j.Logger; * @author Jack Chung * @author Xixi D'Moon <xdmoon@redhat.com> * @author Justin Ross <jross@redhat.com> - * @version $Id: LifecycleEditForm.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: LifecycleEditForm.java 1942 2009-05-29 07:53:23Z terry $ */ class LifecycleEditForm extends BaseLifecycleForm { - public static final String versionId = - "$Id: LifecycleEditForm.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (LifecycleEditForm.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleItemPane.java b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleItemPane.java index 59f95262a..76237a549 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleItemPane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleItemPane.java @@ -50,13 +50,9 @@ import org.apache.log4j.Logger; * @author Jack Chung * @author Xixi D'Moon <xdmoon@redhat.com> * @author Justin Ross <jross@redhat.com> - * @version $Id: LifecycleItemPane.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: LifecycleItemPane.java 1942 2009-05-29 07:53:23Z terry $ */ class LifecycleItemPane extends BaseItemPane { - public static final String versionId = - "$Id: LifecycleItemPane.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (LifecycleItemPane.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleListModelBuilder.java b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleListModelBuilder.java index 2bfe6c2f2..9ea43f2dd 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleListModelBuilder.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleListModelBuilder.java @@ -37,14 +37,10 @@ import java.util.NoSuchElementException; * * @author Michael Pih (pihman@arsdigita.com) * @author Jack Chung (flattop@arsdigita.com) - * @version $Revision: #6 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: LifecycleListModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ */ public final class LifecycleListModelBuilder extends LockableImpl implements ListModelBuilder { - public static final String versionId = - "$Id: LifecycleListModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; public final ListModel makeModel(final List l, final PageState state) { return new Model(state); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleRequestLocal.java b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleRequestLocal.java index baee01973..41fe7d6e2 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleRequestLocal.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/LifecycleRequestLocal.java @@ -24,10 +24,6 @@ import com.arsdigita.cms.lifecycle.Lifecycle; import org.apache.log4j.Logger; public abstract class LifecycleRequestLocal extends RequestLocal { - public static final String versionId = - "$Id: LifecycleRequestLocal.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (LifecycleRequestLocal.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/PhaseRequestLocal.java b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/PhaseRequestLocal.java index 2e221cee0..4c62b1608 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/PhaseRequestLocal.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/lifecycle/PhaseRequestLocal.java @@ -24,10 +24,6 @@ import com.arsdigita.cms.lifecycle.PhaseDefinition; import org.apache.log4j.Logger; public abstract class PhaseRequestLocal extends RequestLocal { - public static final String versionId = - "$Id: PhaseRequestLocal.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (PhaseRequestLocal.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/permissions/CMSUserObjectStruct.java b/ccm-cms/src/com/arsdigita/cms/ui/permissions/CMSUserObjectStruct.java index f891c7fe5..421c98895 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/permissions/CMSUserObjectStruct.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/permissions/CMSUserObjectStruct.java @@ -42,13 +42,9 @@ import java.math.BigDecimal; * the party_id and the corresponding entity. * * @author Stefan Deusch (sdeusch@arsdigita.com) - * @version $id$ + * @version $Id: CMSUserObjectStruct.java 287 2005-02-22 00:29:02Z sskracic $ */ class CMSUserObjectStruct implements CMSPermissionsConstants { - public static final String versionId = - "$Id: CMSUserObjectStruct.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (CMSUserObjectStruct.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/permissions/ObjectAddAdmin.java b/ccm-cms/src/com/arsdigita/cms/ui/permissions/ObjectAddAdmin.java index 27503420f..b4476abd6 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/permissions/ObjectAddAdmin.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/permissions/ObjectAddAdmin.java @@ -49,12 +49,10 @@ import java.math.BigDecimal; * * @author Michael Pih (pihman@arsdigita.com) * @author Uday Mathur (umathur@arsdigita.com) - * @version $Revision: #9 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: ObjectAddAdmin.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ObjectAddAdmin extends UserAddForm { - public static final String versionId = "$Id: ObjectAddAdmin.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private ACSObjectSelectionModel m_object; private static final String NAME_FILTER = "upper(firstName || lastName || email) like '%' || upper(:search) || '%'"; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/permissions/ObjectAddSearchAdmin.java b/ccm-cms/src/com/arsdigita/cms/ui/permissions/ObjectAddSearchAdmin.java index e87db1677..681d8993d 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/permissions/ObjectAddSearchAdmin.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/permissions/ObjectAddSearchAdmin.java @@ -35,12 +35,10 @@ import com.arsdigita.xml.Element; * them to a staff role for the content section.

* * @author Michael Pih (pihman@arsdigita.com) - * @version $Revision: #9 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: ObjectAddSearchAdmin.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ObjectAddSearchAdmin extends SimpleContainer { - public static final String versionId = "$Id: ObjectAddSearchAdmin.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private ACSObjectSelectionModel m_object; private UserSearchForm m_searchForm; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/portlet/TaskPortletRenderer.java b/ccm-cms/src/com/arsdigita/cms/ui/portlet/TaskPortletRenderer.java index bbc4a7eb1..538337364 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/portlet/TaskPortletRenderer.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/portlet/TaskPortletRenderer.java @@ -1,15 +1,15 @@ /* * Copyright (C) 2003-2004 Red Hat Inc. All Rights Reserved. * - * The contents of this file are subject to the CCM Public - * License (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the - * License at http://www.redhat.com/licenses/ccmpl.html. - * - * Software distributed under the License is distributed on an - * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express - * or implied. See the License for the specific language - * governing rights and limitations under the License. + * The contents of this file are subject to the CCM Public + * License (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the + * License at http://www.redhat.com/licenses/ccmpl.html. + * + * Software distributed under the License is distributed on an + * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express + * or implied. See the License for the specific language + * governing rights and limitations under the License. * */ package com.arsdigita.cms.ui.portlet; @@ -27,7 +27,7 @@ import com.arsdigita.cms.dispatcher.Utilities; import com.arsdigita.cms.portlet.TaskPortlet; import com.arsdigita.cms.ui.ContentItemPage; import com.arsdigita.cms.util.GlobalizationUtil; -import com.arsdigita.cms.workflow.CMSEngine; +import com.arsdigita.cms.workflow.CMSEngine; import com.arsdigita.cms.workflow.CMSTask; import com.arsdigita.kernel.User; import com.arsdigita.web.URL; @@ -39,7 +39,7 @@ import org.apache.log4j.Logger; import java.util.ArrayList; import java.util.Date; import java.util.Iterator; -import java.util.List; +import java.util.List; /** * @@ -47,13 +47,9 @@ import java.util.List; * * @author Richard Li * @author Jim Parsons - * @version $Id: TaskPortletRenderer.java 1280 2006-07-27 09:12:09Z cgyg9330 $ + * @version $Id: TaskPortletRenderer.java 1280 2006-07-27 09:12:09Z cgyg9330 $ */ public class TaskPortletRenderer extends AbstractPortletRenderer { - public static final String versionId = - "$Id: TaskPortletRenderer.java 1280 2006-07-27 09:12:09Z cgyg9330 $" + - "$Author: cgyg9330 $" + - "$DateTime: 2004/04/07 16:07:11 $"; private static final Logger s_log = Logger.getLogger (TaskPortletRenderer.class); @@ -100,7 +96,7 @@ public class TaskPortletRenderer extends AbstractPortletRenderer { return; } - List alist = Engine.getInstance(CMSEngine.CMS_ENGINE_TYPE).getEnabledTasks(currentUser); + List alist = Engine.getInstance(CMSEngine.CMS_ENGINE_TYPE).getEnabledTasks(currentUser); Iterator it = alist.iterator(); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/report/ReportListModel.java b/ccm-cms/src/com/arsdigita/cms/ui/report/ReportListModel.java index 6c2719f39..ebcca8a84 100644 --- a/ccm-cms/src/com/arsdigita/cms/ui/report/ReportListModel.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/report/ReportListModel.java @@ -23,7 +23,7 @@ import java.util.List; import com.arsdigita.bebop.list.ListModel; import com.arsdigita.util.Assert; -/** +/** * ListModel for Reports. * * @author thomas-buckel diff --git a/ccm-cms/src/com/arsdigita/cms/ui/revision/DifferencePane.java b/ccm-cms/src/com/arsdigita/cms/ui/revision/DifferencePane.java index b5284017a..77d6cc290 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/revision/DifferencePane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/revision/DifferencePane.java @@ -42,11 +42,11 @@ import com.arsdigita.versioning.Difference; import com.arsdigita.versioning.Versions; import org.apache.log4j.Logger; +/** + * + * @version $Id: DifferencePane.java 777 2005-09-12 14:55:15Z fabrice $ + */ final class DifferencePane extends BaseItemPane { - public static final String versionId = - "$Id: DifferencePane.java 777 2005-09-12 14:55:15Z fabrice $" + - "$Author: fabrice $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger(DifferencePane.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/revision/ItemRevisionAdminPane.java b/ccm-cms/src/com/arsdigita/cms/ui/revision/ItemRevisionAdminPane.java index 14a9a51eb..b965e1a0a 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/revision/ItemRevisionAdminPane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/revision/ItemRevisionAdminPane.java @@ -52,11 +52,11 @@ import com.arsdigita.versioning.Versions; import java.math.BigInteger; +/** + * + * @version $Id: ItemRevisionAdminPane.java 287 2005-02-22 00:29:02Z sskracic $ + */ public final class ItemRevisionAdminPane extends BaseItemPane { - public static final String versionId = - "$Id: ItemRevisionAdminPane.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private final ContentItemRequestLocal m_item; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/revision/OperationIterator.java b/ccm-cms/src/com/arsdigita/cms/ui/revision/OperationIterator.java index f6fe5b268..957677881 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/revision/OperationIterator.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/revision/OperationIterator.java @@ -33,13 +33,9 @@ import java.util.Iterator; /** * @author Justin Ross <jross@redhat.com> - * @version $Id: OperationIterator.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: OperationIterator.java 1942 2009-05-29 07:53:23Z terry $ */ class OperationIterator { - public static final String versionId = - "$Id: OperationIterator.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (OperationIterator.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/revision/RevisionTableModelBuilder.java b/ccm-cms/src/com/arsdigita/cms/ui/revision/RevisionTableModelBuilder.java index 36779160f..42b31a8e9 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/revision/RevisionTableModelBuilder.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/revision/RevisionTableModelBuilder.java @@ -37,13 +37,9 @@ import org.apache.log4j.Logger; /** * @author Stanislav Freidin <sfreidin@redhat.com> * @author Justin Ross <jross@redhat.com> - * @version $Id: RevisionTableModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: RevisionTableModelBuilder.java 1942 2009-05-29 07:53:23Z terry $ */ class RevisionTableModelBuilder extends AbstractTableModelBuilder { - public static final String versionId = - "$Id: RevisionTableModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (RevisionTableModelBuilder.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/revision/TransactionRequestLocal.java b/ccm-cms/src/com/arsdigita/cms/ui/revision/TransactionRequestLocal.java index 5afcf1468..f56a7f2fd 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/revision/TransactionRequestLocal.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/revision/TransactionRequestLocal.java @@ -24,10 +24,6 @@ import com.arsdigita.versioning.Transaction; import org.apache.log4j.Logger; public abstract class TransactionRequestLocal extends RequestLocal { - public static final String versionId = - "$Id: TransactionRequestLocal.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (TransactionRequestLocal.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/role/AdminTableModelBuilder.java b/ccm-cms/src/com/arsdigita/cms/ui/role/AdminTableModelBuilder.java index c98663c71..e08016fb7 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/role/AdminTableModelBuilder.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/role/AdminTableModelBuilder.java @@ -39,10 +39,6 @@ import org.apache.log4j.Logger; * @version $Id: AdminTableModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ */ class AdminTableModelBuilder extends AbstractTableModelBuilder { - public static final String versionId = - "$Id: AdminTableModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (AdminTableModelBuilder.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/role/BaseRoleForm.java b/ccm-cms/src/com/arsdigita/cms/ui/role/BaseRoleForm.java index 99c957f25..23874eb80 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/role/BaseRoleForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/role/BaseRoleForm.java @@ -44,10 +44,6 @@ import java.util.TooManyListenersException; * @version $Id: BaseRoleForm.java 287 2005-02-22 00:29:02Z sskracic $ */ public class BaseRoleForm extends BaseForm { - public static final String versionId = - "$Id: BaseRoleForm.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger(BaseRoleForm.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/role/BaseRoleItemPane.java b/ccm-cms/src/com/arsdigita/cms/ui/role/BaseRoleItemPane.java index 216e4aab1..ad666469d 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/role/BaseRoleItemPane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/role/BaseRoleItemPane.java @@ -53,10 +53,6 @@ import java.math.BigDecimal; * @version $Id: BaseRoleItemPane.java 287 2005-02-22 00:29:02Z sskracic $ */ class BaseRoleItemPane extends BaseItemPane { - public static final String versionId = - "$Id: BaseRoleItemPane.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (BaseRoleItemPane.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/role/MemberTableModelBuilder.java b/ccm-cms/src/com/arsdigita/cms/ui/role/MemberTableModelBuilder.java index 05f26968f..5b7b3bcb1 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/role/MemberTableModelBuilder.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/role/MemberTableModelBuilder.java @@ -34,10 +34,6 @@ import org.apache.log4j.Logger; * @version $Id: MemberTableModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ */ class MemberTableModelBuilder extends AbstractTableModelBuilder { - public static final String versionId = - "$Id: MemberTableModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (MemberTableModelBuilder.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/role/RoleAddForm.java b/ccm-cms/src/com/arsdigita/cms/ui/role/RoleAddForm.java index 5f66703bf..af6e22b2e 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/role/RoleAddForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/role/RoleAddForm.java @@ -35,10 +35,6 @@ import org.apache.log4j.Logger; * @version $Id: RoleAddForm.java 287 2005-02-22 00:29:02Z sskracic $ */ final class RoleAddForm extends BaseRoleForm { - public static final String versionId = - "$Id: RoleAddForm.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger(RoleAddForm.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/role/RoleAdminAddForm.java b/ccm-cms/src/com/arsdigita/cms/ui/role/RoleAdminAddForm.java index 90543a313..b917bbdca 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/role/RoleAdminAddForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/role/RoleAdminAddForm.java @@ -49,10 +49,6 @@ import java.math.BigDecimal; * @version $Id: RoleAdminAddForm.java 287 2005-02-22 00:29:02Z sskracic $ */ class RoleAdminAddForm extends UserAddForm { - public static final String versionId = - "$Id: RoleAdminAddForm.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private final SingleSelectionModel m_roles; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/role/RoleAdminPane.java b/ccm-cms/src/com/arsdigita/cms/ui/role/RoleAdminPane.java index 290dd63be..a85df6ba5 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/role/RoleAdminPane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/role/RoleAdminPane.java @@ -50,10 +50,6 @@ import java.math.BigDecimal; * @version $Id: RoleAdminPane.java 287 2005-02-22 00:29:02Z sskracic $ */ public class RoleAdminPane extends BaseAdminPane { - public static final String versionId = - "$Id: RoleAdminPane.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger(RoleAdminPane.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/role/RoleEditForm.java b/ccm-cms/src/com/arsdigita/cms/ui/role/RoleEditForm.java index b92daf363..798941e8a 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/role/RoleEditForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/role/RoleEditForm.java @@ -33,10 +33,6 @@ import org.apache.log4j.Logger; * @version $Id: RoleEditForm.java 287 2005-02-22 00:29:02Z sskracic $ */ final class RoleEditForm extends BaseRoleForm { - public static final String versionId = - "$Id: RoleEditForm.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger(RoleEditForm.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/role/RoleFactory.java b/ccm-cms/src/com/arsdigita/cms/ui/role/RoleFactory.java index 4275979ae..c9f986ca2 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/role/RoleFactory.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/role/RoleFactory.java @@ -44,10 +44,6 @@ import java.util.List; * @version $Id: RoleFactory.java 287 2005-02-22 00:29:02Z sskracic $ */ public class RoleFactory { - public static final String versionId = - "$Id: RoleFactory.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; public final static String CMS_ROLE_PRIVILEGES = "com.arsdigita.cms.getRolePrivileges"; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/role/RolePartyAddForm.java b/ccm-cms/src/com/arsdigita/cms/ui/role/RolePartyAddForm.java index d48dc6310..b1fe2acf8 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/role/RolePartyAddForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/role/RolePartyAddForm.java @@ -47,9 +47,6 @@ import java.math.BigDecimal; * @version $Id: RolePartyAddForm.java 287 2005-02-22 00:29:02Z sskracic $ */ class RolePartyAddForm extends PartyAddForm { - public static final String versionId = - "$Id: RolePartyAddForm.java 287 2005-02-22 00:29:02Z sskracic $" + - " by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; private static Logger s_log = Logger.getLogger (RolePartyAddForm.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/role/RoleRequestLocal.java b/ccm-cms/src/com/arsdigita/cms/ui/role/RoleRequestLocal.java index 979826069..248bdbbff 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/role/RoleRequestLocal.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/role/RoleRequestLocal.java @@ -23,11 +23,11 @@ import com.arsdigita.bebop.RequestLocal; import com.arsdigita.kernel.Role; import com.arsdigita.util.Assert; +/** + * + * @version $Id: RoleRequestLocal.java 287 2005-02-22 00:29:02Z sskracic $ + */ public abstract class RoleRequestLocal extends RequestLocal { - public static final String versionId = - "$Id: RoleRequestLocal.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; public final Role getRole(final PageState state) { final Role role = (Role) get(state); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/staff/PartyInfo.java b/ccm-cms/src/com/arsdigita/cms/ui/staff/PartyInfo.java index 78b65a33e..4043fb9cd 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/staff/PartyInfo.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/staff/PartyInfo.java @@ -51,12 +51,10 @@ import java.math.BigDecimal; * * @author Michael Pih (pihman@arsdigita.com) * @author Michael Bryzek (mbryzek@arsdigita.com) - * @version $Revision: #16 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: PartyInfo.java 287 2005-02-22 00:29:02Z sskracic $ */ public class PartyInfo extends SimpleContainer { - public static final String versionId = "$Id: PartyInfo.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private final SingleSelectionModel m_parties; private List m_partyRoles; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/templates/SectionTemplatesListing.java b/ccm-cms/src/com/arsdigita/cms/ui/templates/SectionTemplatesListing.java index a804a9b28..e7f46e82c 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/templates/SectionTemplatesListing.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/templates/SectionTemplatesListing.java @@ -47,10 +47,6 @@ import org.apache.log4j.Logger; * @version $Id: SectionTemplatesListing.java 287 2005-02-22 00:29:02Z sskracic $ */ public class SectionTemplatesListing extends TemplatesListing { - public static final String versionId = - "$Id: SectionTemplatesListing.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (SectionTemplatesListing.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/templates/TemplateBody.java b/ccm-cms/src/com/arsdigita/cms/ui/templates/TemplateBody.java index e127f8b0b..eb7aaa3d5 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/templates/TemplateBody.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/templates/TemplateBody.java @@ -57,10 +57,6 @@ import com.arsdigita.toolbox.ui.DomainObjectPropertySheet; * @version $Id: TemplateBody.java 754 2005-09-02 13:26:17Z sskracic $ */ public class TemplateBody extends TextAssetBody { - public static final String versionId = - "$Id: TemplateBody.java 754 2005-09-02 13:26:17Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger(TemplateBody.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/templates/TemplateCreate.java b/ccm-cms/src/com/arsdigita/cms/ui/templates/TemplateCreate.java index 664784aae..e53c49632 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/templates/TemplateCreate.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/templates/TemplateCreate.java @@ -67,10 +67,6 @@ import java.util.TooManyListenersException; * @version $Id: TemplateCreate.java 287 2005-02-22 00:29:02Z sskracic $ */ public class TemplateCreate extends BasicItemForm { - public static final String versionId = - "$Id: TemplateCreate.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static Logger s_log = Logger.getLogger(TemplateCreate.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/templates/TemplateEdit.java b/ccm-cms/src/com/arsdigita/cms/ui/templates/TemplateEdit.java index e8513b44b..9a9b8684e 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/templates/TemplateEdit.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/templates/TemplateEdit.java @@ -47,12 +47,10 @@ import org.apache.log4j.Logger; * those properties. * * @author Stanislav Freidin (sfreidin@arsdigita.com) - * @version $Revision: #10 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: TemplateEdit.java 287 2005-02-22 00:29:02Z sskracic $ */ public class TemplateEdit extends SimpleEditStep { - public static final String versionId = "$Id: TemplateEdit.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private static Logger s_log = Logger.getLogger(TemplateEdit.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/type/AddType.java b/ccm-cms/src/com/arsdigita/cms/ui/type/AddType.java index 4570575d8..ba9973991 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/type/AddType.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/type/AddType.java @@ -66,12 +66,11 @@ import java.util.TooManyListenersException; * * @author Jack Chung (flattop@arsdigita.com) * @version $Revision: #15 $ $Date: 2004/08/17 $ + * @version $Id: AddType.java 287 2005-02-22 00:29:02Z sskracic $ */ public class AddType extends CMSForm implements PrintListener, FormProcessListener, FormInitListener { - public static final String versionId = "$Id: AddType.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private final static Logger s_log = Logger.getLogger(AddType.class.getName()); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/type/ContentTypeAdminPane.java b/ccm-cms/src/com/arsdigita/cms/ui/type/ContentTypeAdminPane.java index 73ecbf90d..69e718f37 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/type/ContentTypeAdminPane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/type/ContentTypeAdminPane.java @@ -56,13 +56,9 @@ import java.math.BigDecimal; * @author Michael Pih * @author Stanislav Freidin * @author Justin Ross <jross@redhat.com> - * @version $Id: ContentTypeAdminPane.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ContentTypeAdminPane.java 1942 2009-05-29 07:53:23Z terry $ */ public final class ContentTypeAdminPane extends BaseAdminPane { - public static final String versionId = - "$Id: ContentTypeAdminPane.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (ContentTypeAdminPane.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/type/ContentTypeItemPane.java b/ccm-cms/src/com/arsdigita/cms/ui/type/ContentTypeItemPane.java index 77ec2ddc7..5ff91531a 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/type/ContentTypeItemPane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/type/ContentTypeItemPane.java @@ -47,13 +47,9 @@ import org.apache.log4j.Logger; /** * @author Justin Ross <jross@redhat.com> - * @version $Id: ContentTypeItemPane.java 754 2005-09-02 13:26:17Z sskracic $ + * @version $Id: ContentTypeItemPane.java 1942 2009-05-29 07:53:23Z terry $ */ final class ContentTypeItemPane extends BaseItemPane { - public static final String versionId = - "$Id: ContentTypeItemPane.java 754 2005-09-02 13:26:17Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static Logger s_log = Logger.getLogger(ContentTypeItemPane.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/type/ContentTypePropertyList.java b/ccm-cms/src/com/arsdigita/cms/ui/type/ContentTypePropertyList.java index 5613eede3..54052111b 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/type/ContentTypePropertyList.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/type/ContentTypePropertyList.java @@ -42,13 +42,9 @@ import com.arsdigita.workflow.simple.WorkflowTemplate; * * @author Michael Pih * @author Justin Ross <jross@redhat.com> - * @version $Id: ContentTypePropertyList.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ContentTypePropertyList.java 1942 2009-05-29 07:53:23Z terry $ */ class ContentTypePropertyList extends PropertyList { - public static final String versionId = - "$Id: ContentTypePropertyList.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private final ContentTypeRequestLocal m_type; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/type/ContentTypeRequestLocal.java b/ccm-cms/src/com/arsdigita/cms/ui/type/ContentTypeRequestLocal.java index 47ea41e51..4ab302d67 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/type/ContentTypeRequestLocal.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/type/ContentTypeRequestLocal.java @@ -24,10 +24,6 @@ import com.arsdigita.cms.ContentType; import org.apache.log4j.Logger; public abstract class ContentTypeRequestLocal extends RequestLocal { - public static final String versionId = - "$Id: ContentTypeRequestLocal.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (ContentTypeRequestLocal.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/type/EditType.java b/ccm-cms/src/com/arsdigita/cms/ui/type/EditType.java index f8017e878..54f807e31 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/type/EditType.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/type/EditType.java @@ -66,12 +66,11 @@ import java.util.TooManyListenersException; * * @author Jack Chung (flattop@arsdigita.com) * @author Michael Pih (pihman@arsdigita.com) - * @version $Revision: #14 $ $Date: 2004/08/17 $ + * @version $Id: EditType.java 287 2005-02-22 00:29:02Z sskracic $ */ public class EditType extends CMSForm implements FormInitListener, FormProcessListener { - public static final String versionId = "$Id: EditType.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger(EditType.class); private final SingleSelectionModel m_types; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/type/SelectType.java b/ccm-cms/src/com/arsdigita/cms/ui/type/SelectType.java index 4707e1085..614afa300 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/type/SelectType.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/type/SelectType.java @@ -52,13 +52,11 @@ import java.util.TooManyListenersException; * * @author Jack Chung (flattop@arsdigita.com) * @author Michael Pih (pihman@arsdigita.com) - * @version $Revision: #14 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: SelectType.java 287 2005-02-22 00:29:02Z sskracic $ */ public class SelectType extends CMSForm implements PrintListener, FormSubmissionListener, FormProcessListener { - public static final String versionId = "$Id: SelectType.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private final static String TYPES = "types"; private CheckboxGroup m_typesCheckbox; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/type/TypeSecurityContainer.java b/ccm-cms/src/com/arsdigita/cms/ui/type/TypeSecurityContainer.java index 589adca7a..38d416377 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/type/TypeSecurityContainer.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/type/TypeSecurityContainer.java @@ -28,13 +28,9 @@ import org.apache.log4j.Logger; /** * @author Justin Ross <jross@redhat.com> - * @version $Id: TypeSecurityContainer.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: TypeSecurityContainer.java 1942 2009-05-29 07:53:23Z terry $ */ public final class TypeSecurityContainer extends SecurityContainer { - public static final String versionId = - "$Id: TypeSecurityContainer.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static Logger s_log = Logger.getLogger(TypeSecurityContainer.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/type/TypeSecurityListener.java b/ccm-cms/src/com/arsdigita/cms/ui/type/TypeSecurityListener.java index 04b37da2d..58f7631fe 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/type/TypeSecurityListener.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/type/TypeSecurityListener.java @@ -31,13 +31,9 @@ import org.apache.log4j.Logger; /** * @author Justin Ross <jross@redhat.com> - * @version $Id: TypeSecurityListener.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: TypeSecurityListener.java 1942 2009-05-29 07:53:23Z terry $ */ final class TypeSecurityListener implements FormSubmissionListener { - public static final String versionId = - "$Id: TypeSecurityListener.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static Logger s_log = Logger.getLogger(TypeSecurityListener.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/util/ToggleLinkFormListener.java b/ccm-cms/src/com/arsdigita/cms/ui/util/ToggleLinkFormListener.java index 2b2f37875..18c2bfb09 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/util/ToggleLinkFormListener.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/util/ToggleLinkFormListener.java @@ -32,13 +32,11 @@ import com.arsdigita.bebop.event.FormSubmissionListener; * particular state after a form is processed or submitted. * * @author Jack Chung (flattop@arsdigita.com) - * @version $Revision: #7 $ $Date: 2004/08/17 $ + * @version $Id: ToggleLinkFormListener.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ToggleLinkFormListener implements FormProcessListener, FormSubmissionListener { - public static final String versionId = "$Id: ToggleLinkFormListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private ToggleLink m_toggleLink; private boolean m_isSelected; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/util/UniqueStringValidationListener.java b/ccm-cms/src/com/arsdigita/cms/ui/util/UniqueStringValidationListener.java index 3feb70767..1a1f0f9d1 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/util/UniqueStringValidationListener.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/util/UniqueStringValidationListener.java @@ -29,13 +29,11 @@ import com.arsdigita.bebop.form.Widget; * Validates that the string value of the widget is unique. * * @author Michael Pih (pihman@arsdigita.com) - * @version $Revision: #6 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: UniqueStringValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class UniqueStringValidationListener implements FormValidationListener { - public static final String versionId = "$Id: UniqueStringValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - private final static String ERROR_MSG = "Unique string value constraint violation."; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/AssignedTaskSection.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/AssignedTaskSection.java index c1a5c00eb..49a2a77dc 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/AssignedTaskSection.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/AssignedTaskSection.java @@ -40,11 +40,11 @@ import org.apache.log4j.Logger; import java.util.ArrayList; import java.util.Iterator; +/** + * + * @version $Id: AssignedTaskSection.java 1280 2006-07-27 09:12:09Z cgyg9330 $ + */ public final class AssignedTaskSection extends Section { - public static final String versionId = - "$Id: AssignedTaskSection.java 1280 2006-07-27 09:12:09Z cgyg9330 $" + - "$Author: cgyg9330 $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (AssignedTaskSection.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/AssignedTaskTable.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/AssignedTaskTable.java index 771b5d7c4..4094cfa35 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/AssignedTaskTable.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/AssignedTaskTable.java @@ -37,11 +37,11 @@ import org.apache.log4j.Logger; import java.math.BigDecimal; +/** + * + * @version $Id: AssignedTaskTable.java 1563 2007-04-18 15:58:17Z apevec $ + */ public final class AssignedTaskTable extends Table { - public static final String versionId = - "$Id: AssignedTaskTable.java 1563 2007-04-18 15:58:17Z apevec $" + - "$Author: apevec $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (AssignedTaskTable.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/AssignedTaskTableModelBuilder.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/AssignedTaskTableModelBuilder.java index e9b03c44c..6224a5933 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/AssignedTaskTableModelBuilder.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/AssignedTaskTableModelBuilder.java @@ -1,15 +1,15 @@ /* * Copyright (C) 2003-2004 Red Hat Inc. All Rights Reserved. * - * The contents of this file are subject to the CCM Public - * License (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the - * License at http://www.redhat.com/licenses/ccmpl.html. + * The contents of this file are subject to the CCM Public + * License (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the + * License at http://www.redhat.com/licenses/ccmpl.html. * - * Software distributed under the License is distributed on an - * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express - * or implied. See the License for the specific language - * governing rights and limitations under the License. + * Software distributed under the License is distributed on an + * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express + * or implied. See the License for the specific language + * governing rights and limitations under the License. * */ package com.arsdigita.cms.ui.workflow; @@ -20,9 +20,9 @@ import com.arsdigita.bebop.Table; import com.arsdigita.bebop.table.AbstractTableModelBuilder; import com.arsdigita.bebop.table.TableModel; import com.arsdigita.cms.util.GlobalizationUtil; -import com.arsdigita.cms.workflow.CMSEngine; +import com.arsdigita.cms.workflow.CMSEngine; import com.arsdigita.cms.workflow.CMSTask; -import com.arsdigita.cms.workflow.CMSTaskType; +import com.arsdigita.cms.workflow.CMSTaskType; import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.util.Assert; import com.arsdigita.web.Web; @@ -32,11 +32,11 @@ import org.apache.log4j.Logger; import java.util.Iterator; +/** + * + * @version $Id: AssignedTaskTableModelBuilder.java 1563 2007-04-18 15:58:17Z apevec $ + */ class AssignedTaskTableModelBuilder extends AbstractTableModelBuilder { - public static final String versionId = - "$Id: AssignedTaskTableModelBuilder.java 1563 2007-04-18 15:58:17Z apevec $" + - "$Author: apevec $" + - "$DateTime: 2004/04/07 16:07:11 $"; private static final Logger s_log = Logger.getLogger (AssignedTaskTableModelBuilder.class); @@ -58,7 +58,7 @@ class AssignedTaskTableModelBuilder extends AbstractTableModelBuilder { Model(final Workflow workflow) { Assert.exists(workflow, Workflow.class); - final Engine engine = Engine.getInstance(CMSEngine.CMS_ENGINE_TYPE); + final Engine engine = Engine.getInstance(CMSEngine.CMS_ENGINE_TYPE); Assert.exists(engine, Engine.class); @@ -92,7 +92,7 @@ class AssignedTaskTableModelBuilder extends AbstractTableModelBuilder { // SF patch [ 1587168 ] Show locking user return m_task.isLocked() ? m_task.getLockedUser() : null; case 2: - return m_task.getTaskType().getID().equals(CMSTaskType.DEPLOY) ? + return m_task.getTaskType().getID().equals(CMSTaskType.DEPLOY) ? (Object) new Label("") : (Object) lz("cms.ui.workflow.task.finish"); default: diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/BaseTaskForm.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/BaseTaskForm.java index ea04976f8..b1e93014a 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/BaseTaskForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/BaseTaskForm.java @@ -1,15 +1,15 @@ /* * Copyright (C) 2003-2004 Red Hat Inc. All Rights Reserved. * - * The contents of this file are subject to the CCM Public - * License (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the - * License at http://www.redhat.com/licenses/ccmpl.html. + * The contents of this file are subject to the CCM Public + * License (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the + * License at http://www.redhat.com/licenses/ccmpl.html. * - * Software distributed under the License is distributed on an - * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express - * or implied. See the License for the specific language - * governing rights and limitations under the License. + * Software distributed under the License is distributed on an + * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express + * or implied. See the License for the specific language + * governing rights and limitations under the License. * */ package com.arsdigita.cms.ui.workflow; @@ -24,15 +24,15 @@ import com.arsdigita.bebop.form.SingleSelect; import com.arsdigita.bebop.form.TextArea; import com.arsdigita.bebop.form.TextField; import com.arsdigita.bebop.parameters.BigDecimalParameter; -import com.arsdigita.bebop.parameters.IntegerParameter; +import com.arsdigita.bebop.parameters.IntegerParameter; import com.arsdigita.cms.SecurityManager; import com.arsdigita.cms.ui.BaseForm; -import com.arsdigita.cms.ui.DataCollectionOptionPrintListener; +import com.arsdigita.cms.ui.DataCollectionOptionPrintListener; import com.arsdigita.cms.ui.DataQueryOptionPrintListener; -import com.arsdigita.cms.workflow.CMSTaskType; -import com.arsdigita.domain.DomainObject; +import com.arsdigita.cms.workflow.CMSTaskType; +import com.arsdigita.domain.DomainObject; import com.arsdigita.globalization.GlobalizedMessage; -import com.arsdigita.persistence.DataCollection; +import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataQuery; import com.arsdigita.persistence.SessionManager; import com.arsdigita.util.UncheckedWrapperException; @@ -46,13 +46,9 @@ import java.util.TooManyListenersException; /** * @author Justin Ross <jross@redhat.com> - * @version $Id: BaseTaskForm.java 1280 2006-07-27 09:12:09Z cgyg9330 $ + * @version $Id: BaseTaskForm.java 1280 2006-07-27 09:12:09Z cgyg9330 $ */ class BaseTaskForm extends BaseForm { - public static final String versionId = - "$Id: BaseTaskForm.java 1280 2006-07-27 09:12:09Z cgyg9330 $" + - "$Author: cgyg9330 $" + - "$DateTime: 2004/04/07 16:07:11 $"; private static final Logger s_log = Logger.getLogger(BaseTaskForm.class); @@ -73,7 +69,7 @@ class BaseTaskForm extends BaseForm { m_name = new Name("name", 200, true); addField(gz("cms.ui.name"), m_name); - m_type = new SingleSelect(new IntegerParameter("task_type")); + m_type = new SingleSelect(new IntegerParameter("task_type")); addField(gz("cms.ui.workflow.task.type"), m_type); try { @@ -138,21 +134,21 @@ class BaseTaskForm extends BaseForm { */ // Fix this one too - private class TaskTypePrintListener extends DataCollectionOptionPrintListener { - protected DataCollection getDataCollection(PageState s) { + private class TaskTypePrintListener extends DataCollectionOptionPrintListener { + protected DataCollection getDataCollection(PageState s) { // XXX qelim - final DataCollection taskTypes = SessionManager.getSession().retrieve(CMSTaskType.BASE_DATA_OBJECT_TYPE); - taskTypes.addOrder("upper(" + CMSTaskType.NAME + ")"); - return taskTypes; + final DataCollection taskTypes = SessionManager.getSession().retrieve(CMSTaskType.BASE_DATA_OBJECT_TYPE); + taskTypes.addOrder("upper(" + CMSTaskType.NAME + ")"); + return taskTypes; } - public String getKey(DomainObject d) { - return ((CMSTaskType)d).getID().toString(); + public String getKey(DomainObject d) { + return ((CMSTaskType)d).getID().toString(); } - public String getValue(DomainObject d) { - return ((CMSTaskType) d).getName(); + public String getValue(DomainObject d) { + return ((CMSTaskType) d).getName(); } } diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/BaseWorkflowForm.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/BaseWorkflowForm.java index c797d5387..a399334ee 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/BaseWorkflowForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/BaseWorkflowForm.java @@ -33,10 +33,6 @@ import org.apache.log4j.Logger; * @version $Id: BaseWorkflowForm.java 287 2005-02-22 00:29:02Z sskracic $ */ class BaseWorkflowForm extends BaseForm { - public static final String versionId = - "$Id: BaseWorkflowForm.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger(BaseWorkflowForm.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/BaseWorkflowItemPane.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/BaseWorkflowItemPane.java index e8bb6ee0e..572bddfd1 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/BaseWorkflowItemPane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/BaseWorkflowItemPane.java @@ -45,11 +45,11 @@ import com.arsdigita.workflow.simple.Workflow; import java.math.BigDecimal; +/** + * + * @version $Id: BaseWorkflowItemPane.java 1338 2006-10-05 19:17:29Z sskracic $ + */ abstract class BaseWorkflowItemPane extends BaseItemPane { - public static final String versionId = - "$Id: BaseWorkflowItemPane.java 1338 2006-10-05 19:17:29Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; final WorkflowRequestLocal m_workflow; final TaskRequestLocal m_task; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/CommentAddForm.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/CommentAddForm.java index 125fd2429..aee21f448 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/CommentAddForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/CommentAddForm.java @@ -35,10 +35,6 @@ import org.apache.log4j.Logger; * @version $Id: CommentAddForm.java 287 2005-02-22 00:29:02Z sskracic $ */ class CommentAddForm extends BaseForm { - public static final String versionId = - "$Id: CommentAddForm.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger(CommentAddForm.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/ItemWorkflowAdminPane.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/ItemWorkflowAdminPane.java index 1c86ad7ed..5d2292819 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/ItemWorkflowAdminPane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/ItemWorkflowAdminPane.java @@ -44,10 +44,6 @@ import java.math.BigDecimal; * @version $Id: ItemWorkflowAdminPane.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ItemWorkflowAdminPane extends BaseItemPane { - public static final String versionId = - "$Id: ItemWorkflowAdminPane.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private final ParameterSingleSelectionModel m_model; private final WorkflowRequestLocal m_workflow; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/ItemWorkflowItemPane.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/ItemWorkflowItemPane.java index 799e9da44..a9bdf3142 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/ItemWorkflowItemPane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/ItemWorkflowItemPane.java @@ -36,10 +36,6 @@ import java.math.BigDecimal; * @version $Id: ItemWorkflowItemPane.java 754 2005-09-02 13:26:17Z sskracic $ */ final class ItemWorkflowItemPane extends BaseWorkflowItemPane { - public static final String versionId = - "$Id: ItemWorkflowItemPane.java 754 2005-09-02 13:26:17Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private final AssignedTaskTable m_assigned; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/ItemWorkflowSelectForm.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/ItemWorkflowSelectForm.java index c1824bb16..66876ed17 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/ItemWorkflowSelectForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/ItemWorkflowSelectForm.java @@ -45,10 +45,6 @@ import java.util.TooManyListenersException; * @version $Id: ItemWorkflowSelectForm.java 287 2005-02-22 00:29:02Z sskracic $ */ class ItemWorkflowSelectForm extends CMSForm { - public static final String versionId = - "$Id: ItemWorkflowSelectForm.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger(ItemWorkflowSelectForm.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskAddForm.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskAddForm.java index 6bc5cf4f1..537500f9a 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskAddForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskAddForm.java @@ -43,10 +43,6 @@ import java.util.TooManyListenersException; * @version $Id: TaskAddForm.java 1280 2006-07-27 09:12:09Z cgyg9330 $ */ class TaskAddForm extends BaseTaskForm { - public static final String versionId = - "$Id: TaskAddForm.java 1280 2006-07-27 09:12:09Z cgyg9330 $" + - "$Author: cgyg9330 $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger(TaskAddForm.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskAddUser.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskAddUser.java index 8d2ac22f6..bcbbb51ad 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskAddUser.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskAddUser.java @@ -48,13 +48,9 @@ import java.math.BigDecimal; * * @author Uday Mathur * @author Michael Pih - * @version $Revision: #8 $ $Date: 2004/08/17 $ + * @version $Id: TaskAddUser.java 287 2005-02-22 00:29:02Z sskracic $ */ class TaskAddUser extends SimpleContainer { - public static final String versionId = - "$Id: TaskAddUser.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger(TaskAddUser.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskCollectionOptionPrintListener.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskCollectionOptionPrintListener.java index 357dadf0e..ee49a2023 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskCollectionOptionPrintListener.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskCollectionOptionPrintListener.java @@ -34,13 +34,11 @@ import com.arsdigita.workflow.simple.TaskCollection; * content section. * * @author Uday Mathur (umathur@arsdigita.com) - * @version $Revision: #7 $ $Date: 2004/08/17 $ + * @version $Id: TaskCollectionOptionPrintListener.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class TaskCollectionOptionPrintListener implements PrintListener { - public static final String versionId = "$Id: TaskCollectionOptionPrintListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - abstract TaskCollection getCollection(PageState state); public void prepare(PrintEvent e) { diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskEditForm.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskEditForm.java index ff29a4fd9..bd772037a 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskEditForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskEditForm.java @@ -43,10 +43,6 @@ import java.util.TooManyListenersException; * @version $Id: TaskEditForm.java 1280 2006-07-27 09:12:09Z cgyg9330 $ */ class TaskEditForm extends BaseTaskForm { - public static final String versionId = - "$Id: TaskEditForm.java 1280 2006-07-27 09:12:09Z cgyg9330 $" + - "$Author: cgyg9330 $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger(TaskEditForm.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskFinishForm.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskFinishForm.java index ad22189f2..7bdd29a19 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskFinishForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskFinishForm.java @@ -58,10 +58,6 @@ import java.util.Iterator; * @version $Id: TaskFinishForm.java 1563 2007-04-18 15:58:17Z apevec $ */ public final class TaskFinishForm extends CommentAddForm { - public static final String versionId = - "$Id: TaskFinishForm.java 1563 2007-04-18 15:58:17Z apevec $" + - "$Author: apevec $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (TaskFinishForm.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskItemPane.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskItemPane.java index 5cbe725c5..05e365b20 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskItemPane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskItemPane.java @@ -1,15 +1,15 @@ /* * Copyright (C) 2003-2004 Red Hat Inc. All Rights Reserved. * - * The contents of this file are subject to the CCM Public - * License (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the - * License at http://www.redhat.com/licenses/ccmpl.html. + * The contents of this file are subject to the CCM Public + * License (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the + * License at http://www.redhat.com/licenses/ccmpl.html. * - * Software distributed under the License is distributed on an - * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express - * or implied. See the License for the specific language - * governing rights and limitations under the License. + * Software distributed under the License is distributed on an + * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express + * or implied. See the License for the specific language + * governing rights and limitations under the License. * */ package com.arsdigita.cms.ui.workflow; @@ -35,7 +35,7 @@ import com.arsdigita.cms.CMS; import com.arsdigita.cms.SecurityManager; import com.arsdigita.cms.ui.BaseItemPane; import com.arsdigita.cms.ui.VisibilityComponent; -import com.arsdigita.cms.workflow.CMSEngine; +import com.arsdigita.cms.workflow.CMSEngine; import com.arsdigita.cms.workflow.CMSTask; import com.arsdigita.kernel.EmailAddress; import com.arsdigita.kernel.Group; @@ -56,13 +56,9 @@ import java.util.Collection; /* * @author Justin Ross <jross@redhat.com> - * @version $Id: TaskItemPane.java 1280 2006-07-27 09:12:09Z cgyg9330 $ + * @version $Id: TaskItemPane.java 1280 2006-07-27 09:12:09Z cgyg9330 $ */ final class TaskItemPane extends BaseItemPane { - public static final String versionId = - "$Id: TaskItemPane.java 1280 2006-07-27 09:12:09Z cgyg9330 $" + - "$Author: cgyg9330 $" + - "$DateTime: 2004/04/07 16:07:11 $"; private final WorkflowRequestLocal m_workflow; private final TaskRequestLocal m_task; @@ -162,7 +158,7 @@ final class TaskItemPane extends BaseItemPane { final User user = Web.getContext().getUser(); final CMSTask task = m_task.getTask(state); - final Engine engine = Engine.getInstance(CMSEngine.CMS_ENGINE_TYPE); + final Engine engine = Engine.getInstance(CMSEngine.CMS_ENGINE_TYPE); final Collection tasks = engine.getEnabledTasks (user, workflow.getID()); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskRequestLocal.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskRequestLocal.java index 8c867a73c..7854456f9 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskRequestLocal.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskRequestLocal.java @@ -23,11 +23,11 @@ import com.arsdigita.bebop.RequestLocal; import com.arsdigita.cms.workflow.CMSTask; import com.arsdigita.util.Assert; +/** + * + * @version $Id: TaskRequestLocal.java 287 2005-02-22 00:29:02Z sskracic $ + */ public abstract class TaskRequestLocal extends RequestLocal { - public static final String versionId = - "$Id: TaskRequestLocal.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; public final CMSTask getTask(final PageState state) { final CMSTask task = (CMSTask) get(state); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskTableModelBuilder.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskTableModelBuilder.java index 556ac388a..4954d7d15 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskTableModelBuilder.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskTableModelBuilder.java @@ -35,11 +35,11 @@ import java.util.List; import java.util.Map; import org.apache.log4j.Logger; +/** + * + * @version $Id: TaskTableModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ + */ class TaskTableModelBuilder extends AbstractTableModelBuilder { - public static final String versionId = - "$Id: TaskTableModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (TaskTableModelBuilder.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowAddForm.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowAddForm.java index f848c49c2..c29771c9f 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowAddForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowAddForm.java @@ -35,10 +35,6 @@ import org.apache.log4j.Logger; * @version $Id: WorkflowAddForm.java 287 2005-02-22 00:29:02Z sskracic $ */ class WorkflowAddForm extends BaseWorkflowForm { - public static final String versionId = - "$Id: WorkflowAddForm.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger(WorkflowAddForm.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowAdminPane.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowAdminPane.java index 0d3450f38..cb251c487 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowAdminPane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowAdminPane.java @@ -36,10 +36,6 @@ import java.math.BigDecimal; * @version $Id: WorkflowAdminPane.java 287 2005-02-22 00:29:02Z sskracic $ */ public final class WorkflowAdminPane extends BaseAdminPane { - public static final String versionId = - "$Id: WorkflowAdminPane.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (WorkflowAdminPane.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowComponent.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowComponent.java index 2e7c82ec3..8423b5921 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowComponent.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowComponent.java @@ -25,9 +25,12 @@ import com.arsdigita.cms.CMS; import com.arsdigita.workflow.simple.Workflow; import com.arsdigita.xml.Element; +/** + * + * @version $Id: WorkflowComponent.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class WorkflowComponent extends SimpleComponent { - public static final String versionId = "$Id: WorkflowComponent.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; Workflow m_workflow; public WorkflowComponent(Workflow w) { m_workflow = w; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowDeleteForm.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowDeleteForm.java index b57e1ca9c..1f91e01f6 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowDeleteForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowDeleteForm.java @@ -30,10 +30,6 @@ import com.arsdigita.workflow.simple.Workflow; */ class WorkflowDeleteForm extends BaseDeleteForm { - public static final String versionId = - "$Id: WorkflowDeleteForm.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; final WorkflowRequestLocal m_workflow; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowEditForm.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowEditForm.java index 62c95756e..08a047ec2 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowEditForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowEditForm.java @@ -32,10 +32,6 @@ import org.apache.log4j.Logger; * @version $Id: WorkflowEditForm.java 287 2005-02-22 00:29:02Z sskracic $ */ class WorkflowEditForm extends BaseWorkflowForm { - public static final String versionId = - "$Id: WorkflowEditForm.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger(WorkflowEditForm.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowItemPane.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowItemPane.java index 101b490d8..f61c58f5c 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowItemPane.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowItemPane.java @@ -20,11 +20,11 @@ package com.arsdigita.cms.ui.workflow; import com.arsdigita.bebop.ActionLink; +/** + * + * @version $Id: WorkflowItemPane.java 287 2005-02-22 00:29:02Z sskracic $ + */ class WorkflowItemPane extends BaseWorkflowItemPane { - public static final String versionId = - "$Id: WorkflowItemPane.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; public WorkflowItemPane(final WorkflowRequestLocal workflow, final ActionLink editLink, diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowListModelBuilder.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowListModelBuilder.java index 662405ba5..bc8c66191 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowListModelBuilder.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowListModelBuilder.java @@ -37,10 +37,6 @@ import org.apache.log4j.Logger; * @version $Id: WorkflowListModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ */ class WorkflowListModelBuilder extends AbstractListModelBuilder { - public static final String versionId = - "$Id: WorkflowListModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; private static final Logger s_log = Logger.getLogger (AssignedTaskTableModelBuilder.class); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowRequestLocal.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowRequestLocal.java index 36455ce0c..5bb754792 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowRequestLocal.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowRequestLocal.java @@ -22,11 +22,11 @@ import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.RequestLocal; import com.arsdigita.workflow.simple.Workflow; +/** + * + * @version $Id: WorkflowRequestLocal.java 287 2005-02-22 00:29:02Z sskracic $ + */ public abstract class WorkflowRequestLocal extends RequestLocal { - public static final String versionId = - "$Id: WorkflowRequestLocal.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; public final Workflow getWorkflow(final PageState state) { return (Workflow) get(state); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowsOptionPrintListener.java b/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowsOptionPrintListener.java index a96358417..da069aaf6 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowsOptionPrintListener.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/workflow/WorkflowsOptionPrintListener.java @@ -34,13 +34,11 @@ import com.arsdigita.workflow.simple.TaskCollection; * content section. * * @author Uday Mathur (umathur@arsdigita.com) - * @version $Revision: #9 $ $Date: 2004/08/17 $ + * @version $Id: WorkflowsOptionPrintListener.java 287 2005-02-22 00:29:02Z sskracic $ */ public class WorkflowsOptionPrintListener implements PrintListener { - public static final String versionId = "$Id: WorkflowsOptionPrintListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - protected TaskCollection getCollection(PageState state) { ContentSection section = getContentSection(state); TaskCollection templates = section.getWorkflowTemplates(); diff --git a/ccm-cms/src/com/arsdigita/cms/util/SecurityConstants.java b/ccm-cms/src/com/arsdigita/cms/util/SecurityConstants.java index 2b3e24b38..31f5764bd 100755 --- a/ccm-cms/src/com/arsdigita/cms/util/SecurityConstants.java +++ b/ccm-cms/src/com/arsdigita/cms/util/SecurityConstants.java @@ -26,12 +26,9 @@ package com.arsdigita.cms.util; * * @author Michael Pih * @version $Revision: #7 $ $DateTime: 2004/08/17 23:15:09 $ + * @version $Id: SecurityConstants.java 1280 2006-07-27 09:12:09Z cgyg9330 $ */ public interface SecurityConstants { - public static final String versionId = - "$Id: SecurityConstants.java 1280 2006-07-27 09:12:09Z cgyg9330 $" + - "$Author: cgyg9330 $" + - "$DateTime: 2004/08/17 23:15:09 $"; // CMS Actions public final static String STAFF_ADMIN = "staff_admin"; diff --git a/ccm-cms/src/com/arsdigita/cms/workflow/AuthoringTaskURLGenerator.java b/ccm-cms/src/com/arsdigita/cms/workflow/AuthoringTaskURLGenerator.java index 61c467215..ddb0fe965 100755 --- a/ccm-cms/src/com/arsdigita/cms/workflow/AuthoringTaskURLGenerator.java +++ b/ccm-cms/src/com/arsdigita/cms/workflow/AuthoringTaskURLGenerator.java @@ -27,13 +27,11 @@ import java.math.BigDecimal; * ContentItem and the Task. * * @author Uday Mathur (umathur@arsdigita.com) - * @version $Revision: #6 $ $Date: 2004/08/17 $ + * @version $Id: AuthoringTaskURLGenerator.java 287 2005-02-22 00:29:02Z sskracic $ * */ public class AuthoringTaskURLGenerator implements TaskURLGenerator { - public static final String versionId = "$Id: AuthoringTaskURLGenerator.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public AuthoringTaskURLGenerator() {} /** diff --git a/ccm-cms/src/com/arsdigita/cms/workflow/CMSTask.java b/ccm-cms/src/com/arsdigita/cms/workflow/CMSTask.java index 26838b7bc..820c31705 100755 --- a/ccm-cms/src/com/arsdigita/cms/workflow/CMSTask.java +++ b/ccm-cms/src/com/arsdigita/cms/workflow/CMSTask.java @@ -70,11 +70,10 @@ import java.util.Set; * * * @author Uday Mathur (umathu + * @version $Id: CMSTask.java 1637 2007-09-17 10:14:27Z chrisg23 $ **/ public class CMSTask extends UserTask { - public static final String versionId = "$Id: CMSTask.java 1637 2007-09-17 10:14:27Z chrisg23 $ by $Author: chrisg23 $, $DateTime: 2004/08/17 23:15:09 $"; - public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.workflow.CMSTask"; diff --git a/ccm-cms/src/com/arsdigita/cms/workflow/CMSTaskType.java b/ccm-cms/src/com/arsdigita/cms/workflow/CMSTaskType.java index e1c332464..6bb127b1f 100755 --- a/ccm-cms/src/com/arsdigita/cms/workflow/CMSTaskType.java +++ b/ccm-cms/src/com/arsdigita/cms/workflow/CMSTaskType.java @@ -72,12 +72,10 @@ import java.util.Set; * * * @author chris.gilbert at westsussex.gov.uk - **/ + * @version $Id: $ + */ public class CMSTaskType extends DomainObject { - public static final String versionId = - "$Id$ by $Author$, $DateTime: 2004/08/17 23:15:09 $"; - public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.workflow.CMSTaskType"; diff --git a/ccm-cms/src/com/arsdigita/cms/workflow/DeployTaskURLGenerator.java b/ccm-cms/src/com/arsdigita/cms/workflow/DeployTaskURLGenerator.java index 9b3e1330d..50dd8f904 100755 --- a/ccm-cms/src/com/arsdigita/cms/workflow/DeployTaskURLGenerator.java +++ b/ccm-cms/src/com/arsdigita/cms/workflow/DeployTaskURLGenerator.java @@ -29,13 +29,11 @@ import java.math.BigDecimal; * in the Item Management part of the CMS UI. * * @author Uday Mathur (umathur@arsdigita.com) - * @version $Revision: #10 $ $Date: 2004/08/17 $ + * @version $Id: DeployTaskURLGenerator.java 287 2005-02-22 00:29:02Z sskracic $ * */ public class DeployTaskURLGenerator implements TaskURLGenerator { - public static final String versionId = "$Id: DeployTaskURLGenerator.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public DeployTaskURLGenerator() {} /** diff --git a/ccm-cms/src/com/arsdigita/cms/workflow/EditingTaskURLGenerator.java b/ccm-cms/src/com/arsdigita/cms/workflow/EditingTaskURLGenerator.java index 158908a2a..997ad73f4 100755 --- a/ccm-cms/src/com/arsdigita/cms/workflow/EditingTaskURLGenerator.java +++ b/ccm-cms/src/com/arsdigita/cms/workflow/EditingTaskURLGenerator.java @@ -28,13 +28,11 @@ import java.math.BigDecimal; * editors, hence this is a separate class and has its own TaskType * * @author Uday Mathur (umathur@arsdigita.com) - * @version $Revision: #10 $ $Date: 2004/08/17 $ + * @version $Id: EditingTaskURLGenerator.java 287 2005-02-22 00:29:02Z sskracic $ * */ public class EditingTaskURLGenerator implements TaskURLGenerator { - public static final String versionId = "$Id: EditingTaskURLGenerator.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public EditingTaskURLGenerator() {} /** diff --git a/ccm-cms/src/com/arsdigita/cms/workflow/FinishTaskURLGenerator.java b/ccm-cms/src/com/arsdigita/cms/workflow/FinishTaskURLGenerator.java index 713eda077..dafc407c8 100755 --- a/ccm-cms/src/com/arsdigita/cms/workflow/FinishTaskURLGenerator.java +++ b/ccm-cms/src/com/arsdigita/cms/workflow/FinishTaskURLGenerator.java @@ -29,13 +29,9 @@ import java.net.URLEncoder; * ContentItem and the Task. * * @author Uday Mathur (umathur@arsdigita.com) - * @version $Revision: #10 $ $Date: 2004/08/17 $ + * @version $Id: FinishTaskURLGenerator.java 287 2005-02-22 00:29:02Z sskracic $ */ public class FinishTaskURLGenerator implements TaskURLGenerator { - public static final String versionId = - "$Id: FinishTaskURLGenerator.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/17 23:15:09 $"; public static FinishTaskURLGenerator s_instance; diff --git a/ccm-cms/src/com/arsdigita/cms/workflow/PreviewTaskURLGenerator.java b/ccm-cms/src/com/arsdigita/cms/workflow/PreviewTaskURLGenerator.java index 511f6b164..d9887d3e6 100755 --- a/ccm-cms/src/com/arsdigita/cms/workflow/PreviewTaskURLGenerator.java +++ b/ccm-cms/src/com/arsdigita/cms/workflow/PreviewTaskURLGenerator.java @@ -27,13 +27,11 @@ import java.math.BigDecimal; * ContentItem and the Task. * * @author Uday Mathur (umathur@arsdigita.com) - * @version $Revision: #6 $ $Date: 2004/08/17 $ + * @version $Id: PreviewTaskURLGenerator.java 287 2005-02-22 00:29:02Z sskracic $ * */ public class PreviewTaskURLGenerator extends FinishTaskURLGenerator { - public static final String versionId = "$Id: PreviewTaskURLGenerator.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public PreviewTaskURLGenerator() {} public String generateURL(BigDecimal itemId, BigDecimal taskId) { return ContentItemPage.getItemURL(itemId, ContentItemPage.AUTHORING_TAB); diff --git a/ccm-cms/src/com/arsdigita/cms/workflow/PublishedItemURLGenerator.java b/ccm-cms/src/com/arsdigita/cms/workflow/PublishedItemURLGenerator.java index 3ccae7409..234629ae5 100755 --- a/ccm-cms/src/com/arsdigita/cms/workflow/PublishedItemURLGenerator.java +++ b/ccm-cms/src/com/arsdigita/cms/workflow/PublishedItemURLGenerator.java @@ -39,13 +39,11 @@ import java.math.BigDecimal; * introduced by Bristol may have resolved this issue * * @author Chris Gilbert (chris.gilbert at westsussex.gov.uk) - * @version $Revision: #10 $ $Date: 2004/08/17 $ + * @version $Id: DeployTaskURLGenerator.java 285 2005-02-22 00:29:02Z sskracic $ * */ public class PublishedItemURLGenerator implements TaskURLGenerator { - public static final String versionId = "$Id: DeployTaskURLGenerator.java 285 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - public PublishedItemURLGenerator() {} /** diff --git a/ccm-cms/src/com/arsdigita/cms/workflow/TaskEventURLGenerator.java b/ccm-cms/src/com/arsdigita/cms/workflow/TaskEventURLGenerator.java index a1f10f172..0750cd754 100755 --- a/ccm-cms/src/com/arsdigita/cms/workflow/TaskEventURLGenerator.java +++ b/ccm-cms/src/com/arsdigita/cms/workflow/TaskEventURLGenerator.java @@ -36,12 +36,10 @@ import com.arsdigita.persistence.SessionManager; * * * @author chris.gilbert at westsussex.gov.uk + * @version $Id: $ **/ public class TaskEventURLGenerator extends DomainObject { - public static final String versionId = - "$Id$ by $Author$, $DateTime: 2004/08/17 23:15:09 $"; - public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.cms.workflow.TaskEventURLGenerator"; diff --git a/ccm-cms/src/com/arsdigita/cms/workflow/TaskURLGenerator.java b/ccm-cms/src/com/arsdigita/cms/workflow/TaskURLGenerator.java index 48d10b881..998a87470 100755 --- a/ccm-cms/src/com/arsdigita/cms/workflow/TaskURLGenerator.java +++ b/ccm-cms/src/com/arsdigita/cms/workflow/TaskURLGenerator.java @@ -25,12 +25,10 @@ import java.math.BigDecimal; * ContentItem and the Task. * * @author Uday Mathur (umathur@arsdigita.com) - * @version $Revision: #6 $ $Date: 2004/08/17 $ + * @version $Id: TaskURLGenerator.java 287 2005-02-22 00:29:02Z sskracic $ * */ public interface TaskURLGenerator { - public static final String versionId = "$Id: TaskURLGenerator.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $"; - String generateURL(BigDecimal item_id, BigDecimal task_id); }