Alle Aufrufe von ContentBundle#hasInstance(String) geprüft und ggf. auf ContentBundle#hasInstance(String, boolean) geändert.

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

ccm-cms-publicpersonalprofile/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xml

@@ -15,18 +15,22 @@
                 <xrd:property name="/object/owner/contacts/version"/>
                 <xrd:property name="/object/owner/address/ancestors"/>
                 <xrd:property name="/object/owner/address/isDeleted"/>
-                <xrd:property name="/object/owner/address/version"/>
+                <xrd:property name="/object/owner/address/version"/>               
-                
             </xrd:attributes>
-            
+                                   
             <xrd:associations rule="include">
                 <xrd:property name="/object/owner"/>
                 <xrd:property name="/object/owner/contacts"/>
                 <xrd:property name="/object/owner/contacts/contactentries"/>
                 <xrd:property name="/object/owner/contacts/address"/>
                 <xrd:property name="/object/owner/imageAttachments"/>                 
-                <xrd:property name="/object/owner/imageAttachments/image"/>                 
+                <xrd:property name="/object/owner/imageAttachments/image"/>                
             </xrd:associations>
+            
+            <!--<xrd:associations rule="exclude">
+                <xrd:property name="/object/imageAttachments"/>                 
+                <xrd:property name="/object/imageAttachments/image"/>                
+            </xrd:associations>-->
         </xrd:adapter>
     
     </xrd:context>

ccm-cms/src/com/arsdigita/cms/contenttypes/GenericOrganizationalUnit.java

@@ -131,9 +131,9 @@ public class GenericOrganizationalUnit extends ContentPage {
         GenericPerson personToLink = person;
 
         final ContentBundle bundle = person.getContentBundle();
-        if ((bundle != null) && (bundle.hasInstance(this.getLanguage()))) {
+        if ((bundle != null) && (bundle.hasInstance(this.getLanguage(), true))) {
             personToLink =
-            (GenericPerson) bundle.getInstance(this.getLanguage());
+            (GenericPerson) bundle.getInstance(this.getLanguage(), true);
         }
 
         Assert.exists(personToLink, GenericPerson.class);

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

@@ -162,7 +162,7 @@ public class GenericContactAttachAddressPropertyForm extends BasicPageForm
         
           GenericAddress address = (GenericAddress) data.get(ITEM_SEARCH);
           
-          if (!(address.getContentBundle().hasInstance(contact.getLanguage()))) {
+          if (!(address.getContentBundle().hasInstance(contact.getLanguage(), true))) {
               data.addError( ContenttypesGlobalizationUtil.globalize(
                     "cms.contenttypes.ui.contact.select_address.no_suitable_language_variant"));
           }

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

@@ -192,7 +192,7 @@ public class GenericContactAttachPersonPropertyForm extends BasicPageForm
                 getSelectedObject(state);
         GenericPerson person = (GenericPerson) data.get(ITEM_SEARCH);
         
-        if (!(person.getContentBundle().hasInstance(contact.getLanguage()))) {
+        if (!(person.getContentBundle().hasInstance(contact.getLanguage(), true))) {
             data.addError("cms.contenttypes.ui.contact.select_person.no_suitable_language_variant");
         }
         

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

@@ -202,7 +202,7 @@ public class GenericOrganizationalUnitContactAddForm
 
             GenericContact contact = (GenericContact) data.get(ITEM_SEARCH);
 
-            if (!(contact.getContentBundle().hasInstance(orgaunit.getLanguage()))) {
+            if (!(contact.getContentBundle().hasInstance(orgaunit.getLanguage(), true))) {
                 data.addError(
                         ContenttypesGlobalizationUtil.globalize(
                         "cms.contenttypes.ui.genericorgaunit.select_contact.no_suitable_language_variant"));

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

@@ -245,7 +245,7 @@ public class GenericOrganizationalUnitPersonAddForm
 
             GenericPerson person = (GenericPerson) data.get(ITEM_SEARCH);
 
-            if (!(person.getContentBundle().hasInstance(orga.getLanguage()))) {
+            if (!(person.getContentBundle().hasInstance(orga.getLanguage(), true))) {
                 data.addError(
                         ContenttypesGlobalizationUtil.globalize(
                         "cms.contenttypes.ui.genericorgaunit.person.no_suitable_language_variant"));

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

@@ -137,7 +137,7 @@ public class GenericPersonAliasSetForm
         } else if (person.equals(data.get(ITEM_SEARCH))) {
             data.addError(ContenttypesGlobalizationUtil.globalize(
                     "cms.contenttypes.person.alias.select.same_as_person"));
-        } else if (!alias.getContentBundle().hasInstance(person.getLanguage())) {
+        } else if (!alias.getContentBundle().hasInstance(person.getLanguage(), true)) {
             data.addError(
                     ContenttypesGlobalizationUtil.globalize(
                     "cms.contenttypes.person.alias.select.no_suitable_language_variant"));

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

@@ -156,7 +156,7 @@ public class GenericPersonContactAddForm extends BasicItemForm {
 
         GenericContact contact = (GenericContact) data.get(ITEM_SEARCH);
 
-        if (!(contact.getContentBundle().hasInstance(person.getLanguage()))) {
+        if (!(contact.getContentBundle().hasInstance(person.getLanguage(), true))) {
             data.addError(
                     ContenttypesGlobalizationUtil.globalize(
                     "cms.contenttypes.ui.person.select_contact.no_suitable_language_variant"));

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

@@ -107,7 +107,7 @@ public class ArticleInCollectedVolumeCollectedVolumeForm
         
         CollectedVolume collectedVolume = (CollectedVolume) data.get(ITEM_SEARCH);
         
-        if (!(collectedVolume.getContentBundle().hasInstance(article.getLanguage()))) {
+        if (!(collectedVolume.getContentBundle().hasInstance(article.getLanguage(), true))) {
              data.addError(
                     PublicationGlobalizationUtil.globalize(
                     "publications.ui.articleInCollectedVolume.selectCollectedVolume.no_suitable_language_variant"));

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

@@ -100,7 +100,7 @@ public class ArticleInJournalJournalForm
                 state);
         Journal journal = (Journal) data.get(ITEM_SEARCH);
         
-        if (!(journal.getContentBundle().hasInstance(article.getLanguage()))) {
+        if (!(journal.getContentBundle().hasInstance(article.getLanguage(), true))) {
                data.addError(PublicationGlobalizationUtil.globalize(
                 "publications.ui.articleInJournal.selectJournal.no_suitable_language_variant"));
             return;

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

@@ -112,7 +112,7 @@ public class CollectedVolumeArticleAddForm
         CollectedVolume collectedVolume = (CollectedVolume) getItemSelectionModel().getSelectedObject(state);
         ArticleInCollectedVolume article = (ArticleInCollectedVolume) data.get(ITEM_SEARCH);
         
-        if (!(article.getContentBundle().hasInstance(collectedVolume.getLanguage()))) {
+        if (!(article.getContentBundle().hasInstance(collectedVolume.getLanguage(), true))) {
              data.addError(PublicationGlobalizationUtil.globalize(
                 "publications.ui.collected_volume.articles.select_article.no_suitable_language_variant"));
             return;

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

@@ -80,7 +80,7 @@ public class ExpertiseOrdererForm
         
         Expertise expertise = (Expertise) getItemSelectionModel().getSelectedObject(state);
         GenericOrganizationalUnit orderer = (GenericOrganizationalUnit) data.get(ITEM_SEARCH);        
-        if (!(orderer.getContentBundle().hasInstance(expertise.getLanguage()))) {
+        if (!(orderer.getContentBundle().hasInstance(expertise.getLanguage(), true))) {
               data.addError(PublicationGlobalizationUtil.globalize(
                 "publications.ui.expertise.orderer.no_suitable_langauge_variant"));
             

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

@@ -80,7 +80,7 @@ public class ExpertiseOrganizationForm
         
         Expertise expertise = (Expertise) getItemSelectionModel().getSelectedObject(state);
         GenericOrganizationalUnit orga = (GenericOrganizationalUnit) data.get(ITEM_SEARCH);
-        if (!(orga.getContentBundle().hasInstance(expertise.getLanguage()))) {
+        if (!(orga.getContentBundle().hasInstance(expertise.getLanguage(), true))) {
             data.addError(PublicationGlobalizationUtil.globalize(
                     "publications.ui.expertise.organization.no_suitable_language_variant"));
             return;

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

@@ -103,7 +103,7 @@ public class InProceedingsProceedingsForm
                 getSelectedObject(state);
         Proceedings proceedings = (Proceedings) data.get(ITEM_SEARCH);
         if (!(proceedings.getContentBundle().hasInstance(inProceedings.
-              getLanguage()))) {
+              getLanguage(), true))) {
             data.addError(
                     PublicationGlobalizationUtil.globalize(
                     "publications.ui.inProceedings.selectProceedings.no_suitable_language_variant"));

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

@@ -82,7 +82,7 @@ public class InternetArticleOrganizationForm
                 getSelectedObject(state);
         GenericOrganizationalUnit orga = (GenericOrganizationalUnit) data.get(
                 ITEM_SEARCH);
-        if (!(orga.getContentBundle().hasInstance(article.getLanguage()))) {
+        if (!(orga.getContentBundle().hasInstance(article.getLanguage(), true))) {
             data.addError(
                     PublicationGlobalizationUtil.globalize(
                     "publications.ui.internetarticle.select_organization.no_suitable_language_variant"));

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

@@ -109,7 +109,7 @@ public class JournalArticleAddForm
         Journal journal = (Journal) getItemSelectionModel().getSelectedObject(
                 state);
         ArticleInJournal article = (ArticleInJournal) data.get(ITEM_SEARCH);
-        if (!(article.getContentBundle().hasInstance(journal.getLanguage()))) {
+        if (!(article.getContentBundle().hasInstance(journal.getLanguage(), true))) {
             data.addError(
                     PublicationGlobalizationUtil.globalize(
                     "publications.ui.journal.articles.select_article.no_suitable_language_variant"));

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

@@ -83,7 +83,7 @@ public class ProceedingsOrganizerForm
                 getSelectedObject(state);
         GenericOrganizationalUnit organizer = (GenericOrganizationalUnit) data.
                 get(ITEM_SEARCH);
-        if (!(organizer.getContentBundle().hasInstance(proceedings.getLanguage()))) {
+        if (!(organizer.getContentBundle().hasInstance(proceedings.getLanguage(), true))) {
             data.addError(PublicationGlobalizationUtil.globalize(
                     "publications.ui.proceedings.organizer.no_suitable_language_variant"));
             return;

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

@@ -105,7 +105,7 @@ public class ProceedingsPapersAddForm
         Proceedings proceedings = (Proceedings) getItemSelectionModel().
                 getSelectedObject(state);
         InProceedings paper = (InProceedings) data.get(ITEM_SEARCH);
-        if (!(paper.getContentBundle().hasInstance(proceedings.getLanguage()))) {
+        if (!(paper.getContentBundle().hasInstance(proceedings.getLanguage(), true))) {
             data.addError(
                     PublicationGlobalizationUtil.globalize(
                     "publications.ui.proceedings.select_paper.no_suitable_language_variant"));

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

@@ -211,7 +211,7 @@ public class PublicationAuthorAddForm
                     getSelectedAuthor();
             editing = true;
         }
-        if (!(author.getContentBundle().hasInstance(publication.getLanguage()))) {
+        if (!(author.getContentBundle().hasInstance(publication.getLanguage(), true))) {
             data.addError(
                     PublicationGlobalizationUtil.globalize(
                     "publications.ui.authors.selectAuthor.no_suitable_language_variant"));

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

@@ -108,7 +108,7 @@ public class PublicationSeriesAddForm
         Publication publication = (Publication) getItemSelectionModel().
                 getSelectedObject(state);
         Series series = (Series) data.get(ITEM_SEARCH);
-        if (!(series.getContentBundle().hasInstance(publication.getLanguage()))) {
+        if (!(series.getContentBundle().hasInstance(publication.getLanguage(), true))) {
             data.addError(
                     PublicationGlobalizationUtil.globalize(
                     "publications.ui.series.select_series.no_suitable_language_variant"));

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

@@ -85,7 +85,7 @@ public class PublicationWithPublisherSetPublisherForm
                                  (PublicationWithPublisher) getItemSelectionModel().
                 getSelectedObject(state);
         Publisher publisher = (Publisher) data.get(ITEM_SEARCH);
-        if (!(publisher.getContentBundle().hasInstance(publication.getLanguage()))) {
+        if (!(publisher.getContentBundle().hasInstance(publication.getLanguage(), true))) {
             data.addError(
                     PublicationGlobalizationUtil.globalize(
                     "publications.ui.with_publisher.publisher.no_suitable_language_variant"));

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

@@ -196,7 +196,7 @@ public class SeriesEditshipAddForm
         
         Series series = (Series) getItemSelectionModel().getSelectedObject(state);
         GenericPerson editor = (GenericPerson) data.get(ITEM_SEARCH);
-        if (!(editor.getContentBundle().hasInstance(series.getLanguage()))) {
+        if (!(editor.getContentBundle().hasInstance(series.getLanguage(), true))) {
             data.addError(PublicationGlobalizationUtil.globalize(
                 "publications.ui.series.editship.no_suitable_language_variant"));
             return;

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

@@ -119,7 +119,7 @@ public class SeriesVolumeAddForm extends BasicItemForm {
         Series series = (Series) getItemSelectionModel().
                 getSelectedObject(state);
         Publication volume = (Publication) data.get(ITEM_SEARCH);
-        if (!(volume.getContentBundle().hasInstance(series.getLanguage()))) {
+        if (!(volume.getContentBundle().hasInstance(series.getLanguage(), true))) {
             data.addError(
                     PublicationGlobalizationUtil.globalize(
                     "publications.ui.series.volume_of_series.no_suitable_language_variant"));

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

@@ -82,7 +82,7 @@ public class UnPublishedOrganizationForm
                 getSelectedObject(state);
         GenericOrganizationalUnit orga = (GenericOrganizationalUnit) data.get(
                 ITEM_SEARCH);
-        if (!(orga.getContentBundle().hasInstance(unPublished.getLanguage()))) {
+        if (!(orga.getContentBundle().hasInstance(unPublished.getLanguage(), true))) {
             data.addError(PublicationGlobalizationUtil.globalize(
                     "publications.ui.unpublished.organization.no_suitable_language_variant"));
             return;