Ein paar kleine Änderungen, unter anderem Anpassungen der Namen von web.*.xml Dateien

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

ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitSubordinateOrgaUnitAddForm.java

@@ -35,10 +35,7 @@ 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,
@@ -47,6 +44,16 @@ public class GenericOrganizationalUnitSubordinateOrgaUnitAddForm
         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();

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.
+            supOrgaUnit = (GenericOrganizationalUnit) supOrgaUnit.getContentBundle().getInstance(orgaunit.getLanguage(), true);
-                    getContentBundle().getInstance(orgaunit.getLanguage(), true);
 
             orgaunit.addSuperiorOrgaUnit(orgaunit, customizer.getAssocType());
         }
@@ -85,13 +84,13 @@ 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;
         }

ccm-cms/src/com/arsdigita/cms/ui/authoring/BasicItemForm.java

@@ -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);
     }

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,