LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

Refactoring of already working files. 

Also adds new comments

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4509 8810af33-2d31-482b-a856-94f89814c4df
baka 2017-01-05 15:43:52 +00:00
parent 4556aac1d5
commit 8a9ce904e4
5 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ccm-cms/src/main/java/com/arsdigita/cms/ui/category/AddUseContextForm.java
View File

@ -88,10 +88,12 @@ class AddUseContextForm extends BaseForm {
ParameterData data = e.getParameterData(); ParameterData data = e.getParameterData();
final String name = (String) m_useContext.getValue(e.getPageState()); final String name = (String) m_useContext.getValue(e.getPageState());
if (true) {//Category.getRootForObject(CMS.getContext().getContentSection(),
// XXX Do a dupe check ala commented code below
//if (true) {//Category.getRootForObject(CMS.getContext().getContentSection(),
//name) != null) { //name) != null) {
data.addError(getError()); // data.addError(getError());
} //}
} }
} }
private class ProcessListener implements FormProcessListener { private class ProcessListener implements FormProcessListener {
@ -117,7 +119,7 @@ class AddUseContextForm extends BaseForm {
final ContentSection section = final ContentSection section =
CMS.getContext().getContentSection(); CMS.getContext().getContentSection();
/* /* TODO Maybe trash
Category.setRootForObject(section, root, useContext); Category.setRootForObject(section, root, useContext);
PermissionService.setContext(root, section); PermissionService.setContext(root, section);
Category defaultRoot = Category.getRootForObject(section); Category defaultRoot = Category.getRootForObject(section);
@ -131,6 +133,8 @@ class AddUseContextForm extends BaseForm {
} }
}*/ }*/
//TODO Uncomment when CategoryUseContextModelBuilder works
//m_model.setSelectedKey(state, useContext == null ? //m_model.setSelectedKey(state, useContext == null ?
// CategoryUseContextModelBuilder.DEFAULT_USE_CONTEXT : // CategoryUseContextModelBuilder.DEFAULT_USE_CONTEXT :
// useContext); // useContext);

2
ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryComponentAccess.java
View File

@ -24,6 +24,8 @@ import com.arsdigita.toolbox.ui.ComponentAccess;
public class CategoryComponentAccess extends ComponentAccess { public class CategoryComponentAccess extends ComponentAccess {
// XXX implement me! // XXX implement me!
// TODO This seems pretty useless...
// FIXME
public CategoryComponentAccess(Component c, public CategoryComponentAccess(Component c,
CategoryRequestLocal category) { CategoryRequestLocal category) {

11
ccm-cms/src/main/java/com/arsdigita/cms/ui/category/CategoryLinks.java
View File

@ -32,6 +32,9 @@ import com.arsdigita.bebop.util.GlobalizationUtil;
import com.arsdigita.util.LockableImpl; import com.arsdigita.util.LockableImpl;
import org.libreccm.categorization.Category; import org.libreccm.categorization.Category;
import java.util.Collection;
import java.util.HashSet;
/** /**
* A List of all secondary parents of the current category. * A List of all secondary parents of the current category.
* *
@ -75,7 +78,8 @@ public class CategoryLinks extends List {
setEmptyView(label); setEmptyView(label);
} }
/* TODO There is only one parent // Since this part is for non default parents, but the is only one... this is not needed anymore, i guess
/*
private class LinkedCategoryModelBuilder extends LockableImpl private class LinkedCategoryModelBuilder extends LockableImpl
implements ListModelBuilder { implements ListModelBuilder {
public ListModel makeModel(List list, PageState state) { public ListModel makeModel(List list, PageState state) {
@ -83,8 +87,11 @@ public class CategoryLinks extends List {
if (category != null && category.getParent().isPresent()) { if (category != null && category.getParent().isPresent()) {
Collection<Category> categories = new HashSet<>();
categories.add(category.getParentCategory());
return new CategoryCollectionListModel return new CategoryCollectionListModel
(category.getParents(), (categories,
parent == null ? null : parent.getID()); parent == null ? null : parent.getID());
} else { } else {
return List.EMPTY_MODEL; return List.EMPTY_MODEL;

3
ccm-cms/src/main/java/com/arsdigita/cms/ui/category/SubcategoryList.java
View File

@ -35,6 +35,7 @@ import java.util.Collection;
/** /**
* A List of all subcategories of the current category. * A List of all subcategories of the current category.
* *
* @author <a href="mailto:yannick.buelter@yabue.de">Yannick Bülter</a>
* @author Stanislav Freidin (stas@arsdigita.com) * @author Stanislav Freidin (stas@arsdigita.com)
* @author Michael Pih (pihman@arsdigita.com) * @author Michael Pih (pihman@arsdigita.com)
* @version $Revision: #15 $ $DateTime: 2004/08/17 23:15:09 $ * @version $Revision: #15 $ $DateTime: 2004/08/17 23:15:09 $
@ -80,7 +81,7 @@ public class SubcategoryList extends SortableCategoryList {
if (category != null && !category.getSubCategories().isEmpty()) { if (category != null && !category.getSubCategories().isEmpty()) {
Collection<Category> children = category.getSubCategories(); Collection<Category> children = category.getSubCategories();
//String order = ContentSection.getConfig().getCategoryTreeOrder(); TODO Sorting? //String order = ContentSection.getConfig().getCategoryTreeOrder(); FIXME Collections are not sorted
//order = Category.SORT_KEY.equals(order) ? "link." + order : order; //order = Category.SORT_KEY.equals(order) ? "link." + order : order;
//children.addOrder(order); //children.addOrder(order);
// children.addOrder("link." + Category.SORT_KEY); // children.addOrder("link." + Category.SORT_KEY);

3
ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/BaseWorkflowForm.java
View File

@ -28,8 +28,7 @@ import org.librecms.CmsConstants;
import org.librecms.contentsection.privileges.AdminPrivileges; import org.librecms.contentsection.privileges.AdminPrivileges;
/** /**
* <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*
* @author Uday Mathur * @author Uday Mathur
* @author Michael Pih * @author Michael Pih
* @author <a href="mailto:jross@redhat.com">Justin Ross</a> * @author <a href="mailto:jross@redhat.com">Justin Ross</a>