From 12246decb194ee2eec7c6fb650024c21349f6069 Mon Sep 17 00:00:00 2001 From: pb Date: Tue, 29 Mar 2011 12:28:01 +0000 Subject: [PATCH] Diverse Kleinigkeiten. git-svn-id: https://svn.libreccm.org/ccm/trunk@808 8810af33-2d31-482b-a856-94f89814c4df --- .../src/com/arsdigita/web/Application.java | 2 +- .../arsdigita/web/ApplicationFileServlet.java | 7 +++++-- .../web/DefaultApplicationFileResolver.java | 16 +++++++++++---- .../src/com/arsdigita/aplaws/Initializer.java | 1 + .../arsdigita/london/portal/Workspace.java | 4 ++++ .../web/packages/workspace/xsl/lib.xsl | 20 +++++++++---------- 6 files changed, 33 insertions(+), 17 deletions(-) diff --git a/ccm-core/src/com/arsdigita/web/Application.java b/ccm-core/src/com/arsdigita/web/Application.java index 77ad18198..625ae9f74 100755 --- a/ccm-core/src/com/arsdigita/web/Application.java +++ b/ccm-core/src/com/arsdigita/web/Application.java @@ -79,7 +79,7 @@ public class Application extends Resource { private static final String SLASH = "/"; public static final String BASE_DATA_OBJECT_TYPE = - "com.arsdigita.web.Application"; + "com.arsdigita.web.Application"; @Override protected String getBaseDataObjectType() { diff --git a/ccm-core/src/com/arsdigita/web/ApplicationFileServlet.java b/ccm-core/src/com/arsdigita/web/ApplicationFileServlet.java index 764819619..28a30bdb5 100755 --- a/ccm-core/src/com/arsdigita/web/ApplicationFileServlet.java +++ b/ccm-core/src/com/arsdigita/web/ApplicationFileServlet.java @@ -98,26 +98,29 @@ import org.apache.log4j.Logger; */ public class ApplicationFileServlet extends BaseApplicationServlet { + /** Logger instance for debugging */ private static Logger s_log = Logger.getLogger(ApplicationFileServlet.class); private String m_templatePath; private ApplicationFileResolver m_resolver; /** - * + * Servlet Standard Initializer. * @param config * @throws ServletException */ + @Override public void init(ServletConfig config) throws ServletException { super.init(config); + // init-param named template-path from ~/WEB-INF/web.xml m_templatePath = config.getInitParameter("template-path"); Assert.exists(m_templatePath, String.class); Assert.isTrue(m_templatePath.startsWith("/"), "template-path starts with '/'"); Assert.isTrue(!m_templatePath.endsWith("/"), - "template-path does not end with '/'"); + "template-path must not end with '/'"); String resolverName = config.getInitParameter("file-resolver"); diff --git a/ccm-core/src/com/arsdigita/web/DefaultApplicationFileResolver.java b/ccm-core/src/com/arsdigita/web/DefaultApplicationFileResolver.java index 62731ec00..9a752f168 100755 --- a/ccm-core/src/com/arsdigita/web/DefaultApplicationFileResolver.java +++ b/ccm-core/src/com/arsdigita/web/DefaultApplicationFileResolver.java @@ -34,14 +34,22 @@ public class DefaultApplicationFileResolver implements ApplicationFileResolver { private static Logger s_log = Logger.getLogger(DefaultApplicationFileResolver.class); + /** + * + * @param templatePath + * @param sreq + * @param sresp + * @param app + * @return + */ public RequestDispatcher resolve(String templatePath, HttpServletRequest sreq, HttpServletResponse sresp, Application app) { // XXX proper list of dependent & customization webapps to search String[] webapps = new String[] { - app.getContextPath(), "ROOT" - }; + app.getContextPath(), "ROOT" + }; String pathInfo = sreq.getPathInfo(); if (s_log.isDebugEnabled()) { @@ -61,8 +69,8 @@ public class DefaultApplicationFileResolver implements ApplicationFileResolver { } RequestDispatcher rd = Web.findResourceDispatcher( - webapps, - path + WELCOME_FILES[i]); + webapps, + path + WELCOME_FILES[i]); if (rd != null) { if (s_log.isDebugEnabled()) { s_log.debug("Got dispatcher " + rd); diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Initializer.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Initializer.java index 0b0a15964..3196b2d8a 100755 --- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Initializer.java +++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Initializer.java @@ -44,6 +44,7 @@ public class Initializer extends CompoundInitializer { * * @param evt */ + @Override public void init(DomainInitEvent evt) { super.init(evt); diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/Workspace.java b/ccm-ldn-portal/src/com/arsdigita/london/portal/Workspace.java index d0b9b0690..cf008825c 100755 --- a/ccm-ldn-portal/src/com/arsdigita/london/portal/Workspace.java +++ b/ccm-ldn-portal/src/com/arsdigita/london/portal/Workspace.java @@ -106,6 +106,7 @@ public class Workspace extends Application { * @return ServletPath (constant) probably should be synchron with web.xml * entry */ + @Override public String getServletPath() { // return "/files"; return "/ccm-ldn-portal/files"; @@ -238,6 +239,7 @@ public class Workspace extends Application { } + @Override public void beforeSave() { // If no permissions are configured, then setup empty groups if (get(PARTY) == null) { @@ -261,6 +263,7 @@ public class Workspace extends Application { // This method wouldn't need to exist if permissioning used // the associations rather than direct queries which require // the object to be saved + @Override public void afterSave() { super.afterSave(); @@ -371,6 +374,7 @@ public class Workspace extends Application { throw new DataObjectNotFoundException("cannot find workspace for party"); } + @Override public void delete() { clearPages(); diff --git a/ccm-ldn-portal/web/packages/workspace/xsl/lib.xsl b/ccm-ldn-portal/web/packages/workspace/xsl/lib.xsl index ac4b980a5..da0d87f10 100755 --- a/ccm-ldn-portal/web/packages/workspace/xsl/lib.xsl +++ b/ccm-ldn-portal/web/packages/workspace/xsl/lib.xsl @@ -46,7 +46,7 @@ - {$title} + {$title} @@ -151,16 +151,16 @@ - + - + - + @@ -172,12 +172,12 @@ - + - + @@ -185,7 +185,7 @@ - + @@ -197,14 +197,14 @@ - + - + - +