diff --git a/ccm-core/src/com/arsdigita/web/URL.java b/ccm-core/src/com/arsdigita/web/URL.java index 558136c12..8bb38723c 100755 --- a/ccm-core/src/com/arsdigita/web/URL.java +++ b/ccm-core/src/com/arsdigita/web/URL.java @@ -305,6 +305,12 @@ public class URL { params); } + /** + * (private) Constructor. + * + * @param sreq + * @param params + */ private URL(final HttpServletRequest sreq, final ParameterMap params) { final String dispatcherPrefix = @@ -322,7 +328,7 @@ public class URL { } /** - *

Produce a URL representation of the given request.

+ *

Constructor, produce a URL representation of the given request.

* * @param sreq an HttpServletRequest from which to copy * diff --git a/ccm-ldn-subsite/src/com/arsdigita/london/subsite/package.html b/ccm-ldn-subsite/src/com/arsdigita/london/subsite/package.html new file mode 100644 index 000000000..db991135d --- /dev/null +++ b/ccm-ldn-subsite/src/com/arsdigita/london/subsite/package.html @@ -0,0 +1,29 @@ + + + + + Package com.arsdigita.london.subsite + + + + TODO write content + + Konfiguration Filter Ausdruck in web.xml: OHNE ccm-prefix. also + 
+        
+        subsite
+        com.arsdigita.london.subsite.SubsiteFilter
+    
+
+    
+        subsite
+        /*
+        Falsch wäre:
+        /ccm/*
+    
+
+ + diff --git a/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/ACSObjectCategoryPicker.java b/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/ACSObjectCategoryPicker.java index bd9aa6e78..8b6f6ef93 100644 --- a/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/ACSObjectCategoryPicker.java +++ b/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/ACSObjectCategoryPicker.java @@ -59,7 +59,7 @@ public abstract class ACSObjectCategoryPicker extends SimpleContainer { private BigDecimalParameter m_root; public ACSObjectCategoryPicker(BigDecimalParameter root, - StringParameter mode) { + StringParameter mode) { m_form = getForm(root, mode); m_root = root; @@ -68,7 +68,8 @@ public abstract class ACSObjectCategoryPicker extends SimpleContainer { m_form.addCompletionListener(new ItemCategoryFormCompletion()); } - protected abstract ACSObjectCategoryForm getForm(BigDecimalParameter root, StringParameter mode); + protected abstract ACSObjectCategoryForm getForm(BigDecimalParameter root, + StringParameter mode); protected abstract ACSObject getObject(PageState state); diff --git a/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/CategorySubtree.java b/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/CategorySubtree.java index c5a8082a3..b5b5654e0 100644 --- a/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/CategorySubtree.java +++ b/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/CategorySubtree.java @@ -18,6 +18,10 @@ import com.arsdigita.xml.Element; /** * Generate part of the category tree. Used by Assign Category authoring step. + * + * Class is directlyx used by JSP page(s), eg. load-cat.jsp + * (currently in ~/packages/content-section/www/admin, source in ccm-ldn-aplaws + * or corresponding integration module). * * @author Alan Pevec */ @@ -51,7 +55,8 @@ public class CategorySubtree extends SimpleComponent { String[] pathElements = StringUtils.split(node, "-"); Category root = (Category) DomainObjectFactory.newInstance(new OID( - Category.BASE_DATA_OBJECT_TYPE, new BigDecimal(pathElements[pathElements.length - 1]))); + Category.BASE_DATA_OBJECT_TYPE, + new BigDecimal(pathElements[pathElements.length - 1]))); s_log.debug("generating subtree for cat " + root.getID()); TermWidget.generateSubtree(p, root); }