Anpassung ccm-gen-aplaws an Änderungen für forum-categorised.

git-svn-id: https://svn.libreccm.org/ccm/trunk@461 8810af33-2d31-482b-a856-94f89814c4df

ccm-gen-aplaws/src/ccm-gen-aplaws.config

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <registry>
+
+  <!--  currently nothing to config
    <config class="com.arsdigita.aplaws.AplawsConfig"
            storage="ccm-gen-aplaws/aplaws.properties"/>
+  -->
+
 </registry>

ccm-gen-aplaws/src/com/arsdigita/aplaws/AplawsConfig.java.nolongerInUse

@@ -23,31 +23,22 @@ import com.arsdigita.util.parameter.Parameter;
 import com.arsdigita.util.parameter.BooleanParameter;
 import com.arsdigita.util.parameter.StringParameter;
 
+
 /**
  * AplawsConfig
  *
  * @version $Revision: 1.2 $ $Date: 2005/01/07 19:01:40 $
+ * @version $Id: AplawsConfig.java 1565 2007-04-18 16:46:14Z apevec $
  */
-
 public class AplawsConfig extends AbstractConfig {
 
-    public final static String versionId = "$Id: AplawsConfig.java 1565 2007-04-18 16:46:14Z apevec $";
-
-	private final Parameter m_ajaxExpandAllBranches = new BooleanParameter(
-                "com.arsdigita.aplaws.ajax_expand_on_all_branches", 
-                Parameter.OPTIONAL, 
-                Boolean.FALSE);
 	
 
 
     public AplawsConfig() {
-        register(m_ajaxExpandAllBranches);
         loadInfo();
     }
 
     
     
-    public boolean ajaxExpandAllBranches () {
-    	return ((Boolean)get(m_ajaxExpandAllBranches)).booleanValue();
-    }
 }

ccm-gen-aplaws/src/com/arsdigita/aplaws/AplawsConfig_parameter.properties

@@ -1,4 +0,0 @@
-com.arsdigita.aplaws.ajax_expand_on_all_branches.title=Use Ajax on all branch expansions
-com.arsdigita.aplaws.ajax_expand_on_all_branches.purpose=Use Ajax on all branches, or bring back entire subtree on expansion of top level root
-com.arsdigita.aplaws.ajax_expand_on_all_branches.example=true|false
-com.arsdigita.aplaws.ajax_expand_on_all_branches.format=[boolean]

ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java

@@ -18,9 +18,7 @@
 
 package com.arsdigita.aplaws;
 
-import com.arsdigita.london.navigation.Navigation;
 import com.arsdigita.london.navigation.Template;
-import com.arsdigita.london.navigation.TemplateMapping;
 import com.arsdigita.london.terms.Domain;
 import com.arsdigita.london.terms.importer.Parser;
 import com.arsdigita.london.portal.PageLayout;
@@ -37,19 +35,19 @@ import com.arsdigita.kernel.RoleCollection;
 import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
 import com.arsdigita.persistence.DataQuery;
 import com.arsdigita.runtime.ScriptContext;
-import com.arsdigita.util.Assert;
+// import com.arsdigita.util.Assert;
-import com.arsdigita.util.UncheckedWrapperException;
+// import com.arsdigita.util.UncheckedWrapperException;
-import com.arsdigita.util.parameter.BooleanParameter;
+// import com.arsdigita.util.parameter.BooleanParameter;
 import com.arsdigita.util.parameter.Parameter;
 import com.arsdigita.util.parameter.StringParameter;
-import com.arsdigita.util.parameter.URLParameter;
+// import com.arsdigita.util.parameter.URLParameter;
 import com.arsdigita.web.Application;
 
 import org.apache.log4j.Logger;
 
-import java.net.URL;
+// import java.net.URL;
-import java.net.MalformedURLException;
+// import java.net.MalformedURLException;
-import java.util.Date;
+// import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;

ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/ACSObjectCategoryPicker.java.nolongerInUse

@@ -18,15 +18,12 @@
 
 package com.arsdigita.aplaws.ui;
 
-import com.arsdigita.aplaws.Aplaws;
-import com.arsdigita.bebop.Label;
 import com.arsdigita.bebop.SimpleContainer;
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.parameters.StringParameter;
 import com.arsdigita.bebop.parameters.BigDecimalParameter;
 import com.arsdigita.bebop.event.ActionEvent;
 import com.arsdigita.bebop.event.ActionListener;
-import com.arsdigita.bebop.form.Widget;
 import com.arsdigita.persistence.SessionManager;
 import com.arsdigita.persistence.DataCollection;
 import com.arsdigita.domain.DomainCollection;
@@ -35,9 +32,6 @@ import com.arsdigita.kernel.ACSObject;
 import com.arsdigita.london.terms.Term;
 import com.arsdigita.london.terms.Domain;
 import com.arsdigita.categorization.ui.ACSObjectCategoryForm;
-import com.arsdigita.cms.ContentItem;
-import com.arsdigita.cms.CMS;
-import com.arsdigita.cms.ui.authoring.ItemCategoryForm;
 
 import java.util.Collection;
 import java.util.List;

ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/CategorySubtree.java.nolongerInUse

@@ -1,8 +1,8 @@
 package com.arsdigita.aplaws.ui;
 
 import java.math.BigDecimal;
-import java.util.Iterator;
+// import java.util.Iterator;
-import java.util.Map;
+// import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
@@ -10,8 +10,8 @@ import org.apache.log4j.Logger;
 import com.arsdigita.bebop.Page;
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.SimpleComponent;
-import com.arsdigita.bebop.parameters.BigDecimalParameter;
+// import com.arsdigita.bebop.parameters.BigDecimalParameter;
-import com.arsdigita.bebop.parameters.IntegerParameter;
+// import com.arsdigita.bebop.parameters.IntegerParameter;
 import com.arsdigita.bebop.parameters.StringParameter;
 import com.arsdigita.categorization.Category;
 import com.arsdigita.domain.DomainObjectFactory;
@@ -22,12 +22,14 @@ import com.arsdigita.xml.Element;
  * Generate part of the category tree. Used by Assign Category authoring step.
  * 
  * @author Alan Pevec
+ * @deprecated use com.arsdigita.london.terms.ui.CategorySubtree  instead.
  */
 public class CategorySubtree extends SimpleComponent {
 
     StringParameter nodeIDparam = new StringParameter("nodeID");
     
 	private static Logger s_log = Logger.getLogger(CategorySubtree.class);
+
     public void register(Page p) {
         super.register(p);
         p.addGlobalStateParam(nodeIDparam);

ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java

@@ -28,6 +28,8 @@ import com.arsdigita.cms.CMS;
 import com.arsdigita.cms.ContentItem;
 import com.arsdigita.cms.ui.authoring.*;
 import com.arsdigita.kernel.ACSObject;
+import com.arsdigita.london.terms.ui.ACSObjectCategoryPicker;
+import com.arsdigita.london.terms.ui.TermWidget;
 
 /**
  * <p> cms specific Concrete implementation of 
@@ -41,13 +43,14 @@ import com.arsdigita.kernel.ACSObject;
 
 
 public class ItemCategoryPicker extends ACSObjectCategoryPicker {
-    private static final Logger s_log = Logger.getLogger(ItemCategoryPicker.class);
 
+    private static final Logger s_log = Logger.getLogger(ItemCategoryPicker.class);
+    // private static final class s_picker =  this ;
    
     public ItemCategoryPicker(BigDecimalParameter root,
                               StringParameter mode) {
-                      super(root, mode);
+        super(root, mode);
-           s_log.debug("instantiating ItemCategoryPicker");
+        s_log.debug("instantiating ItemCategoryPicker");
         
     }
 
@@ -57,9 +60,10 @@ public class ItemCategoryPicker extends ACSObjectCategoryPicker {
                          com.arsdigita.bebop.parameters.BigDecimalParameter, 
                          com.arsdigita.bebop.parameters.StringParameter)
      */
-    protected ACSObjectCategoryForm getForm(BigDecimalParameter root, StringParameter mode) {
+    protected ACSObjectCategoryForm getForm(BigDecimalParameter root,
-	s_log.debug("getForm");
+                                            StringParameter mode) {
-	return new ItemCategoryForm(root, mode, new TermWidget(mode, this));
+        s_log.debug("getForm");
+        return new ItemCategoryForm(root, mode, new TermWidget(mode, this));
     }