From 930c86c1789e4b249d53e89b5dff16301bbae0a3 Mon Sep 17 00:00:00 2001
From: quasi <quasi@8810af33-2d31-482b-a856-94f89814c4df>
Date: Wed, 15 Jul 2009 09:58:58 +0000
Subject: [PATCH] BaseContact

git-svn-id: https://svn.libreccm.org/ccm/trunk@213 8810af33-2d31-482b-a856-94f89814c4df
---
 .../com/arsdigita/cms/contenttypes/BaseContact.java |  5 +++++
 .../contenttypes/ui/BaseContactEntriesTable.java    | 13 ++++++-------
 .../contenttypes/ui/BaseContactPropertiesStep.java  |  5 ++---
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/ccm-cms-types-baseContact/src/com/arsdigita/cms/contenttypes/BaseContact.java b/ccm-cms-types-baseContact/src/com/arsdigita/cms/contenttypes/BaseContact.java
index 7bbfccf10..f22a22124 100755
--- a/ccm-cms-types-baseContact/src/com/arsdigita/cms/contenttypes/BaseContact.java
+++ b/ccm-cms-types-baseContact/src/com/arsdigita/cms/contenttypes/BaseContact.java
@@ -111,4 +111,9 @@ public class BaseContact extends ContentPage {
         Assert.exists(contactEntry, BaseContactEntry.class);
         remove(CONTACT_ENTRIES, contactEntry);
     }
+    
+    public boolean hasContactEntries() {
+        return !this.getContactEntries().isEmpty();
+    }
+    }
 }
diff --git a/ccm-cms-types-baseContact/src/com/arsdigita/cms/contenttypes/ui/BaseContactEntriesTable.java b/ccm-cms-types-baseContact/src/com/arsdigita/cms/contenttypes/ui/BaseContactEntriesTable.java
index e54aee8d6..e6756bc6c 100644
--- a/ccm-cms-types-baseContact/src/com/arsdigita/cms/contenttypes/ui/BaseContactEntriesTable.java
+++ b/ccm-cms-types-baseContact/src/com/arsdigita/cms/contenttypes/ui/BaseContactEntriesTable.java
@@ -22,24 +22,23 @@ import com.arsdigita.bebop.Component;
 import com.arsdigita.bebop.ControlLink;
 import com.arsdigita.bebop.Label;
 import com.arsdigita.bebop.PageState;
-import com.arsdigita.bebop.SingleSelectionModel;
 import com.arsdigita.bebop.Table;
 import com.arsdigita.bebop.event.TableActionEvent;
-import com.arsdigita.bebop.event.TableActionListener;
 import com.arsdigita.bebop.table.TableCellRenderer;
 import com.arsdigita.bebop.table.TableColumn;
 import com.arsdigita.bebop.table.TableColumnModel;
 import com.arsdigita.bebop.table.TableModel;
 import com.arsdigita.bebop.table.TableModelBuilder;
-import com.arsdigita.categorization.Category;
-import com.arsdigita.categorization.CategoryLocalization;
-import com.arsdigita.categorization.CategoryLocalizationCollection;
+import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.cms.SecurityManager;
+import com.arsdigita.cms.contenttypes.BaseContact;
+import com.arsdigita.cms.contenttypes.BaseContactEntry;
+import com.arsdigita.cms.contenttypes.BaseContactEntryCollection;
 import com.arsdigita.cms.dispatcher.Utilities;
+import com.arsdigita.cms.ui.authoring.AuthoringKitWizard;
 import com.arsdigita.cms.util.GlobalizationUtil;
 import com.arsdigita.util.LockableImpl;
 import java.math.BigDecimal;
-import java.util.Locale;
 
 /**
  * Lists all existing contact entries for a selected contact.
@@ -212,7 +211,7 @@ public class BaseContactEntriesTable extends Table {
             if(true) {
                 ControlLink link = new ControlLink(value.toString());
                 link.setConfirmation((String) GlobalizationUtil.globalize(
-                        "cms.ui.category.localization.confirm_delete").localize());
+                        "cms.contenttypes.ui.baseContact.confirm_delete").localize());
                 return link;
             } else {
                 return new Label(value.toString());
diff --git a/ccm-cms-types-baseContact/src/com/arsdigita/cms/contenttypes/ui/BaseContactPropertiesStep.java b/ccm-cms-types-baseContact/src/com/arsdigita/cms/contenttypes/ui/BaseContactPropertiesStep.java
index a42de1576..73d15fa9e 100644
--- a/ccm-cms-types-baseContact/src/com/arsdigita/cms/contenttypes/ui/BaseContactPropertiesStep.java
+++ b/ccm-cms-types-baseContact/src/com/arsdigita/cms/contenttypes/ui/BaseContactPropertiesStep.java
@@ -14,8 +14,6 @@ import com.arsdigita.cms.util.GlobalizationUtil;
 import com.arsdigita.bebop.Component;
 import com.arsdigita.bebop.Label;
 import com.arsdigita.bebop.SegmentedPanel;
-import com.arsdigita.cms.contenttypes.Person;
-import com.arsdigita.cms.contenttypes.util.PersonGlobalizationUtil;
 
 import java.text.DateFormat;
 import org.apache.log4j.Logger;
@@ -60,12 +58,13 @@ public class BaseContactPropertiesStep extends SimpleEditStep {
 
         BaseContactPersonPropertiesStep personProperties = new BaseContactPersonPropertiesStep(itemModel, parent);
         BaseContactAddressPropertiesStep addressProperties = new BaseContactAddressPropertiesStep(itemModel, parent);
+        BaseContactEntriesTable baseContactEntries = new BaseContactEntriesTable(itemModel, parent);
 
         /* Add the SimpleEditStep to the segmented panel */
         segmentedPanel.addSegment(new Label("Basic"), basicProperties);
         segmentedPanel.addSegment(new Label((String)GlobalizationUtil.globalize("cms.contenttypes.ui.baseContact.person").localize()), personProperties);
         segmentedPanel.addSegment(new Label((String)GlobalizationUtil.globalize("cms.contenttypes.ui.baseContact.address").localize()), addressProperties);
-//        segmentedPanel.addSegment(new Label((String)GlobalizationUtil.globalize("cms.contenttypes.ui.baseContact.baseContactEntries").localize()), BaseContactEntriesSection);        
+        segmentedPanel.addSegment(new Label((String)GlobalizationUtil.globalize("cms.contenttypes.ui.baseContact.baseContactEntries").localize()), baseContactEntries);
         
         /* Sets the composed segmentedPanel as display component */
         setDisplayComponent(segmentedPanel);