Verschiedene Korrekturen an den neuen Sci-Contenttypen und den dazugehörigen AuthoringSteps

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

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

@@ -61,14 +61,14 @@ public interface GenericOrgaUnitSubordinateOrgaUnitsTableCustomizer {
      * 
      * @return Label for the down links
      */
-    String getDownLabel();    
+    String getDownLabel();
 
     /**
      * 
      * @return Text for the confirmation message when deleting an association.
      */
     String getConfirmRemoveLabel();
-    
+
     /**
      * 
      * @return The value of the {@code assocType} property of the association
@@ -77,4 +77,10 @@ public interface GenericOrgaUnitSubordinateOrgaUnitsTableCustomizer {
      * is filtered using the return value.
      */
     String getAssocType();
+
+    /**
+     * Content type to restrict to item shown to. May be {@code null}.
+     * @return 
+     */
+    String getContentType();
 }

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

@@ -72,4 +72,10 @@ public interface GenericOrgaUnitSuperiorOrgaUnitsTableCustomizer {
      */
     String getAssocType();
     
+    /**
+     * Content type to restrict to item shown to. May be {@code null}.
+     * @return 
+     */
+    String getContentType();
+    
 }

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

@@ -121,6 +121,12 @@ public class GenericOrganizationalUnitSubordinateOrgaUnitsTable
                         "link.assocType = '%s'",
                         customizer.getAssocType()));
             }
+            if ((customizer.getContentType() != null)
+                && !(customizer.getContentType().isEmpty())) {
+                subordinateOrgaUnits.addFilter(String.format("objectType = '%s'",
+                                                             customizer.
+                        getContentType()));
+            }
             this.customizer = customizer;
         }
 
@@ -313,7 +319,7 @@ public class GenericOrganizationalUnitSubordinateOrgaUnitsTable
                     state);
             final GenericOrganizationalUnit subOrgaUnit =
                                             new GenericOrganizationalUnit(
-                    new BigDecimal((String)event.getRowKey()));
+                    new BigDecimal((String) event.getRowKey()));
             final GenericOrganizationalUnitSubordinateCollection subOrgaUnits =
                                                                  orgaunit.
                     getSubordinateOrgaUnits();

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

@@ -107,10 +107,17 @@ public class GenericOrganizationalUnitSuperiorOrgaUnitsTable extends Table {
             superiorOrgaUnits = orgaunit.getSuperiorOrgaUnits();
             if ((customizer.getAssocType() != null)
                 && !(customizer.getAssocType().isEmpty())) {
-                superiorOrgaUnits.addFilter(String.format("link.assocType = '%s'",
+                superiorOrgaUnits.addFilter(String.format(
+                        "link.assocType = '%s'",
                                                           customizer.
                         getAssocType()));
             }
+            if ((customizer.getContentType() != null)
+                && !(customizer.getContentType().isEmpty())) {
+                superiorOrgaUnits.addFilter(String.format("objectType = '%s'",
+                                                          customizer.
+                        getContentType()));
+            }
             this.customizer = customizer;
         }
 
@@ -297,7 +304,7 @@ public class GenericOrganizationalUnitSuperiorOrgaUnitsTable extends Table {
                     getSelectedObject(state);
             final GenericOrganizationalUnit supOrgaUnit =
                                             (GenericOrganizationalUnit) DomainObjectFactory.
-                    newInstance(OID.valueOf((String)event.getRowKey()));
+                    newInstance(OID.valueOf((String) event.getRowKey()));
             final GenericOrganizationalUnitSuperiorCollection supOrgaUnits =
                                                               orgaunit.
                     getSuperiorOrgaUnits();
@@ -307,11 +314,11 @@ public class GenericOrganizationalUnitSuperiorOrgaUnitsTable extends Table {
             final String headerKey = column.getHeaderKey().toString();
             if (TABLE_COL_EDIT.equals(headerKey)) {
                 //Nothing now
-            } else if(TABLE_COL_DEL.equals(headerKey)) {
+            } else if (TABLE_COL_DEL.equals(headerKey)) {
                 orgaunit.removeSuperiorOrgaUnit(supOrgaUnit);
             } else if (TABLE_COL_UP.equals(headerKey)) {
-                supOrgaUnits.swapWithPrevious(supOrgaUnit);                
+                supOrgaUnits.swapWithPrevious(supOrgaUnit);
-            } else if(TABLE_COL_DOWN.equals(headerKey)) {
+            } else if (TABLE_COL_DOWN.equals(headerKey)) {
                 supOrgaUnits.swapWithNext(supOrgaUnit);
             }
         }

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationInitializer.java

@@ -24,6 +24,7 @@ import com.arsdigita.cms.contenttypes.ui.PublicationGenericOrganizationalUnitsSt
 import com.arsdigita.cms.contenttypes.ui.PublicationGlobalizationUtil;
 import com.arsdigita.cms.ui.authoring.AuthoringKitWizard;
 import com.arsdigita.runtime.DomainInitEvent;
+import org.apache.log4j.Logger;
 
 /**
  *
@@ -32,6 +33,8 @@ import com.arsdigita.runtime.DomainInitEvent;
  */
 public class PublicationInitializer extends ContentTypeInitializer {
 
+    private final Logger logger = Logger.getLogger(PublicationInitializer.class);
+
     public PublicationInitializer() {
         super("ccm-sci-publications.pdl.mf", Publication.BASE_DATA_OBJECT_TYPE);
     }
@@ -53,9 +56,17 @@ public class PublicationInitializer extends ContentTypeInitializer {
                     10);
         }
 
-        final String attacToStr = config.getAttachPublicationsStepTo();
+        final String attachToStr = config.getAttachPublicationsStepTo();
-        final String[] attachToCts = attacToStr.split(";");
+        final String[] attachToCts = attachToStr.split(";");
+        if (logger.isInfoEnabled()) {
+            logger.info(String.format("Attaching publications step to: %s",
+                                      attachToStr));
+        }
         for (String attachTo : attachToCts) {
+            if (logger.isInfoEnabled()) {
+                logger.info(String.format("Attaching publications step to: '%s'",
+                                          attachTo));
+            }
             AuthoringKitWizard.registerAssetStep(
                     attachTo,
                     GenericOrganizationalUnitPublicationsStep.class,

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationAddForm.java

@@ -38,8 +38,9 @@ public class GenericOrganizationalUnitPublicationAddForm
     public void addWidgets() {
         add(new Label((String) PublicationGlobalizationUtil.globalize(
                 "genericorganizationalunit.ui.publication.select").localize()));
-        itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType.
+        itemSearch = new ItemSearchWidget(ITEM_SEARCH,
-                findByAssociatedObjectType(Publication.class.getName()));
+                                          ContentType.findByAssociatedObjectType(Publication.class.
+                getName()));
         add(itemSearch);
     }
 

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationsTable.java

@@ -50,12 +50,12 @@ public class GenericOrganizationalUnitPublicationsTable
         columnModel.add(new TableColumn(
                 0,
                 PublicationGlobalizationUtil.globalize(
-                "genericorganizationalunit.ui.publications.columns.name"),
+                "genericorganizationalunit.ui.publications.columns.name").localize(),
                 TABLE_COL_EDIT));
         columnModel.add(new TableColumn(
                 1,
                 PublicationGlobalizationUtil.globalize(
-                "genericorganizationalunit.ui.publications.columns.remove"),
+                "genericorganizationalunit.ui.publications.columns.remove").localize(),
                 TABLE_COL_DEL));
 
         setModelBuilder(new ModelBuilder(itemModel));

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationGenericOrganizationalUnitAddForm.java

@@ -65,6 +65,8 @@ public class PublicationGenericOrganizationalUnitAddForm
                     ITEM_SEARCH);
             orgaunit = (GenericOrganizationalUnit) orgaunit.getContentBundle().
                     getInstance(publication.getLanguage(), true);
+            
+            publication.addOrganizationalUnit(orgaunit);
         }
 
         init(fse);

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationGenericOrganizationalUnitsTable.java

@@ -118,7 +118,7 @@ public class PublicationGenericOrganizationalUnitsTable extends Table {
                     return orgaunits.getTitle();
                 case 1:
                     return PublicationGlobalizationUtil.globalize(
-                            "publications.ui.orgaunits.remove");
+                            "publications.ui.orgaunits.remove").localize();
                 default:
                     return null;
             }

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources.properties

@@ -381,3 +381,7 @@ genericorganizationalunit.ui.publications.title=List of publications
 publications.ui.internetarticle.url=URL
 publications.ui.internetarticle.urn=URN
 publications.ui.internetarticle.doi=DOI
+genericorganizationalunit.ui.publication.select=Select publication to add
+publications.ui.orgaunits.columns.remove=Remove
+genericorganizationalunit.ui.publications.columns.name=Title of the publication
+genericorganizationalunit.ui.publications.columns.remove=Remove

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources_de.properties

@@ -380,3 +380,7 @@ genericorganizationalunit.ui.publications.title=Publikationsliste
 publications.ui.internetarticle.url=URL
 publications.ui.internetarticle.urn=URN
 publications.ui.internetarticle.doi=DOI
+genericorganizationalunit.ui.publication.select=Publikation zum hinzuf\u00fcgen ausw\u00e4hlen
+publications.ui.orgaunits.columns.remove=Entfernen
+genericorganizationalunit.ui.publications.columns.name=Titel der Publikation
+genericorganizationalunit.ui.publications.columns.remove=Entfernen

ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentProjectsStep.java

@@ -131,6 +131,10 @@ public class SciDepartmentProjectsStep extends SimpleEditStep {
                     public String getAssocType() {
                         return ASSOC_TYPE;
                     }
+                    
+                    public String getContentType() {
+                        return "com.arsdigita.cms.contenttypes.SciProject";
+                    }
                 });
 
         setDisplayComponent(projectsTable);

ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentSubDepartmentsStep.java

@@ -137,6 +137,10 @@ public class SciDepartmentSubDepartmentsStep extends SimpleEditStep {
                     public String getAssocType() {
                         return ASSOC_TYPE;
                     }
+                    
+                    public String getContentType() {
+                        return "com.arsdigita.cms.contenttypes.SciDepartment";
+                    }
                 });
 
         setDisplayComponent(subDepartmentTable);

ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentSuperDepartmentsStep.java

@@ -139,6 +139,10 @@ public class SciDepartmentSuperDepartmentsStep extends SimpleEditStep {
                     public String getAssocType() {
                         return ASSOC_TYPE;
                     }
+                    
+                    public String getContentType() {
+                        return "com.arsdigita.cms.contenttypes.SciDepartment";
+                    }
                 });
         
         setDisplayComponent(superDeparmentsTable);

ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciProjectDepartmentsStep.java

@@ -126,6 +126,10 @@ public class SciProjectDepartmentsStep extends SimpleEditStep {
                     public String getAssocType() {
                         return ASSOC_TYPE;
                     }
+                    
+                    public String getContentType() {
+                        return "com.arsdigita.cms.contenttypes.SciDepartment";
+                    }
                 });
 
         setDisplayComponent(departmentsTable);

ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentInstitutesStep.java

@@ -136,6 +136,10 @@ public class SciDepartmentInstitutesStep extends SimpleEditStep {
                     public String getAssocType() {
                         return ASSOC_TYPE;
                     }
+                    
+                    public String getContentType() {
+                        return "com.arsdigita.cms.contenttypes.SciInstitute";
+                    }
                 });
 
         setDisplayComponent(institutesTable);

ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteDepartmentsStep.java

@@ -134,6 +134,10 @@ public class SciInstituteDepartmentsStep extends SimpleEditStep {
                     public String getAssocType() {
                         return ASSOC_TYPE;
                     }
+                    
+                    public String getContentType() {
+                        return "com.arsdigita.cms.contenttypes.SciDepartment";
+                    }
                 });
 
         setDisplayComponent(departmentsTable);

ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstituteProjectsStep.java

@@ -131,6 +131,10 @@ public class SciInstituteProjectsStep extends SimpleEditStep {
                     public String getAssocType() {
                         return ASSOC_TYPE;
                     }
+                    
+                    public String getContentType() {
+                        return "com.arsdigita.cms.contenttypes.SciProject";
+                    }
                 });
 
         setDisplayComponent(projectsTable);

ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciProjectInstitutesStep.java

@@ -129,6 +129,10 @@ public class SciProjectInstitutesStep extends SimpleEditStep {
                     public String getAssocType() {
                         return ASSOC_TYPE;
                     }
+                    
+                    public String getContentType() {
+                        return "com.arsdigita.cms.contenttypes.SciInstitute";
+                    }
                 });
         setDisplayComponent(institutesTable);
     }

ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/SciProject.java

@@ -4,9 +4,7 @@ import com.arsdigita.cms.ExtraXMLGenerator;
 import com.arsdigita.cms.contenttypes.ui.SciProjectExtraXmlGenerator;
 import com.arsdigita.domain.DataObjectNotFoundException;
 import com.arsdigita.persistence.DataObject;
-import com.arsdigita.persistence.DataQuery;
 import com.arsdigita.persistence.OID;
-import com.arsdigita.persistence.SessionManager;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;

ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectInvolvedOrganizationsStep.java

@@ -128,6 +128,10 @@ public class SciProjectInvolvedOrganizationsStep extends SimpleEditStep {
             public String getAssocType() {
                 return ASSOC_TYPE;
             }
+            
+            public String getContentType() {
+                return null;
+            }
         });
         
         setDisplayComponent(involvedTable);

ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectResources.properties

@@ -85,3 +85,4 @@ sciproject.ui.involved_orgas.title=Involved Organizations
 sciproject.ui.involved_orgas.description=Managed involved organizations
 scidepartment.ui.superdepartment.add=Add superior department
 sciproject.ui.edit_basic_properties=Basic properties
+sciproject.ui.desc=Description

ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectResources_de.properties

@@ -86,3 +86,4 @@ sciproject.ui.involved_orgas.title=Beteiligte Organisationen
 sciproject.ui.involved_orgas.description=Verwalten von am Projekt beteiligten Organisationen
 scidepartment.ui.superdepartment.add=\u00dcbergeordnete Abteilung hinzuf\u00fcgen
 sciproject.ui.edit_basic_properties=Basiseigenschaften
+sciproject.ui.desc=Beschreibung

ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectSubProjectsStep.java

@@ -128,6 +128,10 @@ public class SciProjectSubProjectsStep extends SimpleEditStep {
                     public String getAssocType() {
                          return ASSOC_TYPE;
                     }
+                    
+                    public String getContentType() {
+                        return "com.arsdigita.cms.contenttypes.SciProject";
+                    }
                 });
 
         setDisplayComponent(subProjectsTable);

ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectSuperProjectsStep.java

@@ -121,6 +121,10 @@ public class SciProjectSuperProjectsStep extends SimpleEditStep {
             public String getAssocType() {
                 return ASSOC_TYPE;
             }
+            
+            public String getContentType() {
+                return "com.arsdigita.cms.contenttypes.SciProject";
+            }
         });
         
         setDisplayComponent(superProjectsTable);