From e92325b45965652700b368446b9faba4182ffb52 Mon Sep 17 00:00:00 2001 From: jensp Date: Thu, 20 Oct 2011 14:53:11 +0000 Subject: [PATCH] =?UTF-8?q?Ein=20paar=20kleine=20=C3=84nderungen,=20unter?= =?UTF-8?q?=20anderem=20Anpassungen=20der=20Namen=20von=20web.*.xml=20Date?= =?UTF-8?q?ien?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@1181 8810af33-2d31-482b-a856-94f89814c4df --- ... => web.ccm-cms-publicpersonalprofile.xml} | 0 ...ationalUnitSubordinateOrgaUnitAddForm.java | 19 ++++++++---- ...nizationalUnitSuperiorOrgaUnitAddForm.java | 29 +++++++++---------- .../cms/ui/authoring/BasicItemForm.java | 5 +++- ...tions.xml => web.ccm-sci-publications.xml} | 0 .../contenttypes/SciProjectInitializer.java | 2 +- 6 files changed, 32 insertions(+), 23 deletions(-) rename ccm-cms-publicpersonalprofile/web/WEB-INF/{web.publicpersonalprofile.xml => web.ccm-cms-publicpersonalprofile.xml} (100%) rename ccm-sci-publications/web/WEB-INF/{web.scipublications.xml => web.ccm-sci-publications.xml} (100%) diff --git a/ccm-cms-publicpersonalprofile/web/WEB-INF/web.publicpersonalprofile.xml b/ccm-cms-publicpersonalprofile/web/WEB-INF/web.ccm-cms-publicpersonalprofile.xml similarity index 100% rename from ccm-cms-publicpersonalprofile/web/WEB-INF/web.publicpersonalprofile.xml rename to ccm-cms-publicpersonalprofile/web/WEB-INF/web.ccm-cms-publicpersonalprofile.xml diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitSubordinateOrgaUnitAddForm.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitSubordinateOrgaUnitAddForm.java index a1c2a9a75..9dbeb195e 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitSubordinateOrgaUnitAddForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitSubordinateOrgaUnitAddForm.java @@ -35,22 +35,29 @@ public class GenericOrganizationalUnitSubordinateOrgaUnitAddForm final GenericOrgaUnitSubordinateOrgaUnitAddFormCustomizer customizer) { super("SubordinateOrgaUnitsAddForm", itemModel); this.customizer = customizer; - } - - @Override - protected void addWidgets() { + add(new Label(customizer.getSelectSubordinateOrgaUnitLabel())); itemSearch = new ItemSearchWidget( ITEM_SEARCH, ContentType.findByAssociatedObjectType( customizer.getSubordinateOrgaUnitType())); - add(itemSearch); + add(itemSearch); + } + + @Override + protected void addWidgets() { + /*add(new Label(customizer.getSelectSubordinateOrgaUnitLabel())); + itemSearch = new ItemSearchWidget( + ITEM_SEARCH, + ContentType.findByAssociatedObjectType( + customizer.getSubordinateOrgaUnitType())); + add(itemSearch); */ } @Override public void init(final FormSectionEvent fse) throws FormProcessException { final PageState state = fse.getPageState(); - + setVisible(state, true); } diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitSuperiorOrgaUnitAddForm.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitSuperiorOrgaUnitAddForm.java index a01ced457..e29c5d410 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitSuperiorOrgaUnitAddForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitSuperiorOrgaUnitAddForm.java @@ -23,7 +23,7 @@ import com.arsdigita.cms.ui.authoring.BasicItemForm; public class GenericOrganizationalUnitSuperiorOrgaUnitAddForm extends BasicItemForm implements FormProcessListener, - FormInitListener { + FormInitListener { private ItemSearchWidget itemSearch; private final String ITEM_SEARCH = "superiorOrgaUnits"; @@ -34,10 +34,6 @@ public class GenericOrganizationalUnitSuperiorOrgaUnitAddForm final GenericOrgaUnitSuperiorOrgaUnitAddFormCustomizer customizer) { super("SuperiorOrgaUnitsAddForm", itemModel); this.customizer = customizer; - } - - @Override - protected void addWidgets() { add(new Label(customizer.getSelectSuperiorOrgaUnitLabel())); itemSearch = new ItemSearchWidget( ITEM_SEARCH, @@ -46,6 +42,10 @@ public class GenericOrganizationalUnitSuperiorOrgaUnitAddForm add(itemSearch); } + @Override + protected void addWidgets() { + } + @Override public void init(final FormSectionEvent fse) throws FormProcessException { final PageState state = fse.getPageState(); @@ -58,15 +58,14 @@ public class GenericOrganizationalUnitSuperiorOrgaUnitAddForm final FormData data = fse.getFormData(); final PageState state = fse.getPageState(); final GenericOrganizationalUnit orgaunit = - (GenericOrganizationalUnit) getItemSelectionModel(). + (GenericOrganizationalUnit) getItemSelectionModel(). getSelectedObject(state); if (getSaveCancelSection().getSaveButton().isSelected(state)) { GenericOrganizationalUnit supOrgaUnit = - (GenericOrganizationalUnit) data.get( + (GenericOrganizationalUnit) data.get( ITEM_SEARCH); - supOrgaUnit = (GenericOrganizationalUnit) supOrgaUnit. - getContentBundle().getInstance(orgaunit.getLanguage(), true); + supOrgaUnit = (GenericOrganizationalUnit) supOrgaUnit.getContentBundle().getInstance(orgaunit.getLanguage(), true); orgaunit.addSuperiorOrgaUnit(orgaunit, customizer.getAssocType()); } @@ -85,24 +84,24 @@ public class GenericOrganizationalUnitSuperiorOrgaUnitAddForm } final GenericOrganizationalUnit orgaunit = - (GenericOrganizationalUnit) getItemSelectionModel(). + (GenericOrganizationalUnit) getItemSelectionModel(). getSelectedObject(state); GenericOrganizationalUnit supOrgaUnit = - (GenericOrganizationalUnit) data.get( + (GenericOrganizationalUnit) data.get( ITEM_SEARCH); if (!(supOrgaUnit.getContentBundle().hasInstance(orgaunit.getLanguage(), - true))) { + true))) { data.addError(customizer.getNoSuitableLanguageVariantMessage()); return; } - + supOrgaUnit = (GenericOrganizationalUnit) supOrgaUnit.getContentBundle().getInstance(orgaunit.getLanguage(), true); - + if (orgaunit.getID().equals(supOrgaUnit.getID())) { data.addError(customizer.getAddingToItselfMessage()); return; } - + final GenericOrganizationalUnitSuperiorCollection supOrgaUnits = orgaunit.getSuperiorOrgaUnits(); supOrgaUnits.addFilter(String.format("id = %s", supOrgaUnit.getID().toString())); if (supOrgaUnits.size() > 0) { 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 418b5c33a..71e5e1658 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicItemForm.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicItemForm.java @@ -100,7 +100,7 @@ public abstract class BasicItemForm addProcessListener(this); addValidationListener(this); } - + /** * Construct a new BasicItemForm with nothing on it * @@ -181,6 +181,7 @@ public abstract class BasicItemForm } + @Override public void generateXML(PageState ps, Element parent) { m_script.generateXML(ps, parent); super.generateXML(ps, parent); @@ -369,6 +370,7 @@ public abstract class BasicItemForm * * @param pc the component to add to this BasicPageForm * */ + @Override public void add(Component pc) { m_widgetSection.add(pc); } @@ -383,6 +385,7 @@ public abstract class BasicItemForm * @param constraints layout constraints (a * bitwise OR of static ints in the particular layout) * */ + @Override public void add(Component pc, int constraints) { m_widgetSection.add(pc, constraints); } diff --git a/ccm-sci-publications/web/WEB-INF/web.scipublications.xml b/ccm-sci-publications/web/WEB-INF/web.ccm-sci-publications.xml similarity index 100% rename from ccm-sci-publications/web/WEB-INF/web.scipublications.xml rename to ccm-sci-publications/web/WEB-INF/web.ccm-sci-publications.xml diff --git a/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/SciProjectInitializer.java b/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/SciProjectInitializer.java index 58f500786..2f1d2affc 100644 --- a/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/SciProjectInitializer.java +++ b/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/SciProjectInitializer.java @@ -22,7 +22,7 @@ public class SciProjectInitializer extends ContentTypeInitializer { public void init(final DomainInitEvent event) { super.init(event); - SciProjectConfig config = SciProject.getConfig(); + final SciProjectConfig config = SciProject.getConfig(); if (config.getEnableSubProjectsStep()) { AuthoringKitWizard.registerAssetStep(SciProject.BASE_DATA_OBJECT_TYPE,