Fehler #2400 FormprocessException, modul ccm-cms PART II

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

ccm-cms/src/com/arsdigita/cms/CMSResources.properties

@@ -1086,3 +1086,10 @@ cms.ui.contentcenter.location=Location
 cms.ui.contentcenter.location_hint=In Legacy mode links to public pages.
 cms.ui.contentcenter.action_hint=If activated displays a form for each content section to create an object of a given type (configurable) in the root of the given content section. The list of available types retrieved for each content section. Administrators will disable this option in order to prevent disorganizing the root directory.
 cms.ui.property_already_exist=The following Property already exists:
+cms.ui.template_not_supportet=The selected mime type is not supported
+cms.ui.uploaded_file_not_properly_formatted=The uploaded file is not properly formatted XML: 
+cms.ui.unique_string_violation=Unique string value constraint violation.
+cms.ui.unique_item_name_violation=An item with this name already exists.
+=
+cms.ui.item_searchwidget.submit=item search FormSection submit
+cms.ui.workflow.task.approval_or_reject_required=Approval or rejection is required.

ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties

@@ -1080,3 +1080,10 @@ cms.ui.contentcenter.location=Ort
 cms.ui.contentcenter.location_hint=In Legacy mode links to public pages.
 cms.ui.contentcenter.action_hint=Falls aktiv wird ein Formular angezeigt, um im ROOT Verzeichnis der entsprechenden Sektion ein neues Dokument anzulegen. Administratoren deaktivieren diese Option, um das ROOT Verzeichnis nicht zu \u00fcberfrachten.
 cms.ui.property_already_exist=Das folgende Objekt existiert bereits:
+cms.ui.template_not_supportet=Das ausgew\u00e4hlte Template(mime type) wird nicht unterst\u00fctzt
+cms.ui.uploaded_file_not_properly_formatted=Die hochgeladene Datei ist fehlerhaft
+cms.ui.unique_string_violation=String bereits vergeben.
+cms.ui.unique_item_name_violation=Ein Item mit diesem Namen existiert bereits.
+=
+cms.ui.item_searchwidget.submit=item search FormSection submit
+cms.ui.workflow.task.approval_or_reject_required=Ablehnung oder Zustimmung ist ben\u00f6tigt

ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties

@@ -123,3 +123,10 @@ cms.ui.contentcenter.location=Location
 cms.ui.contentcenter.location_hint=In Legacy mode links to public pages.
 cms.ui.contentcenter.action_hint=If activated displays a form for each content section to create an object of a given type (configurable) in the root of the given content section. The list of available types retrieved for each content section. Administrators will disable this option in order to prevent disorganizing the root directory.
 cms.ui.property_already_exist=The following Property already exists:
+cms.ui.template_not_supportet=The selected mime type is not supported
+cms.ui.uploaded_file_not_properly_formatted=The uploaded file is not properly formatted XML: 
+cms.ui.unique_string_violation=Unique string value constraint violation.
+cms.ui.unique_item_name_violation=An item with this name already exists.
+=
+cms.ui.item_searchwidget.submit=item search FormSection submit
+cms.ui.workflow.task.approval_or_reject_required=Approval or rejection is required.

ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties

@@ -592,3 +592,10 @@ cms.ui.contentcenter.location=TRANSLATE: Location
 cms.ui.contentcenter.location_hint=In Legacy mode links to public pages.
 cms.ui.contentcenter.action_hint=If activated displays a form for each content section to create an object of a given type (configurable) in the root of the given content section. The list of available types retrieved for each content section. Administrators will disable this option in order to prevent disorganizing the root directory.
 cms.ui.property_already_exist=The following Property already exists:
+cms.ui.template_not_supportet=The selected mime type is not supported
+cms.ui.uploaded_file_not_properly_formatted=The uploaded file is not properly formatted XML: 
+cms.ui.unique_string_violation=
+cms.ui.unique_item_name_violation=
+=
+cms.ui.item_searchwidget.submit=item search FormSection submit
+cms.ui.workflow.task.approval_or_reject_required=Approval or rejection is required.

ccm-cms/src/com/arsdigita/cms/contentsection/ContentSectionCreateForm.java

@@ -151,7 +151,7 @@ public class ContentSectionCreateForm extends Form {
             if (saveCancelSection.getCancelButton().isSelected(event.getPageState())) {
                 event.getFormData().put(NEW_SECTION_NAME, "");
 
-                throw new FormProcessException("Canceled");
+                throw new FormProcessException(GlobalizationUtil.globalize("cms.contentsection.cancelled"));
             }
         }
 

ccm-cms/src/com/arsdigita/cms/ui/ItemSearchCreateItemPane.java

@@ -19,7 +19,6 @@
 package com.arsdigita.cms.ui;
 
 import com.arsdigita.bebop.BoxPanel;
-import com.arsdigita.bebop.Component;
 import com.arsdigita.bebop.FormData;
 import com.arsdigita.bebop.FormProcessException;
 import com.arsdigita.bebop.Label;
@@ -333,8 +332,8 @@ class ItemSearchCreateItemPane extends CMSContainer
         if ((folderOidStr == null) || folderOidStr.isEmpty()) {
             fse.getFormData().addError(FLAT_FOLDER, GlobalizationUtil.globalize(
                     "cms.ui.item_search.create.folder_missing"));
-            throw new FormProcessException((String) GlobalizationUtil.globalize(
+            throw new FormProcessException(GlobalizationUtil.globalize(
-                    "cms.ui.item_search.create.folder_missing").localize());
+                    "cms.ui.item_search.create.folder_missing"));
         }
         final OID folderOID = OID.valueOf(folderOidStr);
         m_folderSel.setSelectedKey(state, folderOID.get("id"));

ccm-cms/src/com/arsdigita/cms/ui/ItemSearchWidget.java

@@ -438,7 +438,7 @@ public class ItemSearchWidget extends FormSection
                 // component is in metaform. nothing to do here. Custom generateXML must hide for us
             }
 
-            throw new FormProcessException("item search FormSection submit");
+            throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.item_searchwidget.submit"));
 
         } else if (m_searchComponent.hasQuery(state)) {
             s_log.debug("Has query");
@@ -459,7 +459,7 @@ public class ItemSearchWidget extends FormSection
                 state.setValue(new BigDecimalParameter(ItemSearch.SINGLE_TYPE_PARAM),
                                null);
             }
-            throw new FormProcessException("item search FormSection submit");
+            throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.item_searchwidget.submit"));
         } else if (m_search.isSelected(state)) {
             s_log.debug("Search selected");
             try {
@@ -479,7 +479,7 @@ public class ItemSearchWidget extends FormSection
                 state.setValue(new BigDecimalParameter(ItemSearch.SINGLE_TYPE_PARAM),
                                null);
             }
-            throw new FormProcessException("item search FormSection submit");
+            throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.item_searchwidget.submit"));
         } else if (m_clear.isSelected(state)) {
             s_log.debug("Clear selected");
             m_item.setValue(state, null);
@@ -491,7 +491,7 @@ public class ItemSearchWidget extends FormSection
             } catch (IllegalStateException ex) {
                 // component is in metaform. nothing to do here. Custom generateXML must hide for us
             }
-            throw new FormProcessException("item search FormSection submit");
+            throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.item_searchwidget.submit"));
         } else {
             s_log.debug("Something else");
             try {

ccm-cms/src/com/arsdigita/cms/ui/SectionConfigurationPage.java

@@ -374,7 +374,7 @@ public class SectionConfigurationPage extends CMSPage implements Resettable {
                         throws FormProcessException {
                         PageState state = event.getPageState();
                         if ( isCancelled(state) ) {
-                            throw new FormProcessException( (String) GlobalizationUtil.globalize("cms.ui.cancel_hit").localize());
+                            throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.cancel_hit"));
                         }
                     }
                 });
@@ -502,7 +502,7 @@ public class SectionConfigurationPage extends CMSPage implements Resettable {
                         throws FormProcessException {
                         PageState state = event.getPageState();
                         if ( isCancelled(state) ) {
-                            throw new FormProcessException( (String) GlobalizationUtil.globalize("cms.ui.cancel_hit").localize());
+                            throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.cancel_hit"));
                         }
                     }
                 });

ccm-cms/src/com/arsdigita/cms/ui/SecurityPropertyEditor.java

@@ -274,7 +274,7 @@ public class SecurityPropertyEditor extends PropertyEditor {
 
                     if ( !ca.canAccess(state, sm) ) {
                         showDisplayPane(state);
-                        throw new FormProcessException( (String) GlobalizationUtil.globalize("cms.ui.insufficient_privileges").localize());
+                        throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.insufficient_privileges"));
                     }
                 }
             });

ccm-cms/src/com/arsdigita/cms/ui/UniqueItemNameValidationListener.java

@@ -40,7 +40,7 @@ public class UniqueItemNameValidationListener
              extends UniqueStringValidationListener {
 
     private final static String ERROR_MSG =
-        "An item with this name already exists.";
+        "cms.ui.unique_item_name_violation";
 
     /**
      * Constructor.

ccm-cms/src/com/arsdigita/cms/ui/authoringkit/AddStep.java

@@ -134,7 +134,7 @@ public class AddStep extends Form
                     throws FormProcessException {
                     PageState state = event.getPageState();
                     if ( isCancelled(state) ) {
-                        throw new FormProcessException( (String) GlobalizationUtil.globalize("cms.ui.cancel_hit").localize());
+                        throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.cancel_hit"));
                     }
                 }
             });

ccm-cms/src/com/arsdigita/cms/ui/authoringkit/DeleteStep.java

@@ -116,7 +116,7 @@ public class DeleteStep extends Form
      */
     public void submitted(FormSectionEvent e) throws FormProcessException {
         if(m_cancelWidget.isSelected(e.getPageState())) {
-            throw new FormProcessException( (String) GlobalizationUtil.globalize("cms.ui.authoringkit.submission_cancelled").localize());
+            throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.authoringkit.submission_cancelled"));
         }
     }
 

ccm-cms/src/com/arsdigita/cms/ui/category/BaseCategoryForm.java

@@ -33,6 +33,7 @@ import com.arsdigita.bebop.parameters.TrimmedStringParameter;
 import com.arsdigita.categorization.Category;
 import com.arsdigita.categorization.CategoryCollection;
 import com.arsdigita.cms.ui.BaseForm;
+import com.arsdigita.cms.util.GlobalizationUtil;
 import com.arsdigita.globalization.GlobalizedMessage;
 import com.arsdigita.web.Web;
 import com.arsdigita.xml.Element;
@@ -181,7 +182,7 @@ class BaseCategoryForm extends BaseForm {
                 if (compField.equalsIgnoreCase(title)
                     && (m_category == null
                         || !m_category.getCategory(state).equals(child))) {
-                    throw new FormProcessException(lz("cms.ui.category.name_not_unique"));
+                    throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.category.name_not_unique"));
                 }
             }
         }

ccm-cms/src/com/arsdigita/cms/ui/folder/ChildUniqueValidationListener.java

@@ -23,6 +23,7 @@ import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.event.ParameterEvent;
 import com.arsdigita.bebop.event.ParameterListener;
 import com.arsdigita.cms.Folder;
+import com.arsdigita.cms.util.GlobalizationUtil;
 import com.arsdigita.persistence.DataQuery;
 import com.arsdigita.persistence.SessionManager;
 
@@ -80,7 +81,7 @@ final class ChildUniqueValidationListener implements ParameterListener {
             
             if (count > 0) {
                 throw new FormProcessException
-                    ("An item with this name already exists");
+                    (GlobalizationUtil.globalize("cms.ui.unique_item_name_violation"));
             }
         } else {
             throw new IllegalStateException();

ccm-cms/src/com/arsdigita/cms/ui/folder/FolderItemPane.java

@@ -340,10 +340,10 @@ public class FolderItemPane extends SegmentedPanel
         if ( e.getSource() == m_folderCreator
              && m_folderCreator.isCancelled(s) ) {
             browseMode(s);
-            throw new FormProcessException( (String) GlobalizationUtil.globalize("cms.ui.cancelled").localize());
+            throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.cancelled"));
         } else if (e.getSource() == m_folderEditor && m_folderEditor.isCancelled(s)) {
             browseMode(s);
-            throw new FormProcessException( (String) GlobalizationUtil.globalize("cms.ui.cancelled").localize());
+            throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.cancelled"));
         } else if ( e.getSource() == m_folderManip.getTargetSelector() ) {
             // This only works if this submission listener is run
             // after the target selector's one

ccm-cms/src/com/arsdigita/cms/ui/type/SelectType.java

@@ -121,7 +121,7 @@ public class SelectType extends CMSForm
     public void submitted(FormSectionEvent event) throws FormProcessException {
         PageState state = event.getPageState();
         if (isCancelled(state)) {
-            throw new FormProcessException("cancelled");
+            throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.cancelled"));
         }
     }
 

ccm-cms/src/com/arsdigita/cms/ui/util/UniqueStringValidationListener.java

@@ -23,6 +23,7 @@ import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.event.FormSectionEvent;
 import com.arsdigita.bebop.event.FormValidationListener;
 import com.arsdigita.bebop.form.Widget;
+import com.arsdigita.cms.util.GlobalizationUtil;
 
 
 /**
@@ -35,7 +36,7 @@ public abstract class UniqueStringValidationListener
                       implements FormValidationListener {
 
     private final static String ERROR_MSG =
-        "Unique string value constraint violation.";
+        "cms.ui.unique_string_violation";
 
     private Widget m_widget;
     private String m_errorMsg;
@@ -90,7 +91,7 @@ public abstract class UniqueStringValidationListener
         String value = (String) m_widget.getValue(state);
 
         if ( !isUnique(state, value) ) {
-            throw new FormProcessException(m_errorMsg);
+            throw new FormProcessException(GlobalizationUtil.globalize(m_errorMsg));
         }
 
     }

ccm-cms/src/com/arsdigita/cms/ui/workflow/TaskFinishForm.java

@@ -32,6 +32,7 @@ import com.arsdigita.bebop.parameters.BooleanParameter;
 import com.arsdigita.cms.ContentSection;
 import com.arsdigita.cms.ContentCenter;
 import com.arsdigita.cms.ui.ContentItemPage;
+import com.arsdigita.cms.util.GlobalizationUtil;
 import com.arsdigita.cms.workflow.CMSEngine;
 import com.arsdigita.cms.workflow.CMSTask;
 import com.arsdigita.cms.workflow.CMSTaskType;
@@ -116,7 +117,8 @@ public final class TaskFinishForm extends CommentAddForm {
             final CMSTask task = m_task.getTask(state);
 
             if (requiresApproval(task) && m_approve.getValue(state) == null) {
-                throw new FormProcessException(lz("cms.ui.workflow.task.approval_or_reject_required"));
+                throw new FormProcessException(GlobalizationUtil.globalize(
+                        "cms.ui.workflow.task.approval_or_reject_required"));
             }
         }
     }