From b48d60cd60ab16e10e3cc8f524b7289f705ba138 Mon Sep 17 00:00:00 2001 From: pb Date: Sun, 11 Dec 2011 13:28:33 +0000 Subject: [PATCH] =?UTF-8?q?Nachhalten=20der=20=C3=84nderungen=20in=20subsi?= =?UTF-8?q?te=20in=20allgemeinen=20Modulen,=20verschiedene=20Formatierunge?= =?UTF-8?q?n,=20Dokumentation.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@1333 8810af33-2d31-482b-a856-94f89814c4df --- .../src/com/arsdigita/domain/DomainQuery.java | 4 +- .../kernel/ui/ACSObjectSelectionModel.java | 45 ++++++++++--------- ccm-core/src/log4j.properties | 2 +- ccm-forum/doc/semantic-XML-plan.txt | 4 +- .../ui/HomepageWorkspaceSelectionModel.java | 2 +- .../london/atoz/AtoZCategoryProvider.java | 6 +-- .../arsdigita/portalworkspace/Workspace.java | 1 + .../ui/admin/ApplicationSelectionModel.java | 13 +++--- .../portalworkspace/ui/admin/PeoplePane.java | 7 +-- .../com/arsdigita/themedirector/Loader.java | 4 +- .../themedirector/ThemeDirector.java | 12 +++-- .../templates/ccm-themedirector/undoTheme.jsp | 2 +- .../themes/static/default/subsite-index.xsl | 2 +- 13 files changed, 54 insertions(+), 50 deletions(-) diff --git a/ccm-core/src/com/arsdigita/domain/DomainQuery.java b/ccm-core/src/com/arsdigita/domain/DomainQuery.java index 5283f3a8c..0131d83b3 100755 --- a/ccm-core/src/com/arsdigita/domain/DomainQuery.java +++ b/ccm-core/src/com/arsdigita/domain/DomainQuery.java @@ -27,8 +27,8 @@ import com.arsdigita.persistence.metadata.CompoundType; import java.util.Map; /** - * This is the base class that all other domain query classes - * would extend. It provides a facade on to a contained DataQuery. + * This is the base class that all other domain query classes would extend. + * It provides a facade on to a contained DataQuery. * * @see com.arsdigita.persistence.DataQuery * diff --git a/ccm-core/src/com/arsdigita/kernel/ui/ACSObjectSelectionModel.java b/ccm-core/src/com/arsdigita/kernel/ui/ACSObjectSelectionModel.java index ef794a3ae..bdf2a47f9 100755 --- a/ccm-core/src/com/arsdigita/kernel/ui/ACSObjectSelectionModel.java +++ b/ccm-core/src/com/arsdigita/kernel/ui/ACSObjectSelectionModel.java @@ -97,23 +97,27 @@ import org.apache.log4j.Logger; *

* Persistence Details: The default constructor of * ACSObjectSelectionModel will attempt to use the - * {@link DomainObjectFactory} to automatically instantiate the correct Java subclass - * of {@link ACSObject}. However, it is also possible to use an alternate constructor - * in order to force the ACSObjectSelectionModel to manually instantiate - * the objects: + * {@link DomainObjectFactory} to automatically instantiate the correct Java + * subclass of {@link ACSObject}. However, it is also possible to use an + * alternate constructor in order to force the ACSObjectSelectionModel + * to manually instantiate the objects: * - * 

ACSObjectSelectionModel model = new ACSObjectSelectionModel("com.arsdigita.cms.Article", "com.arsdigita.cms.Article", "item_id");
+ * 

+ * ACSObjectSelectionModel model = 
+ *     new ACSObjectSelectionModel("com.arsdigita.cms.Article", 
+ *                                 "com.arsdigita.cms.Article", "item_id");
+ *
* - * In this case, the model will attempt to use reflection to instantiate the correct - * subclass of ACSObject. In addition, the supplementary + * In this case, the model will attempt to use reflection to instantiate the + * correct subclass of ACSObject. In addition, the supplementary * constructor makes it possible to create new objects in the database * using the {@link #createACSObject(BigDecimal)} method. * - * @version $Id: ACSObjectSelectionModel.java 287 2005-02-22 00:29:02Z sskracic $ - * @author Stanislav Freidin * @see com.arsdigita.bebop.SingleSelectionModel * @see com.arsdigita.bebop.ParameterSingleSelectionModel * + * @author Stanislav Freidin + * @version $Id: ACSObjectSelectionModel.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ACSObjectSelectionModel implements DomainObjectSelectionModel { @@ -178,9 +182,9 @@ public class ACSObjectSelectionModel implements DomainObjectSelectionModel { * @param parameterName The name of the state parameter which will * be used to store the object ID. */ - public ACSObjectSelectionModel( - String javaClass, String objectType, String parameterName - ) { + public ACSObjectSelectionModel( String javaClass, + String objectType, + String parameterName ) { this(javaClass, objectType, new BigDecimalParameter(parameterName)); } @@ -197,9 +201,9 @@ public class ACSObjectSelectionModel implements DomainObjectSelectionModel { * @param parameter The state parameter which should be used to store * the object ID */ - public ACSObjectSelectionModel( - String javaClass, String objectType, BigDecimalParameter parameter - ) { + public ACSObjectSelectionModel( String javaClass, + String objectType, + BigDecimalParameter parameter ) { this(javaClass, objectType, new ParameterSingleSelectionModel(parameter)); } @@ -217,9 +221,9 @@ public class ACSObjectSelectionModel implements DomainObjectSelectionModel { * @param model The {@link SingleSelectionModel} which will supply * a {@link BigDecimal} ID of the currently selected object */ - public ACSObjectSelectionModel( - String javaClass, String objectType, SingleSelectionModel model - ) { + public ACSObjectSelectionModel( String javaClass, + String objectType, + SingleSelectionModel model ) { m_loaded = new RequestLocal() { protected Object initialValue(PageState state) { return Boolean.FALSE; @@ -232,9 +236,8 @@ public class ACSObjectSelectionModel implements DomainObjectSelectionModel { m_javaClass = Class.forName(javaClass); m_constructor = m_javaClass.getConstructor(new Class[]{OID.class}); } catch (Exception e) { - throw new UncheckedWrapperException( - "Problem loading class " + javaClass, e - ); + throw new UncheckedWrapperException( "Problem loading class " + + javaClass, e ); } } diff --git a/ccm-core/src/log4j.properties b/ccm-core/src/log4j.properties index 42d3a852c..261f1c1f4 100755 --- a/ccm-core/src/log4j.properties +++ b/ccm-core/src/log4j.properties @@ -167,7 +167,6 @@ log4j.logger.com.arsdigita.packaging.Loader=INFO #com.arsdigita.london.rss.RSSService=DEBUG #com.arsdigita.london.search.Search=DEBUG #com.arsdigita.london.shortcuts.Shortcuts=DEBUG -#com.arsdigita.london.subsite.Subsite=DEBUG #kea.stemmers.LovinsStemmer=DEBUG #kea.stemmers.StopwordsFrench=DEBUG #kea.stemmers.StopwordsSpanish=DEBUG @@ -182,3 +181,4 @@ log4j.logger.com.arsdigita.packaging.Loader=INFO #com.arsdigita.cms.contenttypes.SciMember=DEBUG #com.arsdigita.cms.webpage.installer.Initializer=DEBUG +#com.arsdigita.subsite.Subsite=DEBUG diff --git a/ccm-forum/doc/semantic-XML-plan.txt b/ccm-forum/doc/semantic-XML-plan.txt index 826e90e0d..9d26f695b 100755 --- a/ccm-forum/doc/semantic-XML-plan.txt +++ b/ccm-forum/doc/semantic-XML-plan.txt @@ -67,7 +67,7 @@ bebop List or Table class: This generates XML looking like: - + 30008 Another Site Some other stuff @@ -80,7 +80,7 @@ This generates XML looking like: /portal/some.example.com/ - + 32018 My Site Some stuff diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspaceSelectionModel.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspaceSelectionModel.java index a3d439d50..723550239 100755 --- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspaceSelectionModel.java +++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspaceSelectionModel.java @@ -31,7 +31,7 @@ import com.arsdigita.portalworkspace.Workspace; import com.arsdigita.portalworkspace.WorkspacePage; import com.arsdigita.portalworkspace.WorkspacePageCollection; -import com.arsdigita.london.subsite.Subsite; +import com.arsdigita.subsite.Subsite; import com.arsdigita.util.Assert; import com.arsdigita.util.UncheckedWrapperException; diff --git a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZCategoryProvider.java b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZCategoryProvider.java index 4a3ae1d2f..f6de515ed 100755 --- a/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZCategoryProvider.java +++ b/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZCategoryProvider.java @@ -24,9 +24,9 @@ import com.arsdigita.categorization.Category; import com.arsdigita.cms.ContentType; import com.arsdigita.domain.DomainCollection; import com.arsdigita.navigation.DataCollectionDefinition; -import com.arsdigita.london.subsite.Site; -import com.arsdigita.london.subsite.Subsite; -import com.arsdigita.london.subsite.SubsiteContext; +import com.arsdigita.subsite.Site; +import com.arsdigita.subsite.Subsite; +import com.arsdigita.subsite.SubsiteContext; import com.arsdigita.persistence.DataAssociation; import com.arsdigita.persistence.DataAssociationCursor; import com.arsdigita.persistence.DataObject; diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Workspace.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Workspace.java index 954a17d79..d9bacdcb5 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Workspace.java +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Workspace.java @@ -75,6 +75,7 @@ public class Workspace extends Application { /** Config object containing various parameter */ private static final WorkspaceConfig s_config = WorkspaceConfig.getConfig(); + /** Service method to provide client classes access to configuration. */ public static WorkspaceConfig getConfig() { return s_config; } diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationSelectionModel.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationSelectionModel.java index 385639c82..2c3b08d30 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationSelectionModel.java +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationSelectionModel.java @@ -26,21 +26,19 @@ import com.arsdigita.web.Application; import com.arsdigita.web.Web; /** - * This selection model has a default value which will be return when nothing is - * selected. + * This selection model adds an (optional?) default value which will be returned + * when nothing is selected. */ public class ApplicationSelectionModel extends ACSObjectSelectionModel { - // public static final BigDecimalParameter PARAM = - // (BigDecimalParameter)PermissionsPane.getObjectIDParam(); - public static final String DEFAULT_PARAM_NAME = "app_id"; private boolean m_hasDefaultValue; + /** Creates a s_logging category with name = full name of class */ private static final Logger s_log = Logger - .getLogger(ApplicationSelectionModel.class); + .getLogger(ApplicationSelectionModel.class); /** * Constructor @@ -112,6 +110,7 @@ public class ApplicationSelectionModel extends ACSObjectSelectionModel { * Override ACSObjectSelectionModel methods to default to the default * Application */ + @Override public boolean isSelected(PageState state) { if (m_hasDefaultValue && !super.isSelected(state)) { return (getDefaultApplication() != null); @@ -124,6 +123,7 @@ public class ApplicationSelectionModel extends ACSObjectSelectionModel { * @param state * @return */ + @Override public DomainObject getSelectedObject(PageState state) { if (m_hasDefaultValue && !super.isSelected(state)) { return getDefaultApplication(); @@ -137,6 +137,7 @@ public class ApplicationSelectionModel extends ACSObjectSelectionModel { * @param state * @return */ + @Override public Object getSelectedKey(PageState state) { if (m_hasDefaultValue && !super.isSelected(state)) { return getDefaultApplication(); diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/PeoplePane.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/PeoplePane.java index d32c97962..819a37303 100755 --- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/PeoplePane.java +++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/PeoplePane.java @@ -29,7 +29,7 @@ import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.GridPanel; import com.arsdigita.bebop.Label; import com.arsdigita.bebop.List; -import com.arsdigita.bebop.Page; +// import com.arsdigita.bebop.Page; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.RequestLocal; import com.arsdigita.bebop.SimpleContainer; @@ -48,10 +48,10 @@ import com.arsdigita.bebop.form.TextField; import com.arsdigita.bebop.form.Submit; import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.bebop.parameters.NotEmptyValidationListener; -import com.arsdigita.domain.DomainObject; +// import com.arsdigita.domain.DomainObject; import com.arsdigita.kernel.Group; import com.arsdigita.kernel.PartyCollection; -import com.arsdigita.kernel.ui.ACSObjectSelectionModel; +// import com.arsdigita.kernel.ui.ACSObjectSelectionModel; import com.arsdigita.kernel.Kernel; import com.arsdigita.kernel.KernelExcursion; import com.arsdigita.kernel.Role; @@ -70,6 +70,7 @@ import com.arsdigita.portalworkspace.ui.ParticipantBrowsePane; import com.arsdigita.portalworkspace.ui.PortalConstants; import com.arsdigita.london.util.ui.DomainObjectSelectionModel; import com.arsdigita.persistence.OID; +//? import com.arsdigita.toolbox.ui.ACSObjectCollectionListModel; import com.arsdigita.toolbox.ui.IteratorListModel; diff --git a/ccm-themedirector/src/com/arsdigita/themedirector/Loader.java b/ccm-themedirector/src/com/arsdigita/themedirector/Loader.java index aa5b2e89c..6819ab98d 100755 --- a/ccm-themedirector/src/com/arsdigita/themedirector/Loader.java +++ b/ccm-themedirector/src/com/arsdigita/themedirector/Loader.java @@ -32,6 +32,7 @@ import org.apache.log4j.Logger; * Loader. * * @author Randy Graebner <randyg@redhat.com> + * @author Peter Boy <pboy@barkhof.uni-bremen.de> * @version $Id: Loader.java 2004 2009-10-03 22:23:08Z pboy $ */ public class Loader extends PackageLoader implements ThemeDirectorConstants { @@ -59,8 +60,7 @@ public class Loader extends PackageLoader implements ThemeDirectorConstants { * to lower case. * Example: "Theme Director" will become "theme-director". * - * Creates an entry in table application_types and a corresponding entry in - * apm_package_types + * Creates an entry in table application_types */ private void setupThemeDirector() { diff --git a/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirector.java b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirector.java index bdbf32004..31a03a0fd 100755 --- a/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirector.java +++ b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirector.java @@ -31,6 +31,7 @@ import org.apache.log4j.Logger; */ public class ThemeDirector extends Application { + /** A logger instance, primarily to assist debugging . */ private static final Logger s_log = Logger.getLogger(ThemeDirector.class); public static final String DEFAULT_THEME = "defaultTheme"; @@ -38,14 +39,11 @@ public class ThemeDirector extends Application { public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.themedirector.ThemeDirector"; - public static ThemeDirectorConfig s_config = new ThemeDirectorConfig(); - - static { - s_log.debug("Static initalizer starting..."); - s_config.load(); - s_log.debug("Static initalizer finished."); - } + /** Config object containing various parameter */ + private static final ThemeDirectorConfig s_config = + ThemeDirectorConfig.getConfig(); + /** Service method to provide clients access to configuration. */ public static ThemeDirectorConfig getConfig() { return s_config; } diff --git a/ccm-themedirector/web/templates/ccm-themedirector/undoTheme.jsp b/ccm-themedirector/web/templates/ccm-themedirector/undoTheme.jsp index b4576a6b3..6f7e607e9 100755 --- a/ccm-themedirector/web/templates/ccm-themedirector/undoTheme.jsp +++ b/ccm-themedirector/web/templates/ccm-themedirector/undoTheme.jsp @@ -4,7 +4,7 @@ <%@ page import = "com.arsdigita.web.LoginSignal" %> <%@ page import = "org.apache.log4j.Logger" %> <%@ page import = "com.arsdigita.dispatcher.AccessDeniedException" %> -<%@ page import = "com.arsdigita.london.subsite.Site" %> +<%@ page import = "com.arsdigita.subsite.Site" %> <%@ page import = "java.math.BigDecimal" %> <%@ page import = "com.arsdigita.domain.DataObjectNotFoundException" %> <%@ page import = "com.arsdigita.persistence.SessionManager" %> diff --git a/ccm-themedirector/web/themes/static/default/subsite-index.xsl b/ccm-themedirector/web/themes/static/default/subsite-index.xsl index 129c2b22a..c1c407af3 100644 --- a/ccm-themedirector/web/themes/static/default/subsite-index.xsl +++ b/ccm-themedirector/web/themes/static/default/subsite-index.xsl @@ -3,6 +3,6 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" > - +