From 558f195445196f8b5172a59118462da9fe921e4d Mon Sep 17 00:00:00 2001 From: pb Date: Tue, 17 Aug 2010 09:46:42 +0000 Subject: [PATCH] Core: Kleinere Formatierungen, entfernen von version_id. git-svn-id: https://svn.libreccm.org/ccm/trunk@506 8810af33-2d31-482b-a856-94f89814c4df --- ccm-core/src/com/arsdigita/kernel/ACSObject.java | 5 +---- ccm-core/src/com/arsdigita/kernel/ACSObjectCollection.java | 3 +-- ccm-core/src/com/arsdigita/kernel/PackageInstance.java | 5 +++-- .../src/com/arsdigita/kernel/PackageInstanceCollection.java | 5 ++--- .../arsdigita/kernel/permissions/PrivilegeDescriptor.java | 3 +-- ccm-core/src/com/arsdigita/workflow/simple/Engine.java | 3 +-- 6 files changed, 9 insertions(+), 15 deletions(-) diff --git a/ccm-core/src/com/arsdigita/kernel/ACSObject.java b/ccm-core/src/com/arsdigita/kernel/ACSObject.java index 0c6f25a43..a19dc5086 100755 --- a/ccm-core/src/com/arsdigita/kernel/ACSObject.java +++ b/ccm-core/src/com/arsdigita/kernel/ACSObject.java @@ -53,12 +53,9 @@ import org.apache.log4j.Priority; * identified by a single identifier, which is currently found in this * object's OID. * + * @version $Id: ACSObject.java 287 2005-02-22 00:29:02Z sskracic $ **/ public abstract class ACSObject extends ObservableDomainObject { - public static final String versionId = - "$Id: ACSObject.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.kernel.ACSObject"; diff --git a/ccm-core/src/com/arsdigita/kernel/ACSObjectCollection.java b/ccm-core/src/com/arsdigita/kernel/ACSObjectCollection.java index 48ce7a32f..58b656648 100755 --- a/ccm-core/src/com/arsdigita/kernel/ACSObjectCollection.java +++ b/ccm-core/src/com/arsdigita/kernel/ACSObjectCollection.java @@ -33,11 +33,10 @@ import java.math.BigDecimal; * * @author Oumi Mehrotra * @version 1.0 + * @version $Id: ACSObjectCollection.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class ACSObjectCollection extends DomainCollection { - public static final String versionId = "$Id: ACSObjectCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Constructor. * diff --git a/ccm-core/src/com/arsdigita/kernel/PackageInstance.java b/ccm-core/src/com/arsdigita/kernel/PackageInstance.java index 26ee55b96..6d3ceb75b 100755 --- a/ccm-core/src/com/arsdigita/kernel/PackageInstance.java +++ b/ccm-core/src/com/arsdigita/kernel/PackageInstance.java @@ -39,12 +39,13 @@ import org.apache.log4j.Logger; * A package instance can have its own content, presentation, * and parameters associated with it. * - * @version $Revision: #14 $, $Date: 2004/08/16 $ * @since ACS 5.0 * @see PackageType + * @version $Revision: #14 $, $Date: 2004/08/16 $ + * @version $Id: PackageInstance.java 287 2005-02-22 00:29:02Z sskracic $ */ public class PackageInstance extends ACSObject { - public static final String versionId = "$Id: PackageInstance.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + private static final Logger s_log = Logger.getLogger(PackageInstance.class.getName()); public static final String BASE_DATA_OBJECT_TYPE = diff --git a/ccm-core/src/com/arsdigita/kernel/PackageInstanceCollection.java b/ccm-core/src/com/arsdigita/kernel/PackageInstanceCollection.java index 91c199e1d..4fe259944 100755 --- a/ccm-core/src/com/arsdigita/kernel/PackageInstanceCollection.java +++ b/ccm-core/src/com/arsdigita/kernel/PackageInstanceCollection.java @@ -26,14 +26,13 @@ import com.arsdigita.persistence.DataCollection; * Represents collection of PackageInstances. * * @author Bryan Quinn - * @version $Revision: #8 $ $Date: 2004/08/16 $ * @since ACS 5.0 + * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: PackageInstanceCollection.java 287 2005-02-22 00:29:02Z sskracic $ */ public class PackageInstanceCollection extends ACSObjectCollection { - public static final String versionId = "$Id: PackageInstanceCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public PackageInstanceCollection(DataCollection dataCollection) { super(dataCollection); } diff --git a/ccm-core/src/com/arsdigita/kernel/permissions/PrivilegeDescriptor.java b/ccm-core/src/com/arsdigita/kernel/permissions/PrivilegeDescriptor.java index 9b53ac1b9..fb6753d9d 100755 --- a/ccm-core/src/com/arsdigita/kernel/permissions/PrivilegeDescriptor.java +++ b/ccm-core/src/com/arsdigita/kernel/permissions/PrivilegeDescriptor.java @@ -36,11 +36,10 @@ import java.util.Map; * * @author Oumi Mehrotra * @version 1.0 + * @version $Id: PrivilegeDescriptor.java 1311 2006-09-04 10:30:53Z sskracic $ **/ public class PrivilegeDescriptor { - public static final String versionId = "$Id: PrivilegeDescriptor.java 1311 2006-09-04 10:30:53Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final String ADMIN_NAME = "admin"; private static final String EDIT_NAME = "edit"; private static final String READ_NAME = "read"; diff --git a/ccm-core/src/com/arsdigita/workflow/simple/Engine.java b/ccm-core/src/com/arsdigita/workflow/simple/Engine.java index 2980fcf89..271f9516c 100755 --- a/ccm-core/src/com/arsdigita/workflow/simple/Engine.java +++ b/ccm-core/src/com/arsdigita/workflow/simple/Engine.java @@ -57,11 +57,10 @@ import org.apache.log4j.Logger; * to enable existing clients to retrieve a simple engine using the same static call * * @version $Revision: #13 $ $DateTime: 2004/08/16 18:10:38 $ + * @version $Id: Engine.java 1278 2006-07-27 09:09:51Z cgyg9330 $ */ public class Engine { - public static final String versionId = "$Id: Engine.java 1278 2006-07-27 09:09:51Z cgyg9330 $ by $Author: cgyg9330 $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(Engine.class);