From 757675c0e6f3b818e80622c102f4c89d93e121a5 Mon Sep 17 00:00:00 2001 From: pb Date: Tue, 18 Feb 2014 09:44:37 +0000 Subject: [PATCH] Some minor formatting, some Globalikzation keys added. git-svn-id: https://svn.libreccm.org/ccm/trunk@2526 8810af33-2d31-482b-a856-94f89814c4df --- .../src/com/arsdigita/atoz/Initializer.java | 7 ++-- .../com/arsdigita/cms/CMSResources.properties | 1 + .../arsdigita/cms/CMSResources_de.properties | 1 + .../cms/CMSResources_en_GB.properties | 1 + .../arsdigita/cms/CMSResources_fr.properties | 1 + .../ui/UniqueItemNameValidationListener.java | 2 +- .../cms/ui/authoring/BasicItemForm.java | 20 +++++---- .../cms/ui/authoring/CreationSelector.java | 42 ++++++++----------- .../cms/ui/authoring/NewItemForm.java | 15 ++++++- .../cms/ui/authoring/PageCreate.java | 4 +- .../cms/ui/authoring/PageCreateDynamic.java | 11 +++-- .../folder/ChildUniqueValidationListener.java | 20 +++++++++ .../util/UniqueStringValidationListener.java | 2 +- 13 files changed, 84 insertions(+), 43 deletions(-) diff --git a/ccm-atoz/src/com/arsdigita/atoz/Initializer.java b/ccm-atoz/src/com/arsdigita/atoz/Initializer.java index 38c3da7bb..dcf289575 100755 --- a/ccm-atoz/src/com/arsdigita/atoz/Initializer.java +++ b/ccm-atoz/src/com/arsdigita/atoz/Initializer.java @@ -58,9 +58,10 @@ public class Initializer extends CompoundInitializer { final String url = RuntimeConfig.getConfig().getJDBCURL(); final int database = DbHelper.getDatabaseFromURL(url); - add(new PDLInitializer(new ManifestSource("ccm-atoz.pdl.mf", - new NameFilter(DbHelper. - getDatabaseSuffix(database), "pdl")))); + add(new PDLInitializer(new ManifestSource( + "ccm-atoz.pdl.mf", + new NameFilter(DbHelper.getDatabaseSuffix(database), "pdl")) + )); } /** diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources.properties index 9d265f25b..83b8d7277 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources.properties @@ -1067,3 +1067,4 @@ cms.ui.remove_home_folder=Remove home folder cms.ui.move.category=Move category "{0}" to cms.ui.category.move=Move category cms.ui.category.cantmoved=This category can't be moved +cms.ui.authoring.error_conflicts_with_this_url=There are conflicts with this URL. Specifically, there is at least one item in the same category as this item with the name (url) of diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties index 3d708a566..d2f8e3412 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties @@ -1061,3 +1061,4 @@ cms.ui.remove_home_folder=Start-Ordner zur\u00fccksetzen cms.ui.move.category=Verschiebe Kategorie "{0}" nach cms.ui.category.move=Kategorie verschieben cms.ui.category.cantmoved=Diese Kategorie kann nicht verschoben werden +cms.ui.authoring.error_conflicts_with_this_url=Es gibt Konflikte mit dieser URL. Insbesondere gibt es mindestens ein Dokument in der gleichen Kategorie wie dieser mit dem Namen (URL) diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties index 69366a026..331817989 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties @@ -115,3 +115,4 @@ cms.ui.remove_home_folder=Remove home folder cms.ui.move.category=Move category "{0}" to cms.ui.category.move=Move category cms.ui.category.cantmoved=This category can't be moved +cms.ui.authoring.error_conflicts_with_this_url=There are conflicts with this URL. Specifically, there is at least one item in the same category as this item with the name (url) of diff --git a/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties b/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties index cf7737056..9eae1f3b7 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties +++ b/ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties @@ -589,3 +589,4 @@ cms.ui.remove_home_folder= cms.ui.move.category=Move category "{0}" to cms.ui.category.move=Move category cms.ui.category.cantmoved=This category can't be moved +cms.ui.authoring.error_conflicts_with_this_url=There are conflicts with this URL. Specifically, there is atleast one item in the same category as this item with the name (url) of diff --git a/ccm-cms/src/com/arsdigita/cms/ui/UniqueItemNameValidationListener.java b/ccm-cms/src/com/arsdigita/cms/ui/UniqueItemNameValidationListener.java index e78fa8ae6..4a67e5474 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/UniqueItemNameValidationListener.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/UniqueItemNameValidationListener.java @@ -37,7 +37,7 @@ import com.arsdigita.cms.ui.util.UniqueStringValidationListener; * @version $Id: UniqueItemNameValidationListener.java 2090 2010-04-17 08:04:14Z pboy $ */ public class UniqueItemNameValidationListener - extends UniqueStringValidationListener { + extends UniqueStringValidationListener { private final static String ERROR_MSG = "An item with this name already exists."; diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicItemForm.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicItemForm.java index c2062fd7b..d93f9c532 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicItemForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicItemForm.java @@ -139,7 +139,8 @@ public abstract class BasicItemForm extends FormSection /** - * */ + * Currently, to insert javascript code the Label Widget is "abused". + */ private Label m_script = new Label( "", false); @@ -189,7 +190,7 @@ public abstract class BasicItemForm extends FormSection titleWidget.setHint(getTitleHint()); add(titleWidget); - // For some content types it is maybe useful to change the label of + // For some content types it may be useful to change the label of // the name (or URL) field to something different than 'name (url)'. // This can now be accomplished by overwriting the getNameLabel() method. // (jensp 2011-01-28) @@ -273,6 +274,13 @@ public abstract class BasicItemForm extends FormSection validateNameUniqueness(parent, event, newName); } + /** + * + * @param parent + * @param event + * @param newName + * @throws FormProcessException + */ public void validateNameUniqueness(Folder parent, FormSectionEvent event, String newName) throws FormProcessException { @@ -359,11 +367,9 @@ public abstract class BasicItemForm extends FormSection while (query.next()) { itemID = (BigDecimal) query.get("itemID"); if (!list.contains(itemID)) { - StringBuffer buffer = - new StringBuffer("There are conflicts with this URL. " - + "Specifically, there is at least one item " - + "in the same category as this item with " - + "the name (url) of "); + StringBuffer buffer = new StringBuffer((String) GlobalizationUtil + .globalize("cms.ui.authoring.error_conflicts_with_this_url") + .localize() ); buffer.append(url); throw new FormProcessException(buffer.toString()); } diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/CreationSelector.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/CreationSelector.java index 6717a8f41..74ea845b6 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/CreationSelector.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/CreationSelector.java @@ -124,6 +124,11 @@ public class CreationSelector extends MetaForm { } + /** + * + * @param state + * @return + */ @Override public Form buildForm(PageState state) { BigDecimal typeID = (BigDecimal)m_typeSel.getSelectedKey(state); @@ -151,7 +156,11 @@ public class CreationSelector extends MetaForm { return returnForm; } - // Add the item_id parameter + /** + * Add the item_id parameter. + * + * @param p + */ @Override public void register(Page p) { super.register(p); @@ -159,7 +168,13 @@ public class CreationSelector extends MetaForm { p.addComponentStateParam(this, m_bundleId); } - // Get the creation component + /** + * Get the creation component. + * + * @param kit + * @param type + * @return + */ protected Component instantiateKitComponent (final AuthoringKit kit, final ContentType type) { String creatorName = kit.getCreateComponent(); @@ -197,29 +212,6 @@ public class CreationSelector extends MetaForm { return (Folder) m_folderSel.getSelectedObject(s); } -// public final void xsetContentBundle(PageState s, ContentBundle bundle) { -// m_bundleSel.setSelectedObject(s, bundle); -// } - -// public final ContentBundle xgetContentBundle(final PageState state) { -// final ContentBundle current = (ContentBundle) -// m_bundleSel.getSelectedItem(state); - -// if (current == null) { -// final Folder folder = getFolder(state); - -// final ContentBundle bundle = new ContentBundle(); -// bundle.setParent(folder); -// bundle.setContentSection(folder.getContentSection()); - -// m_bundleSel.setSelectedObject(state, bundle); - -// return bundle; -// } else { -// return current; -// } -// } - /** * Return the currently selected content section. New items created by * creation components will belong to this section. This is the content diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/NewItemForm.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/NewItemForm.java index 21a80525f..d7f9a2880 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/NewItemForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/NewItemForm.java @@ -178,15 +178,28 @@ public abstract class NewItemForm extends Form { public abstract ContentSection getContentSection(PageState state); + /** + * + * @param state + * @return + */ public BigDecimal getTypeID(PageState state) { return (BigDecimal) m_typeWidget.getValue(state); } + /** + * + * @return + */ public final SingleSelect getTypeSelect() { return m_typeWidget; } - // Generate XML - show/hide labels/widgets + /** + * Generate XML - show/hide labels/widgets + * @param state + * @param parent + */ @Override public void generateXML(PageState state, Element parent) { diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageCreate.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageCreate.java index bf5c67c47..ca285ffc5 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageCreate.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageCreate.java @@ -118,8 +118,8 @@ public class PageCreate extends BasicPageForm return m_workflowSection; } - /** create a new item id - * + /** + * Create a new item id. */ public void init(FormSectionEvent e) throws FormProcessException { // this is currently a no-op diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageCreateDynamic.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageCreateDynamic.java index 442a2c24b..8ff7f8f13 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageCreateDynamic.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/PageCreateDynamic.java @@ -82,6 +82,7 @@ import java.util.Date; import java.util.Iterator; import java.util.TooManyListenersException; import javax.servlet.ServletException; + import org.apache.log4j.Logger; @@ -208,7 +209,8 @@ public class PageCreateDynamic extends FormSection m_parentComponent = (CreationComponent) tempComponent; } } catch (Exception e) { - // could not instantiate parent's creation component -- start from scratch... + // could not instantiate parent's creation component + // -- start from scratch... } } else { m_parentComponent = new PageCreate(m_itemModel, parent); @@ -231,7 +233,8 @@ public class PageCreateDynamic extends FormSection //setMethod(Form.POST); //setEncType("multipart/form-data"); } else { - add(new Label(GlobalizationUtil.globalize("cms.ui.authoring.invalid_create_component"))); + add(new Label(GlobalizationUtil.globalize( + "cms.ui.authoring.invalid_create_component"))); } } @@ -383,7 +386,9 @@ public class PageCreateDynamic extends FormSection if(getSaveCancelSection().getCancelButton().isSelected(state)) { m_parent.redirectBack(state); - throw new FormProcessException( (String) GlobalizationUtil.globalize("cms.ui.authoring.submission_cancelled").localize()); + throw new FormProcessException( (String) GlobalizationUtil + .globalize("cms.ui.authoring.submission_cancelled") + .localize()); } } diff --git a/ccm-cms/src/com/arsdigita/cms/ui/folder/ChildUniqueValidationListener.java b/ccm-cms/src/com/arsdigita/cms/ui/folder/ChildUniqueValidationListener.java index 9a6774b86..33249de63 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/folder/ChildUniqueValidationListener.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/folder/ChildUniqueValidationListener.java @@ -28,13 +28,27 @@ import com.arsdigita.persistence.SessionManager; import java.math.BigDecimal; +/** + * + * + */ final class ChildUniqueValidationListener implements ParameterListener { + private final FolderRequestLocal m_parent; + /** + * Constructor. + * @param parent + */ public ChildUniqueValidationListener(final FolderRequestLocal parent) { m_parent = parent; } + /** + * + * @param e + * @throws FormProcessException + */ public final void validate(final ParameterEvent e) throws FormProcessException { final PageState state = e.getPageState(); @@ -45,6 +59,12 @@ final class ChildUniqueValidationListener implements ParameterListener { } } + /** + * + * @param parent + * @param name + * @throws FormProcessException + */ private void validateNameUniqueness(final Folder parent, final String name) throws FormProcessException { diff --git a/ccm-cms/src/com/arsdigita/cms/ui/util/UniqueStringValidationListener.java b/ccm-cms/src/com/arsdigita/cms/ui/util/UniqueStringValidationListener.java index 1a1f0f9d1..860732796 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/util/UniqueStringValidationListener.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/util/UniqueStringValidationListener.java @@ -32,7 +32,7 @@ import com.arsdigita.bebop.form.Widget; * @version $Id: UniqueStringValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class UniqueStringValidationListener - implements FormValidationListener { + implements FormValidationListener { private final static String ERROR_MSG = "Unique string value constraint violation.";