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

Implements the use of setIndexObject into IndexItemSelectionForm. 

Is the exception handling correct?

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4573 8810af33-2d31-482b-a856-94f89814c4df
ccm-docs
baka 2017-02-15 16:02:24 +00:00
parent 7acd696e32
commit 60423ae059
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ccm-cms/src/main/java/com/arsdigita/cms/ui/category/IndexItemSelectionForm.java
View File

@ -36,10 +36,7 @@ import com.arsdigita.util.Assert;
import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.util.UncheckedWrapperException;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.libreccm.categorization.Categorization; import org.libreccm.categorization.*;
import org.libreccm.categorization.Category;
import org.libreccm.categorization.CategoryManager;
import org.libreccm.categorization.CategoryRepository;
import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.cdi.utils.CdiUtil;
import org.libreccm.core.CcmObject; import org.libreccm.core.CcmObject;
import org.librecms.contentsection.*; import org.librecms.contentsection.*;
@ -65,7 +62,6 @@ public class IndexItemSelectionForm extends CMSForm {
private static final String NULL_OPTION_VALUE = ""; private static final String NULL_OPTION_VALUE = "";
private static final String NONE_OPTION_VALUE = "None"; private static final String NONE_OPTION_VALUE = "None";
private FormErrorDisplay m_errors;
private SaveCancelSection m_saveCancelSection; private SaveCancelSection m_saveCancelSection;
public IndexItemSelectionForm(CategoryRequestLocal m) { public IndexItemSelectionForm(CategoryRequestLocal m) {
@ -89,7 +85,7 @@ public class IndexItemSelectionForm extends CMSForm {
add(header, ColumnPanel.FULL_WIDTH); add(header, ColumnPanel.FULL_WIDTH);
// Form errors // Form errors
m_errors = new FormErrorDisplay(this); FormErrorDisplay m_errors = new FormErrorDisplay(this);
add(m_errors, ColumnPanel.FULL_WIDTH); add(m_errors, ColumnPanel.FULL_WIDTH);
// Option Group // Option Group
@ -178,8 +174,12 @@ public class IndexItemSelectionForm extends CMSForm {
Optional<ContentItem> optionalItem = contentItemRepository.findById(Long.parseLong(selectedValue)); Optional<ContentItem> optionalItem = contentItemRepository.findById(Long.parseLong(selectedValue));
if (optionalItem.isPresent()) { if (optionalItem.isPresent()) {
ContentItem item = contentItemManager.getDraftVersion(optionalItem.get(), ContentItem.class); ContentItem item = contentItemManager.getDraftVersion(optionalItem.get(), ContentItem.class);
//category.setIndexObject(item); TODO try {
categoryRepository.save(category); categoryManager.setIndexObject(category, item);
categoryRepository.save(category);
} catch (ObjectNotAssignedToCategoryException e) {
throw new FormProcessException(e);
}
} }
} }