diff --git a/ccm-atoz/src/com/arsdigita/atoz/ui/AtoZResources.properties b/ccm-atoz/src/com/arsdigita/atoz/ui/AtoZResources.properties index 3b46d51dd..f1d175144 100644 --- a/ccm-atoz/src/com/arsdigita/atoz/ui/AtoZResources.properties +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/AtoZResources.properties @@ -6,7 +6,7 @@ atoz.ui.provider_description=Description atoz.ui.load_paths=Attributes to retrieve atoz.ui.category_filter=Category filter atoz.ui.category_picker.root_category=Root category -atoz.ui.create_provider=Create provider +atoz.ui.create_provider=atoz.ui.create_provider atoz.ui.provider.create=Create atoz.ui.providers_table.empty=No providers found atoz.ui.providers_table.provider_name=Name @@ -15,3 +15,5 @@ atoz.ui.providers_table.type=Type atoz.ui.providers_table.edit=Edit atoz.ui.providers_table.delete=Delete atoz.ui.providers_table.delete.confirm=Are you sure to delete this provider? +#cancel hit +atoz.ui.admin.cancel_hit=Cancel hit diff --git a/ccm-atoz/src/com/arsdigita/atoz/ui/AtoZResources_de.properties b/ccm-atoz/src/com/arsdigita/atoz/ui/AtoZResources_de.properties index ea8577d28..2653b6857 100644 --- a/ccm-atoz/src/com/arsdigita/atoz/ui/AtoZResources_de.properties +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/AtoZResources_de.properties @@ -15,3 +15,5 @@ atoz.ui.providers_table.type=Typ atoz.ui.providers_table.edit=Bearbeiten atoz.ui.providers_table.delete=L\u00f6schen atoz.ui.providers_table.delete.confirm=Sind Sie sicher, dass Sie diesen Provider l\u00f6schen m\u00f6chten? +#cancel hit +atoz.ui.admin.cancel_hit=Cancel hit diff --git a/ccm-atoz/src/com/arsdigita/atoz/ui/admin/AbstractProviderForm.java b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/AbstractProviderForm.java index b84f8e38c..de9d2642e 100755 --- a/ccm-atoz/src/com/arsdigita/atoz/ui/admin/AbstractProviderForm.java +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/AbstractProviderForm.java @@ -53,15 +53,15 @@ public abstract class AbstractProviderForm extends Form { private final ApplicationInstanceAwareContainer parent; public AbstractProviderForm(final String name, - final Class providerType, - final ACSObjectSelectionModel provider) { + final Class providerType, + final ACSObjectSelectionModel provider) { this(name, providerType, provider, null); } public AbstractProviderForm(final String name, - final Class providerType, - final ACSObjectSelectionModel provider, - final ApplicationInstanceAwareContainer parent) { + final Class providerType, + final ACSObjectSelectionModel provider, + final ApplicationInstanceAwareContainer parent) { super(name, new ColumnPanel(2)); setRedirecting(true); @@ -107,7 +107,7 @@ public abstract class AbstractProviderForm extends Form { } protected void initWidgets(final PageState state, - final AtoZProvider provider) { + final AtoZProvider provider) { if (provider != null) { title.setValue(state, provider.getTitle()); description.setValue(state, provider.getDescription()); @@ -126,7 +126,8 @@ public abstract class AbstractProviderForm extends Form { if (buttons.getCancelButton().isSelected(state)) { fireCompletionEvent(state); - throw new FormProcessException("cancel hit"); + throw new FormProcessException(AtoZGlobalizationUtil.globalize( + "atoz.ui.admin.cancel_hit")); } } diff --git a/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderAliasForm.java b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderAliasForm.java index e0b7b74d1..87507d6e8 100755 --- a/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderAliasForm.java +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderAliasForm.java @@ -36,27 +36,28 @@ import com.arsdigita.bebop.parameters.StringInRangeValidationListener; import com.arsdigita.categorization.Category; import com.arsdigita.kernel.ui.ACSObjectSelectionModel; import com.arsdigita.atoz.CategoryProvider; +import com.arsdigita.atoz.ui.AtoZGlobalizationUtil; /** - * - * + * + * */ public class CategoryProviderAliasForm extends Form { private ACSObjectSelectionModel m_provider; private TermWidget m_termWidget; - + private TextField m_title; private SingleSelect m_letter; private SaveCancelSection m_buttons; /** - * - * @param provider + * + * @param provider */ public CategoryProviderAliasForm(ACSObjectSelectionModel provider) { - super("categoryAliasForm", new SimpleContainer()); + super("categoryAliasForm", new SimpleContainer()); setRedirecting(true); m_provider = provider; @@ -69,14 +70,14 @@ public class CategoryProviderAliasForm extends Form { m_letter = new SingleSelect("letter"); m_letter.addValidationListener(new NotNullValidationListener()); m_letter.addOption(new Option(null, "--Select one--")); - for (int i = 0 ; i < 26 ; i++) { - String letter = new String(new char[]{(char)((int)'a' + i)}); + for (int i = 0; i < 26; i++) { + String letter = new String(new char[]{(char) ((int) 'a' + i)}); m_letter.addOption(new Option(letter, letter.toUpperCase())); } add(m_title); add(m_letter); - + m_termWidget = new TermWidget(provider); m_termWidget.addValidationListener(new NotNullValidationListener()); add(m_termWidget); @@ -87,36 +88,39 @@ public class CategoryProviderAliasForm extends Form { addProcessListener(new ProviderProcessListener()); addSubmissionListener(new ProviderSubmissionListener()); } - + /** - * + * */ private class ProviderSubmissionListener implements FormSubmissionListener { + public void submitted(FormSectionEvent e) - throws FormProcessException { + throws FormProcessException { PageState state = e.getPageState(); if (m_buttons.getCancelButton().isSelected(state)) { fireCompletionEvent(state); - throw new FormProcessException("cancel hit"); + throw new FormProcessException(AtoZGlobalizationUtil.globalize( + "atoz.ui.admin.cancel_hit")); } } } /** - * + * */ private class ProviderProcessListener implements FormProcessListener { + public void process(FormSectionEvent e) - throws FormProcessException { + throws FormProcessException { PageState state = e.getPageState(); - CategoryProvider provider = (CategoryProvider)m_provider - .getSelectedObject(state); + CategoryProvider provider = (CategoryProvider) m_provider + .getSelectedObject(state); - Category cat = new Category(((BigDecimal[])m_termWidget.getValue(state))[0]); - String letter = (String)m_letter.getValue(state); - String title = (String)m_title.getValue(state); + Category cat = new Category(((BigDecimal[]) m_termWidget.getValue(state))[0]); + String letter = (String) m_letter.getValue(state); + String title = (String) m_title.getValue(state); provider.addAlias(cat, letter, title); diff --git a/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderBlockForm.java b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderBlockForm.java index 8828b7b22..f4c0a6067 100755 --- a/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderBlockForm.java +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderBlockForm.java @@ -19,6 +19,7 @@ package com.arsdigita.atoz.ui.admin; import com.arsdigita.atoz.CategoryProvider; +import com.arsdigita.atoz.ui.AtoZGlobalizationUtil; import com.arsdigita.categorization.ui.ObjectCategoryPicker; import com.arsdigita.bebop.PageState; @@ -84,7 +85,8 @@ public class CategoryProviderBlockForm extends Form { if (m_buttons.getCancelButton().isSelected(state)) { fireCompletionEvent(state); - throw new FormProcessException("cancel hit"); + throw new FormProcessException(AtoZGlobalizationUtil.globalize( + "atoz.ui.admin.cancel_hit")); } } } diff --git a/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderContentTypeBlockForm.java b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderContentTypeBlockForm.java index aafb9df24..5c736e91c 100755 --- a/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderContentTypeBlockForm.java +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/CategoryProviderContentTypeBlockForm.java @@ -39,10 +39,9 @@ import com.arsdigita.bebop.form.SingleSelect; import com.arsdigita.bebop.parameters.BigDecimalParameter; import com.arsdigita.cms.ContentType; import com.arsdigita.cms.ContentTypeCollection; -import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.kernel.ui.ACSObjectSelectionModel; import com.arsdigita.atoz.CategoryProvider; -import com.arsdigita.persistence.OID; +import com.arsdigita.atoz.ui.AtoZGlobalizationUtil; import com.arsdigita.util.UncheckedWrapperException; public class CategoryProviderContentTypeBlockForm extends Form { @@ -109,7 +108,8 @@ public class CategoryProviderContentTypeBlockForm extends Form { if (m_buttons.getCancelButton().isSelected(state)) { fireCompletionEvent(state); - throw new FormProcessException("cancel hit"); + throw new FormProcessException(AtoZGlobalizationUtil.globalize( + "atoz.ui.admin.cancel_hit")); } } diff --git a/ccm-atoz/src/com/arsdigita/atoz/ui/admin/ItemProviderAliasForm.java b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/ItemProviderAliasForm.java index 73c4ecd70..57d6152a4 100755 --- a/ccm-atoz/src/com/arsdigita/atoz/ui/admin/ItemProviderAliasForm.java +++ b/ccm-atoz/src/com/arsdigita/atoz/ui/admin/ItemProviderAliasForm.java @@ -41,6 +41,7 @@ import com.arsdigita.kernel.ACSObject; import com.arsdigita.kernel.ui.ACSObjectSelectionModel; import com.arsdigita.atoz.ItemAlias; import com.arsdigita.atoz.ItemProvider; +import com.arsdigita.atoz.ui.AtoZGlobalizationUtil; import com.arsdigita.util.Classes; import com.arsdigita.util.UncheckedWrapperException; @@ -102,7 +103,7 @@ public class ItemProviderAliasForm extends Form { equals(ContentItem.DRAFT)) { group.addOption(new Option(item.getID().toString(), - ((ContentItem) item).getName())); + ((ContentItem) item).getName())); } } } @@ -131,7 +132,8 @@ public class ItemProviderAliasForm extends Form { if (m_buttons.getCancelButton().isSelected(state)) { fireCompletionEvent(state); - throw new FormProcessException("cancel hit"); + throw new FormProcessException(AtoZGlobalizationUtil.globalize( + "atoz.ui.admin.cancel_hit")); } } }