diff --git a/ccm-bundle/bundles/devel/cfg/project.xml b/ccm-bundle/bundles/devel/cfg/project.xml index 27b8fac4c..fa6932b5b 100644 --- a/ccm-bundle/bundles/devel/cfg/project.xml +++ b/ccm-bundle/bundles/devel/cfg/project.xml @@ -44,7 +44,6 @@ - @@ -74,18 +73,19 @@ - - + + @@ -100,10 +100,10 @@ - + diff --git a/ccm-core/src/com/arsdigita/bebop/Completable.java b/ccm-core/src/com/arsdigita/bebop/Completable.java index 1b343a224..2b330b1dd 100755 --- a/ccm-core/src/com/arsdigita/bebop/Completable.java +++ b/ccm-core/src/com/arsdigita/bebop/Completable.java @@ -41,14 +41,14 @@ public abstract class Completable implements Component { private final static Logger s_log = Logger.getLogger(Completable.class); + private ArrayList m_completionListeners = new ArrayList(); + public Completable() { if ( s_log.isDebugEnabled() ) { StackTraces.captureStackTrace(this); } } - private ArrayList m_completionListeners = new ArrayList(); - public void addCompletionListener(ActionListener listener) { Assert.isUnlocked(this); m_completionListeners.add(listener); diff --git a/ccm-core/src/com/arsdigita/kernel/DatabaseTransaction.java b/ccm-core/src/com/arsdigita/kernel/DatabaseTransaction.java index 5870cf569..d880aae69 100755 --- a/ccm-core/src/com/arsdigita/kernel/DatabaseTransaction.java +++ b/ccm-core/src/com/arsdigita/kernel/DatabaseTransaction.java @@ -28,10 +28,6 @@ import org.apache.log4j.Logger; * @author Justin Ross */ public final class DatabaseTransaction { - public static final String versionId = - "$Id: DatabaseTransaction.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (DatabaseTransaction.class); diff --git a/ccm-core/src/com/arsdigita/kernel/EmailAddress.java b/ccm-core/src/com/arsdigita/kernel/EmailAddress.java index 2ca2f8cd4..d5aaf97a9 100755 --- a/ccm-core/src/com/arsdigita/kernel/EmailAddress.java +++ b/ccm-core/src/com/arsdigita/kernel/EmailAddress.java @@ -47,12 +47,9 @@ import com.arsdigita.persistence.DataObject; * * @author Oumi Mehrotra * @version $Id: EmailAddress.java 738 2005-09-01 12:36:52Z sskracic $ - **/ - + */ public class EmailAddress { - public static final String versionId = "$Id: EmailAddress.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private String m_emailAddress; private EmailAddressRecord m_emailRecord; diff --git a/ccm-core/src/com/arsdigita/kernel/GroupCollection.java b/ccm-core/src/com/arsdigita/kernel/GroupCollection.java index 5be1b1dc4..3e2f4fbe0 100755 --- a/ccm-core/src/com/arsdigita/kernel/GroupCollection.java +++ b/ccm-core/src/com/arsdigita/kernel/GroupCollection.java @@ -25,12 +25,8 @@ import com.arsdigita.persistence.DataCollection; * * @author Phong Nguyen * @version 1.0 - **/ + */ public class GroupCollection extends PartyCollection { - public static final String versionId = - "$Id: GroupCollection.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; /** * Constructor. diff --git a/ccm-core/src/com/arsdigita/kernel/HashPasswords.java b/ccm-core/src/com/arsdigita/kernel/HashPasswords.java index f82d56618..f422a45d2 100755 --- a/ccm-core/src/com/arsdigita/kernel/HashPasswords.java +++ b/ccm-core/src/com/arsdigita/kernel/HashPasswords.java @@ -24,7 +24,6 @@ import org.apache.log4j.Logger; public class HashPasswords { - public static final String versionId = "$Id: HashPasswords.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(HashPasswords.class); diff --git a/ccm-core/src/com/arsdigita/kernel/KernelDispatcherServlet.java b/ccm-core/src/com/arsdigita/kernel/KernelDispatcherServlet.java index 13080a644..45740fe89 100755 --- a/ccm-core/src/com/arsdigita/kernel/KernelDispatcherServlet.java +++ b/ccm-core/src/com/arsdigita/kernel/KernelDispatcherServlet.java @@ -36,9 +36,6 @@ import org.apache.log4j.Logger; */ public abstract class KernelDispatcherServlet extends BaseDispatcherServlet { - public static final String versionId = - "$Id: KernelDispatcherServlet.java 287 2005-02-22 00:29:02Z sskracic $"; - private static final Logger s_cat = Logger.getLogger(KernelDispatcherServlet.class.getName()); diff --git a/ccm-core/src/com/arsdigita/kernel/KernelException.java b/ccm-core/src/com/arsdigita/kernel/KernelException.java index 17fb970be..de1104c92 100755 --- a/ccm-core/src/com/arsdigita/kernel/KernelException.java +++ b/ccm-core/src/com/arsdigita/kernel/KernelException.java @@ -26,9 +26,6 @@ package com.arsdigita.kernel; */ public class KernelException extends Exception { - public static final String versionId = "$Id: KernelException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - - public KernelException() { super(); } diff --git a/ccm-core/src/com/arsdigita/kernel/NoValidURLException.java b/ccm-core/src/com/arsdigita/kernel/NoValidURLException.java index 33a7683ec..5bea40bf7 100755 --- a/ccm-core/src/com/arsdigita/kernel/NoValidURLException.java +++ b/ccm-core/src/com/arsdigita/kernel/NoValidURLException.java @@ -26,9 +26,6 @@ package com.arsdigita.kernel; */ public class NoValidURLException extends URLServiceException { - public static final String versionId = "$Id: NoValidURLException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - - public NoValidURLException() { super(); } diff --git a/ccm-core/src/com/arsdigita/kernel/PartyCollection.java b/ccm-core/src/com/arsdigita/kernel/PartyCollection.java index bbb6b3887..48cd65a8e 100755 --- a/ccm-core/src/com/arsdigita/kernel/PartyCollection.java +++ b/ccm-core/src/com/arsdigita/kernel/PartyCollection.java @@ -29,8 +29,6 @@ import com.arsdigita.persistence.Filter; **/ public class PartyCollection extends ACSObjectCollection { - public static final String versionId = "$Id: PartyCollection.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/PersonName.java b/ccm-core/src/com/arsdigita/kernel/PersonName.java index 0da30490d..9135e653b 100755 --- a/ccm-core/src/com/arsdigita/kernel/PersonName.java +++ b/ccm-core/src/com/arsdigita/kernel/PersonName.java @@ -42,8 +42,6 @@ import org.apache.log4j.Logger; **/ public class PersonName extends DomainObject { - public static final String versionId = "$Id: PersonName.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final String m_baseDataObjectType = "com.arsdigita.kernel.PersonName"; diff --git a/ccm-core/src/com/arsdigita/kernel/ResourceTypeConfig.java b/ccm-core/src/com/arsdigita/kernel/ResourceTypeConfig.java index 21fab1126..4a5560303 100755 --- a/ccm-core/src/com/arsdigita/kernel/ResourceTypeConfig.java +++ b/ccm-core/src/com/arsdigita/kernel/ResourceTypeConfig.java @@ -42,7 +42,7 @@ import org.apache.log4j.Logger; * @see ResourceConfigFormSection * @see com.arsdigita.kernel.Resource * @author Justin Ross - * @version $Id: ResourceTypeConfig.java 1270 2006-07-18 13:34:55Z cgyg9330 $ + * @version $Id: ResourceTypeConfig.java 1942 2009-05-29 07:53:23Z terry $ */ public class ResourceTypeConfig { diff --git a/ccm-core/src/com/arsdigita/kernel/RoleCollection.java b/ccm-core/src/com/arsdigita/kernel/RoleCollection.java index 57a647b55..81b587d19 100755 --- a/ccm-core/src/com/arsdigita/kernel/RoleCollection.java +++ b/ccm-core/src/com/arsdigita/kernel/RoleCollection.java @@ -29,11 +29,9 @@ import com.arsdigita.persistence.DataCollection; * * @author Michael Bryzek * @version 1.0 - **/ + */ public class RoleCollection extends DomainCollection { - public static final String versionId = "$Id: RoleCollection.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/URLFinderNotFoundException.java b/ccm-core/src/com/arsdigita/kernel/URLFinderNotFoundException.java index 0dcb4f9b7..f7c148920 100755 --- a/ccm-core/src/com/arsdigita/kernel/URLFinderNotFoundException.java +++ b/ccm-core/src/com/arsdigita/kernel/URLFinderNotFoundException.java @@ -26,9 +26,6 @@ package com.arsdigita.kernel; */ public class URLFinderNotFoundException extends URLServiceException { - public static final String versionId = "$Id: URLFinderNotFoundException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - - public URLFinderNotFoundException() { super(); } diff --git a/ccm-core/src/com/arsdigita/kernel/URLServiceException.java b/ccm-core/src/com/arsdigita/kernel/URLServiceException.java index a321fce0c..151191c1e 100755 --- a/ccm-core/src/com/arsdigita/kernel/URLServiceException.java +++ b/ccm-core/src/com/arsdigita/kernel/URLServiceException.java @@ -26,9 +26,6 @@ package com.arsdigita.kernel; */ public class URLServiceException extends RuntimeException { - public static final String versionId = "$Id: URLServiceException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - - public URLServiceException() { super(); } diff --git a/ccm-core/src/com/arsdigita/kernel/permissions/UniversalPermissionDescriptor.java b/ccm-core/src/com/arsdigita/kernel/permissions/UniversalPermissionDescriptor.java index 1e17bf91c..0368ea4ed 100755 --- a/ccm-core/src/com/arsdigita/kernel/permissions/UniversalPermissionDescriptor.java +++ b/ccm-core/src/com/arsdigita/kernel/permissions/UniversalPermissionDescriptor.java @@ -31,11 +31,10 @@ import com.arsdigita.persistence.OID; * @see com.arsdigita.kernel.permissions.PermissionDescriptor * @see com.arsdigita.kernel.permissions.PrivilegeDescriptor * @see com.arsdigita.kernel.permissions.PermissionService - **/ + * @version $Id: UniversalPermissionDescriptor.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class UniversalPermissionDescriptor extends PermissionDescriptor { - public static final String versionId = "$Id: UniversalPermissionDescriptor.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - static final OID ROOT_CONTEXT_OID = new OID("com.arsdigita.kernel.ACSObject", 0); diff --git a/ccm-core/src/com/arsdigita/kernel/security/HTTPRequestCallback.java b/ccm-core/src/com/arsdigita/kernel/security/HTTPRequestCallback.java index 74142bfcd..526ec0fda 100755 --- a/ccm-core/src/com/arsdigita/kernel/security/HTTPRequestCallback.java +++ b/ccm-core/src/com/arsdigita/kernel/security/HTTPRequestCallback.java @@ -25,10 +25,10 @@ import javax.servlet.http.HttpServletRequest; * Callback to retrieve the current HttpServletRequest. * * @author Sameer Ajmani - **/ + * @version $Id: HTTPRequestCallback.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class HTTPRequestCallback implements Callback { - public static final String versionId = "$Id: HTTPRequestCallback.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private HttpServletRequest m_request; /** diff --git a/ccm-core/src/com/arsdigita/kernel/security/HTTPResponseCallback.java b/ccm-core/src/com/arsdigita/kernel/security/HTTPResponseCallback.java index c15f5b1c8..ac3d0b709 100755 --- a/ccm-core/src/com/arsdigita/kernel/security/HTTPResponseCallback.java +++ b/ccm-core/src/com/arsdigita/kernel/security/HTTPResponseCallback.java @@ -25,10 +25,10 @@ import javax.servlet.http.HttpServletResponse; * Callback to retrieve the current HttpServletResponse. * * @author Sameer Ajmani - **/ + * @version $Id: HTTPResponseCallback.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class HTTPResponseCallback implements Callback { - public static final String versionId = "$Id: HTTPResponseCallback.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private HttpServletResponse m_response; /** diff --git a/ccm-core/src/com/arsdigita/kernel/security/LifetimeCallback.java b/ccm-core/src/com/arsdigita/kernel/security/LifetimeCallback.java index 71dc54dd2..a8fb86857 100755 --- a/ccm-core/src/com/arsdigita/kernel/security/LifetimeCallback.java +++ b/ccm-core/src/com/arsdigita/kernel/security/LifetimeCallback.java @@ -28,7 +28,6 @@ import javax.security.auth.callback.Callback; **/ public class LifetimeCallback implements Callback { - public static final String versionId = "$Id: LifetimeCallback.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private boolean m_forever; /** diff --git a/ccm-core/src/com/arsdigita/kernel/security/MappingLoginModule.java b/ccm-core/src/com/arsdigita/kernel/security/MappingLoginModule.java index 215015815..ff69d9ea3 100755 --- a/ccm-core/src/com/arsdigita/kernel/security/MappingLoginModule.java +++ b/ccm-core/src/com/arsdigita/kernel/security/MappingLoginModule.java @@ -34,10 +34,9 @@ import org.apache.log4j.Logger; * PasswordLoginModule. * * @author Sameer Ajmani - **/ + */ public abstract class MappingLoginModule implements LoginModule { - public static final String versionId = "$Id: MappingLoginModule.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(MappingLoginModule.class.getName()); diff --git a/ccm-core/src/com/arsdigita/kernel/security/ParanoidSecurityHelper.java b/ccm-core/src/com/arsdigita/kernel/security/ParanoidSecurityHelper.java index d157f1032..55b67e789 100755 --- a/ccm-core/src/com/arsdigita/kernel/security/ParanoidSecurityHelper.java +++ b/ccm-core/src/com/arsdigita/kernel/security/ParanoidSecurityHelper.java @@ -29,15 +29,14 @@ import javax.servlet.http.HttpServletRequest; * * @author Sameer Ajmani * @see SecurityHelper - **/ + */ public class ParanoidSecurityHelper extends DefaultSecurityHelper { - public static final String versionId = "$Id: ParanoidSecurityHelper.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Always returns true (to simulate secure conditions). * * @return true. - **/ + */ public boolean isSecure(HttpServletRequest req) { return true; } diff --git a/ccm-core/src/com/arsdigita/kernel/security/PartyPrincipal.java b/ccm-core/src/com/arsdigita/kernel/security/PartyPrincipal.java index 9af2e4119..3179752e1 100755 --- a/ccm-core/src/com/arsdigita/kernel/security/PartyPrincipal.java +++ b/ccm-core/src/com/arsdigita/kernel/security/PartyPrincipal.java @@ -25,14 +25,13 @@ import java.security.Principal; * A Principal that stores a numeric ID, such as a party ID. * * @author Sameer Ajmani - **/ + */ public class PartyPrincipal implements Principal { - public static final String versionId = "$Id: PartyPrincipal.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private BigDecimal m_id; /** * Creates a new PartyPrincipal that stores the given ID. - **/ + */ public PartyPrincipal(BigDecimal id) { m_id = id; } @@ -40,7 +39,7 @@ public class PartyPrincipal implements Principal { * Returns the stored ID. * * @return the stored ID. - **/ + */ public BigDecimal getID() { return m_id; } @@ -48,7 +47,7 @@ public class PartyPrincipal implements Principal { * Returns the ID number as a string. * * @return the ID number as a string. - **/ + */ public String getName() { return m_id.toString(); } @@ -66,7 +65,7 @@ public class PartyPrincipal implements Principal { * * @return true if the given object is a * PartyPrincipal with the same ID. - **/ + */ public boolean equals(Object that) { return (that instanceof PartyPrincipal) && this.m_id.equals(((PartyPrincipal)that).m_id); @@ -75,7 +74,7 @@ public class PartyPrincipal implements Principal { * Returns the hashCode of the stored ID number. * * @return the hashCode of the stored ID number. - **/ + */ public int hashCode() { return this.m_id.hashCode(); } diff --git a/ccm-core/src/com/arsdigita/kernel/ui/Globalized.java b/ccm-core/src/com/arsdigita/kernel/ui/Globalized.java index 3082870b6..fe2eaebab 100755 --- a/ccm-core/src/com/arsdigita/kernel/ui/Globalized.java +++ b/ccm-core/src/com/arsdigita/kernel/ui/Globalized.java @@ -39,7 +39,6 @@ package com.arsdigita.kernel.ui; * @version $Revision: #6 $ $Date: 2004/08/16 $ */ public interface Globalized extends com.arsdigita.globalization.Globalized { - public final static String versionId = "$Id: Globalized.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public static final String BUNDLE_NAME = "com.arsdigita.kernel/ui/KernelResources"; diff --git a/ccm-core/src/com/arsdigita/kernel/ui/ResourceConfigComponent.java b/ccm-core/src/com/arsdigita/kernel/ui/ResourceConfigComponent.java index 28fcb4485..531318321 100755 --- a/ccm-core/src/com/arsdigita/kernel/ui/ResourceConfigComponent.java +++ b/ccm-core/src/com/arsdigita/kernel/ui/ResourceConfigComponent.java @@ -40,10 +40,6 @@ import org.apache.log4j.Logger; * @author Daniel Berrange <berrange@redhat.com> */ public class ResourceConfigComponent extends SimpleContainer { - public static final String versionId = - "$Id: ResourceConfigComponent.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (ResourceConfigComponent.class); diff --git a/ccm-core/test/src/com/arsdigita/runtime/RuntimeSuite.java b/ccm-core/test/src/com/arsdigita/runtime/RuntimeSuite.java index a0fbb49f0..289cf52f7 100755 --- a/ccm-core/test/src/com/arsdigita/runtime/RuntimeSuite.java +++ b/ccm-core/test/src/com/arsdigita/runtime/RuntimeSuite.java @@ -26,11 +26,8 @@ import junit.framework.Test; * * @version $Id: RuntimeSuite.java 750 2005-09-02 12:38:44Z sskracic $ */ - public class RuntimeSuite extends PackageTestSuite { - public static final String versionId = "$Id: RuntimeSuite.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public static Test suite() { RuntimeSuite suite = new RuntimeSuite(); populateSuite(suite); diff --git a/ccm-core/test/src/com/arsdigita/runtime/StartupTest.java b/ccm-core/test/src/com/arsdigita/runtime/StartupTest.java index 1b9b22d9c..1b38f6c4f 100755 --- a/ccm-core/test/src/com/arsdigita/runtime/StartupTest.java +++ b/ccm-core/test/src/com/arsdigita/runtime/StartupTest.java @@ -27,8 +27,6 @@ import junit.framework.TestCase; public class StartupTest extends TestCase { - public static final String versionId = "$Id: StartupTest.java 752 2005-09-02 12:55:24Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public StartupTest(String name) { super(name); } diff --git a/ccm-core/test/src/com/arsdigita/search/intermedia/SearchIndexHelpTest.java b/ccm-core/test/src/com/arsdigita/search/intermedia/SearchIndexHelpTest.java index b0c94d564..ad4f1a754 100755 --- a/ccm-core/test/src/com/arsdigita/search/intermedia/SearchIndexHelpTest.java +++ b/ccm-core/test/src/com/arsdigita/search/intermedia/SearchIndexHelpTest.java @@ -40,7 +40,6 @@ import org.apache.log4j.Logger; * @version 1.0 **/ public class SearchIndexHelpTest extends TestCase { - public static final String versionId = "$Id: SearchIndexHelpTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // Creates a s_logging category with name = to the full name of class private static Logger s_log = diff --git a/ccm-core/test/src/com/arsdigita/search/intermedia/SearchSuite.java b/ccm-core/test/src/com/arsdigita/search/intermedia/SearchSuite.java index 0aa41b948..9a75e5f34 100755 --- a/ccm-core/test/src/com/arsdigita/search/intermedia/SearchSuite.java +++ b/ccm-core/test/src/com/arsdigita/search/intermedia/SearchSuite.java @@ -31,9 +31,9 @@ import junit.framework.TestSuite; * * @author Daniel Berrange * @version 1.0 - **/ + */ public class SearchSuite extends PackageTestSuite { - public static final String versionId = "$Id: SearchSuite.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; + public SearchSuite() { super(); } diff --git a/ccm-core/test/src/com/arsdigita/search/intermedia/SearchTestAuthor.java b/ccm-core/test/src/com/arsdigita/search/intermedia/SearchTestAuthor.java index 5401dce4c..b93e85a62 100755 --- a/ccm-core/test/src/com/arsdigita/search/intermedia/SearchTestAuthor.java +++ b/ccm-core/test/src/com/arsdigita/search/intermedia/SearchTestAuthor.java @@ -35,7 +35,6 @@ import com.arsdigita.persistence.OID; * @author Jeff Teeters **/ public class SearchTestAuthor extends ACSObject { - public static final String versionId = "$Id: SearchTestAuthor.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // Chapters associated with this author DataAssociation m_chapters = null; diff --git a/ccm-core/test/src/com/arsdigita/search/intermedia/SearchTestBook.java b/ccm-core/test/src/com/arsdigita/search/intermedia/SearchTestBook.java index 44eb94d12..c004fdc86 100755 --- a/ccm-core/test/src/com/arsdigita/search/intermedia/SearchTestBook.java +++ b/ccm-core/test/src/com/arsdigita/search/intermedia/SearchTestBook.java @@ -34,9 +34,8 @@ import java.math.BigDecimal; * for related objects. * * @author Jeff Teeters - **/ + */ public class SearchTestBook extends ACSObject { - public static final String versionId = "$Id: SearchTestBook.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // Chapters associated with this book DataAssociation m_chapters = null; diff --git a/ccm-core/test/src/com/arsdigita/search/intermedia/SearchTestBookH.java b/ccm-core/test/src/com/arsdigita/search/intermedia/SearchTestBookH.java index 6f0e033a6..249f400ae 100755 --- a/ccm-core/test/src/com/arsdigita/search/intermedia/SearchTestBookH.java +++ b/ccm-core/test/src/com/arsdigita/search/intermedia/SearchTestBookH.java @@ -34,7 +34,6 @@ import com.arsdigita.persistence.OID; * @author Jeff Teeters **/ public class SearchTestBookH extends SearchableACSObject { - public static final String versionId = "$Id: SearchTestBookH.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // Chapters associated with this book DataAssociation m_chapters = null; diff --git a/ccm-core/test/src/com/arsdigita/search/intermedia/SearchTestChapter.java b/ccm-core/test/src/com/arsdigita/search/intermedia/SearchTestChapter.java index 1379ab278..8d115a3b2 100755 --- a/ccm-core/test/src/com/arsdigita/search/intermedia/SearchTestChapter.java +++ b/ccm-core/test/src/com/arsdigita/search/intermedia/SearchTestChapter.java @@ -33,9 +33,8 @@ import com.arsdigita.persistence.OID; * (gathering content to index for related objects). * * @author Jeff Teeters - **/ + */ public class SearchTestChapter extends ACSObject { - public static final String versionId = "$Id: SearchTestChapter.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.search.intermedia.SearchTestChapter"; diff --git a/ccm-forum/src/com/arsdigita/forum/ui/ThreadsList.java b/ccm-forum/src/com/arsdigita/forum/ui/ThreadsList.java index 5f9c012f2..22d468332 100755 --- a/ccm-forum/src/com/arsdigita/forum/ui/ThreadsList.java +++ b/ccm-forum/src/com/arsdigita/forum/ui/ThreadsList.java @@ -58,6 +58,11 @@ public class ThreadsList extends SimpleComponent implements Constants { /** Default max number of threads (rows) per page */ private int m_pageSize = 15; + /** + * + * @param p + */ + @Override public void register(Page p) { super.register(p); @@ -92,6 +97,7 @@ public class ThreadsList extends SimpleComponent implements Constants { * @param state * @param parent */ + @Override public void generateXML(PageState state, Element parent) { // Begin of thread list, XSL constructs (and localizes) the list title bar diff --git a/ccm-forum/src/com/arsdigita/forum/ui/ThreadsPanel.java b/ccm-forum/src/com/arsdigita/forum/ui/ThreadsPanel.java index 57ac7ecd7..7b2e74fae 100755 --- a/ccm-forum/src/com/arsdigita/forum/ui/ThreadsPanel.java +++ b/ccm-forum/src/com/arsdigita/forum/ui/ThreadsPanel.java @@ -144,7 +144,8 @@ public class ThreadsPanel extends SimpleContainer Container forumOptions = new SimpleContainer( FORUM_XML_PREFIX + ":forumOptions", Constants.FORUM_XML_NS); // XXX APLAWS standard theme currently (2010-09) does not use the label! - m_newThreadLink = new ToggleLink(new Label(GlobalizationUtil.gz("forum.ui.thread.newPost"))); + m_newThreadLink = new ToggleLink(new Label(GlobalizationUtil.gz( + "forum.ui.thread.newPost"))); m_newThreadLink.setClassAttr("actionLink"); // chris.gilbert@westsussex.gov.uk - security container added @@ -168,9 +169,7 @@ public class ThreadsPanel extends SimpleContainer TopicSelector topics = new TopicSelector(); forums.add(topics); - ThreadsList threads - = new ThreadsList(); - + ThreadsList threads = new ThreadsList(); forums.add(threads); return forums; diff --git a/ccm-sci-bundle/bundles/devel/cfg/project.xml b/ccm-sci-bundle/bundles/devel/cfg/project.xml index 96668833e..4b7a00a37 100644 --- a/ccm-sci-bundle/bundles/devel/cfg/project.xml +++ b/ccm-sci-bundle/bundles/devel/cfg/project.xml @@ -164,14 +164,18 @@ + - - + + +