From 868039173447b97282d791f69edf725d27549438 Mon Sep 17 00:00:00 2001 From: quasi Date: Mon, 25 Oct 2010 13:00:36 +0000 Subject: [PATCH] RelationAttribute MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Habe den Fehler endlich gefunden... Es lassen sich jetzt Contact zu Personen hinzfügen. git-svn-id: https://svn.libreccm.org/ccm/trunk@586 8810af33-2d31-482b-a856-94f89814c4df --- .../src/com/arsdigita/cms/RelationAttributeCollection.java | 6 ------ .../cms/contenttypes/ui/GenericPersonContactTable.java | 5 ++--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/ccm-cms/src/com/arsdigita/cms/RelationAttributeCollection.java b/ccm-cms/src/com/arsdigita/cms/RelationAttributeCollection.java index eabe3cbd3..9c54bb5ac 100644 --- a/ccm-cms/src/com/arsdigita/cms/RelationAttributeCollection.java +++ b/ccm-cms/src/com/arsdigita/cms/RelationAttributeCollection.java @@ -16,9 +16,6 @@ import org.apache.log4j.Logger; */ public class RelationAttributeCollection extends DomainCollection { - public static final Logger logger = - Logger.getLogger( - RelationAttributeCollection.class); public static String ATTRIBUTE = RelationAttribute.ATTRIBUTE; public static String KEY = RelationAttribute.KEY; public static String LANGUAGE = RelationAttribute.LANGUAGE; @@ -115,9 +112,6 @@ public class RelationAttributeCollection extends DomainCollection { // Get RelationAttribute in desired language public RelationAttribute getRelationAttribute(String key, String language) { - logger.debug(String.format("this.getKey() = %s", this.getKey())); - logger.debug(String.format("this.language() = %s", this.getLanguage())); - // First, test the current element if(!this.isBeforeFirst() && key.equals(this.getKey()) && language.equals(this.getLanguage())) { diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactTable.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactTable.java index 7ec4a7809..c97890c78 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactTable.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactTable.java @@ -112,7 +112,6 @@ public class GenericPersonContactTable extends Table implements TableActionListe private GenericContact m_contact; private GenericContactTypeCollection contacttypes = new GenericContactTypeCollection(); - private GenericPersonTableModel(Table t, PageState ps, GenericPerson person) { m_table = t; m_contactCollection = person.getContacts(); @@ -151,7 +150,7 @@ public class GenericPersonContactTable extends Table implements TableActionListe return m_contactCollection.getContactOrder(); case 1: return contacttypes.getRelationAttribute(m_contactCollection.getContactType(), - DispatcherHelper.getNegotiatedLocale().getLanguage()).getName(); + DispatcherHelper.getNegotiatedLocale().getLanguage()).getName(); case 2: return m_contact.getTitle(); case 3: @@ -231,7 +230,7 @@ public class GenericPersonContactTable extends Table implements TableActionListe PageState state = evt.getPageState(); // Get selected GenericContact - GenericContact contact = new GenericContact(new BigDecimal(evt.getRowKey().toString())); + GenericContact contact = new GenericContact(new BigDecimal(evt.getRowKey().toString())); // Get GenericPerson GenericPerson person = (GenericPerson) m_itemModel.getSelectedObject(state);