Phones for the Contact object
- * which is retrieved from the ItemSelectionModel.
- *
- *
- * @author Shashin Shinde sshinde@redhat.com
- * @version $Id: PhoBaseContactEntriesPropertiesStepva 287 2005-02-22 00:29:02Z sskracic $
- */
-public class HealthCareFacilityBaseContactPropertiesStep extends SimpleEditStep {
-
- /** The name of the editing sheet added to this step */
- private static String ADD_CONTACT_SHEET_NAME = "addContact";
-
- public HealthCareFacilityBaseContactPropertiesStep(ItemSelectionModel itemModel, AuthoringKitWizard parent) {
- this(itemModel, parent, null);
- }
-
- public HealthCareFacilityBaseContactPropertiesStep(ItemSelectionModel itemModel, AuthoringKitWizard parent, String prefix) {
- super(itemModel, parent, prefix);
-
- BasicItemForm addContactSheet = new HealthCareFacilityBaseContactAddForm(itemModel);
- add(ADD_CONTACT_SHEET_NAME,
- (String)HealthCareFacilityGlobalizationUtil.globalize("cms.contenttypes.ui.healthCareFacility.add_contact").localize(),
- new WorkflowLockedComponentAccess(addContactSheet, itemModel),
- addContactSheet.getSaveCancelSection().getCancelButton());
-
- HealthCareFacilityBaseContactTable contactsTable = new HealthCareFacilityBaseContactTable(itemModel);
- setDisplayComponent(contactsTable);
-
- }
-
-}
\ No newline at end of file
diff --git a/ccm-cms-types-healthCareFacility/src/com/arsdigita/cms/contenttypes/ui/HealthCareFacilityBaseContactAddForm.java b/ccm-cms-types-healthCareFacility/src/com/arsdigita/cms/contenttypes/ui/HealthCareFacilityContactAddForm.java
similarity index 70%
rename from ccm-cms-types-healthCareFacility/src/com/arsdigita/cms/contenttypes/ui/HealthCareFacilityBaseContactAddForm.java
rename to ccm-cms-types-healthCareFacility/src/com/arsdigita/cms/contenttypes/ui/HealthCareFacilityContactAddForm.java
index f3c231407..8f884043d 100644
--- a/ccm-cms-types-healthCareFacility/src/com/arsdigita/cms/contenttypes/ui/HealthCareFacilityBaseContactAddForm.java
+++ b/ccm-cms-types-healthCareFacility/src/com/arsdigita/cms/contenttypes/ui/HealthCareFacilityContactAddForm.java
@@ -28,12 +28,11 @@ import com.arsdigita.bebop.form.SingleSelect;
import com.arsdigita.bebop.parameters.NotNullValidationListener;
import com.arsdigita.bebop.parameters.ParameterModel;
import com.arsdigita.cms.ItemSelectionModel;
-import com.arsdigita.cms.contenttypes.BaseContact;
-import com.arsdigita.cms.contenttypes.util.BaseContactGlobalizationUtil;
+import com.arsdigita.cms.basetypes.util.BasetypesGlobalizationUtil;
import com.arsdigita.cms.ui.authoring.BasicItemForm;
import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.cms.ContentType;
-import com.arsdigita.cms.contenttypes.BaseContactCollection;
+import com.arsdigita.cms.contenttypes.HealthCareFacilityContactCollection;
import com.arsdigita.cms.contenttypes.HealthCareFacility;
import com.arsdigita.cms.contenttypes.util.HealthCareFacilityGlobalizationUtil;
import com.arsdigita.cms.ui.ItemSearchWidget;
@@ -49,67 +48,67 @@ import org.apache.log4j.Logger;
*
* @author Sören Bernstein (quasimodo) quasi@zes.uni-bremen.de
*/
-public class HealthCareFacilityBaseContactAddForm extends BasicItemForm {
- private static final Logger s_log = Logger.getLogger(HealthCareFacilityBaseContactAddForm.class);
-
+public class HealthCareFacilityContactAddForm extends BasicItemForm {
+
+ private static final Logger s_log = Logger.getLogger(HealthCareFacilityContactAddForm.class);
private HealthCareFacilityAddressPropertiesStep m_step;
private ItemSearchWidget m_itemSearch;
private SaveCancelSection m_saveCancelSection;
private final String ITEM_SEARCH = "healthCareFacilityAddress";
-
private ItemSelectionModel m_itemModel;
-
+
/** Creates a new instance of CategoryLocalizationAddForm */
- public HealthCareFacilityBaseContactAddForm(ItemSelectionModel itemModel) {
-
- super("BaseContactEntryAddForm",itemModel);
+ public HealthCareFacilityContactAddForm(ItemSelectionModel itemModel) {
+
+ super("ContactEntryAddForm", itemModel);
m_itemModel = itemModel;
-
+
}
-
+
+ @Override
protected void addWidgets() {
-
+
// Attach a Contact object
- add(new Label((String)HealthCareFacilityGlobalizationUtil.globalize("cms.contenttypes.ui.healthCareFacility.select_contact").localize()));
- this.m_itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType.findByAssociatedObjectType("com.arsdigita.cms.contenttypes.BaseContact"));
+ add(new Label((String) HealthCareFacilityGlobalizationUtil.globalize("cms.contenttypes.ui.healthCareFacility.select_contact").localize()));
+ this.m_itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType.findByAssociatedObjectType("com.arsdigita.cms.contenttypes.Contact"));
add(this.m_itemSearch);
-
+
// Contact type field
- add(new Label(BaseContactGlobalizationUtil.globalize("cms.contenttypes.ui.healthCareFacility.contact.type")));
- ParameterModel contactTypeParam = new StringParameter(BaseContactCollection.CONTACT_TYPE);
+ add(new Label(HealthCareFacilityGlobalizationUtil.globalize("cms.contenttypes.ui.healthCareFacility.contact.type")));
+ ParameterModel contactTypeParam = new StringParameter(HealthCareFacilityContactCollection.CONTACT_TYPE);
SingleSelect contactType = new SingleSelect(contactTypeParam);
contactType.addValidationListener(new NotNullValidationListener());
- contactType.addOption(new Option("", new Label((String)BaseContactGlobalizationUtil.globalize("cms.ui.select_one").localize())));
-
+ contactType.addOption(new Option("", new Label((String) BasetypesGlobalizationUtil.globalize("cms.ui.select_one").localize())));
+
// Add the Options to the SingleSelect widget
StringTokenizer keyList = HealthCareFacility.getConfig().getContactTypeKeys();
- while(keyList.hasMoreElements()) {
+ while (keyList.hasMoreElements()) {
String currentKey = keyList.nextToken();
- contactType.addOption(new Option(currentKey, ((String)HealthCareFacilityGlobalizationUtil.globalize("cms.contenttypes.ui.healthCareFacility.contactType.key." + currentKey).localize())));
+ contactType.addOption(new Option(currentKey, ((String) HealthCareFacilityGlobalizationUtil.globalize("cms.contenttypes.ui.healthCareFacility.contactType.key." + currentKey).localize())));
}
-
+
add(contactType);
}
-
+
public void init(FormSectionEvent fse) {
FormData data = fse.getFormData();
PageState state = fse.getPageState();
- HealthCareFacility healthCareFacility = (HealthCareFacility)getItemSelectionModel().getSelectedObject(state);
-
+ HealthCareFacility healthCareFacility = (HealthCareFacility) getItemSelectionModel().getSelectedObject(state);
+
setVisible(state, true);
}
-
+
public void process(FormSectionEvent fse) {
FormData data = fse.getFormData();
PageState state = fse.getPageState();
- HealthCareFacility healthCareFacility = (HealthCareFacility)getItemSelectionModel().getSelectedObject(state);
-
+ HealthCareFacility healthCareFacility = (HealthCareFacility) getItemSelectionModel().getSelectedObject(state);
+
//
if (!this.getSaveCancelSection().getCancelButton().isSelected(state)) {
- healthCareFacility.addContact((BaseContact)data.get(ITEM_SEARCH),
- (String)data.get(BaseContactCollection.CONTACT_TYPE));
+ healthCareFacility.addContact((com.arsdigita.cms.basetypes.Contact) data.get(ITEM_SEARCH),
+ (String) data.get(HealthCareFacilityContactCollection.CONTACT_TYPE));
}
-
+
init(fse);
}
}
diff --git a/ccm-cms-types-healthCareFacility/src/com/arsdigita/cms/contenttypes/ui/HealthCareFacilityContactPropertiesStep.java b/ccm-cms-types-healthCareFacility/src/com/arsdigita/cms/contenttypes/ui/HealthCareFacilityContactPropertiesStep.java
new file mode 100644
index 000000000..849348efc
--- /dev/null
+++ b/ccm-cms-types-healthCareFacility/src/com/arsdigita/cms/contenttypes/ui/HealthCareFacilityContactPropertiesStep.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2004 Red Hat Inc. All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+package com.arsdigita.cms.contenttypes.ui;
+
+import com.arsdigita.cms.ItemSelectionModel;
+import com.arsdigita.cms.contenttypes.util.HealthCareFacilityGlobalizationUtil;
+import com.arsdigita.cms.ui.authoring.AuthoringKitWizard;
+import com.arsdigita.cms.ui.authoring.BasicItemForm;
+import com.arsdigita.cms.ui.authoring.SimpleEditStep;
+import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess;
+
+/**
+ * @author Sören Bernstein
+ */
+public class HealthCareFacilityContactPropertiesStep extends SimpleEditStep {
+
+ /** The name of the editing sheet added to this step */
+ private static String ADD_CONTACT_SHEET_NAME = "addContact";
+
+ public HealthCareFacilityContactPropertiesStep(ItemSelectionModel itemModel, AuthoringKitWizard parent) {
+ this(itemModel, parent, null);
+ }
+
+ public HealthCareFacilityContactPropertiesStep(ItemSelectionModel itemModel, AuthoringKitWizard parent, String prefix) {
+ super(itemModel, parent, prefix);
+
+ BasicItemForm addContactSheet = new HealthCareFacilityContactAddForm(itemModel);
+ add(ADD_CONTACT_SHEET_NAME,
+ (String) HealthCareFacilityGlobalizationUtil.globalize("cms.contenttypes.ui.healthCareFacility.add_contact").localize(),
+ new WorkflowLockedComponentAccess(addContactSheet, itemModel),
+ addContactSheet.getSaveCancelSection().getCancelButton());
+
+ HealthCareFacilityContactTable contactsTable = new HealthCareFacilityContactTable(itemModel);
+ setDisplayComponent(contactsTable);
+
+ }
+}
diff --git a/ccm-cms-types-healthCareFacility/src/com/arsdigita/cms/contenttypes/ui/HealthCareFacilityBaseContactTable.java b/ccm-cms-types-healthCareFacility/src/com/arsdigita/cms/contenttypes/ui/HealthCareFacilityContactTable.java
similarity index 81%
rename from ccm-cms-types-healthCareFacility/src/com/arsdigita/cms/contenttypes/ui/HealthCareFacilityBaseContactTable.java
rename to ccm-cms-types-healthCareFacility/src/com/arsdigita/cms/contenttypes/ui/HealthCareFacilityContactTable.java
index 71cfe5e8c..cf2fb2e87 100644
--- a/ccm-cms-types-healthCareFacility/src/com/arsdigita/cms/contenttypes/ui/HealthCareFacilityBaseContactTable.java
+++ b/ccm-cms-types-healthCareFacility/src/com/arsdigita/cms/contenttypes/ui/HealthCareFacilityContactTable.java
@@ -32,8 +32,7 @@ import com.arsdigita.bebop.table.TableModel;
import com.arsdigita.bebop.table.TableModelBuilder;
import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.SecurityManager;
-import com.arsdigita.cms.contenttypes.BaseContact;
-import com.arsdigita.cms.contenttypes.BaseContactCollection;
+import com.arsdigita.cms.contenttypes.HealthCareFacilityContactCollection;
import com.arsdigita.cms.contenttypes.HealthCareFacility;
import com.arsdigita.cms.contenttypes.util.HealthCareFacilityGlobalizationUtil;
import com.arsdigita.cms.dispatcher.Utilities;
@@ -46,112 +45,109 @@ import java.math.BigDecimal;
*
* @author Sören Bernstein (quasimodo) quasi@barkhof.uni-bremen.de
*/
-public class HealthCareFacilityBaseContactTable extends Table implements TableActionListener{
-
-
+public class HealthCareFacilityContactTable extends Table implements TableActionListener {
+
private final String TABLE_COL_EDIT = "table_col_edit";
- private final String TABLE_COL_DEL = "table_col_del";
-
+ private final String TABLE_COL_DEL = "table_col_del";
private ItemSelectionModel m_itemModel;
-
+
/**
* Creates a new instance of HealthCareFacilityHealthCareFacilityTable
*/
- public HealthCareFacilityBaseContactTable(final ItemSelectionModel itemModel) {
-
+ public HealthCareFacilityContactTable(final ItemSelectionModel itemModel) {
+
super();
this.m_itemModel = itemModel;
-
+
// if table is empty:
setEmptyView(new Label(HealthCareFacilityGlobalizationUtil.globalize("cms.contenttypes.ui.healthCareFacility.contacts.none")));
TableColumnModel tab_model = getColumnModel();
-
+
// define columns
tab_model.add(new TableColumn(0, HealthCareFacilityGlobalizationUtil.globalize("cms.contenttypes.ui.healthCareFacility.contact.order").localize(), TABLE_COL_EDIT));
tab_model.add(new TableColumn(1, HealthCareFacilityGlobalizationUtil.globalize("cms.contenttypes.ui.healthCareFacility.contact.type").localize()));
tab_model.add(new TableColumn(2, HealthCareFacilityGlobalizationUtil.globalize("cms.contenttypes.ui.healthCareFacility.contact.title").localize()));
tab_model.add(new TableColumn(3, HealthCareFacilityGlobalizationUtil.globalize("cms.contenttypes.ui.healthCareFacility.contact.action").localize(), TABLE_COL_DEL));
-
+
setModelBuilder(new HealthCareFacilityTableModelBuilder(itemModel));
-
+
tab_model.get(0).setCellRenderer(new EditCellRenderer());
tab_model.get(3).setCellRenderer(new DeleteCellRenderer());
-
+
addTableActionListener(this);
-
+
}
-
+
/**
* XXXX
*
*/
private class HealthCareFacilityTableModelBuilder extends LockableImpl implements TableModelBuilder {
-
+
private ItemSelectionModel m_itemModel;
-
+
public HealthCareFacilityTableModelBuilder(ItemSelectionModel itemModel) {
m_itemModel = itemModel;
}
-
+
public TableModel makeModel(Table table, PageState state) {
table.getRowSelectionModel().clearSelection(state);
HealthCareFacility healthCareFacility = (HealthCareFacility) m_itemModel.getSelectedObject(state);
return new HealthCareFacilityTableModel(table, state, healthCareFacility);
}
}
-
+
/**
* XXX
*
*/
private class HealthCareFacilityTableModel implements TableModel {
-
+
final private int MAX_DESC_LENGTH = 25;
-
private Table m_table;
- private BaseContactCollection m_baseContactCollection;
- private BaseContact m_baseContact;
-
+ private HealthCareFacilityContactCollection m_contactCollection;
+ private com.arsdigita.cms.basetypes.Contact m_contact;
+
private HealthCareFacilityTableModel(Table t, PageState ps, HealthCareFacility healthCareFacility) {
m_table = t;
- m_baseContactCollection = healthCareFacility.getContacts();
+ m_contactCollection = healthCareFacility.getContacts();
}
-
+
public int getColumnCount() {
return m_table.getColumnModel().size();
}
-
+
/**
* Check collection for the existence of another row.
*
* If exists, fetch the value of current HealthCareFacilityEntryCollection object
- * into m_healthCareFacilityEntry class variable.
+ * into m_comntact class variable.
*/
public boolean nextRow() {
-
- if(m_baseContactCollection != null && m_baseContactCollection.next()){
- m_baseContact = m_baseContactCollection.getBaseContact();
+
+ if (m_contactCollection != null && m_contactCollection.next()) {
+ m_contact = m_contactCollection.getContact();
return true;
-
+
} else {
-
+
return false;
-
+
}
}
-
+
/**
* Return the
* @see com.arsdigita.bebop.table.TableModel#getElementAt(int)
*/
public Object getElementAt(int columnIndex) {
- switch (columnIndex){
+ switch (columnIndex) {
case 0:
- return m_baseContactCollection.getContactOrder();
+ return m_contactCollection.getContactOrder();
case 1:
- return (String)HealthCareFacilityGlobalizationUtil.globalize("cms.contenttypes.ui.healthCareFacility.contactType.key." + m_baseContactCollection.getContactType()).localize();
+ return (String) HealthCareFacilityGlobalizationUtil.globalize("cms.contenttypes.ui.healthCareFacility.contactType.key." + m_contactCollection.getContactType()).localize();
case 2:
- return m_baseContact.getTitle();
+ return m_contact.getTitle();
// case 2:
// return (m_healthCareFacilityEntry.getDescription() != null && m_healthCareFacilityEntry.getDescription().length() > MAX_DESC_LENGTH)
// ? m_healthCareFacilityEntry.getDescription().substring(0, MAX_DESC_LENGTH)
@@ -162,34 +158,33 @@ public class HealthCareFacilityBaseContactTable extends Table implements TableAc
return null;
}
}
-
+
/**
*
* @see com.arsdigita.bebop.table.TableModel#getKeyAt(int)
*/
public Object getKeyAt(int columnIndex) {
- return m_baseContact.getID();
+ return m_contact.getID();
}
-
}
-
+
/**
* Check for the permissions to edit item and put either a Label or
* a ControlLink accordingly.
*/
private class EditCellRenderer extends LockableImpl implements TableCellRenderer {
-
+
public Component getComponent(Table table, PageState state, Object value,
boolean isSelected, Object key,
int row, int column) {
-
+
SecurityManager sm = Utilities.getSecurityManager(state);
HealthCareFacility healthCareFacility = (HealthCareFacility) m_itemModel.getSelectedObject(state);
-
+
boolean canEdit = sm.canAccess(state.getRequest(),
SecurityManager.EDIT_ITEM,
healthCareFacility);
- if(canEdit) {
+ if (canEdit) {
ControlLink link = new ControlLink(value.toString());
return link;
} else {
@@ -197,24 +192,24 @@ public class HealthCareFacilityBaseContactTable extends Table implements TableAc
}
}
}
-
+
/**
* Check for the permissions to delete item and put either a Label or
* a ControlLink accordingly.
*/
private class DeleteCellRenderer extends LockableImpl implements TableCellRenderer {
-
+
public Component getComponent(Table table, PageState state, Object value,
boolean isSelected, Object key,
int row, int column) {
-
+
SecurityManager sm = Utilities.getSecurityManager(state);
HealthCareFacility healthCareFacility = (HealthCareFacility) m_itemModel.getSelectedObject(state);
-
+
boolean canDelete = sm.canAccess(state.getRequest(),
SecurityManager.DELETE_ITEM,
healthCareFacility);
- if(canDelete) {
+ if (canDelete) {
ControlLink link = new ControlLink(value.toString());
link.setConfirmation((String) HealthCareFacilityGlobalizationUtil.globalize("cms.contenttypes.ui.healthCareFacility.confirm_delete").localize());
return link;
@@ -223,38 +218,37 @@ public class HealthCareFacilityBaseContactTable extends Table implements TableAc
}
}
}
-
+
/**
* Provide implementation to TableActionListener method.
* Code that comes into picture when a link on the table is clicked.
* Handles edit and delete event.
*/
public void cellSelected(TableActionEvent evt) {
-
+
PageState state = evt.getPageState();
-
- // Get selected BaseContact
- BaseContact baseContact =
- new BaseContact(new BigDecimal(evt.getRowKey().toString()));
-
+
+ // Get selected Contact
+ com.arsdigita.cms.basetypes.Contact contact =
+ new com.arsdigita.cms.basetypes.Contact(new BigDecimal(evt.getRowKey().toString()));
+
// Get HealthCareFacility
HealthCareFacility healthCareFacility = (HealthCareFacility) m_itemModel.getSelectedObject(state);
-
+
// Get selected column
TableColumn col = getColumnModel().get(evt.getColumn().intValue());
-
+
// Edit
- if(col.getHeaderKey().toString().equals(TABLE_COL_EDIT)) {
-
+ if (col.getHeaderKey().toString().equals(TABLE_COL_EDIT)) {
}
-
+
// Delete
- if(col.getHeaderKey().toString().equals(TABLE_COL_DEL)) {
- healthCareFacility.removeContactEntry(baseContact);
+ if (col.getHeaderKey().toString().equals(TABLE_COL_DEL)) {
+ healthCareFacility.removeContactEntry(contact);
}
-
+
}
-
+
/**
* provide Implementation to TableActionListener method.
* Does nothing in our case.
@@ -262,6 +256,4 @@ public class HealthCareFacilityBaseContactTable extends Table implements TableAc
public void headSelected(TableActionEvent e) {
throw new UnsupportedOperationException("Not Implemented");
}
-
-
}
diff --git a/ccm-cms-types-healthCareFacility/src/com/arsdigita/cms/contenttypes/ui/HealthCareFacilityDeleteAddressForm.java b/ccm-cms-types-healthCareFacility/src/com/arsdigita/cms/contenttypes/ui/HealthCareFacilityDeleteAddressForm.java
index 88ff86832..7c7771dad 100644
--- a/ccm-cms-types-healthCareFacility/src/com/arsdigita/cms/contenttypes/ui/HealthCareFacilityDeleteAddressForm.java
+++ b/ccm-cms-types-healthCareFacility/src/com/arsdigita/cms/contenttypes/ui/HealthCareFacilityDeleteAddressForm.java
@@ -6,7 +6,6 @@
* To change this template, choose Tools | Template Manager
* and open the template in the editor.
*/
-
package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.bebop.FormProcessException;
@@ -28,7 +27,7 @@ import com.arsdigita.util.UncheckedWrapperException;
* @author quasi
*/
public class HealthCareFacilityDeleteAddressForm extends BasicPageForm implements FormProcessListener {
-
+
/**
* ID of the form
*/
@@ -40,39 +39,39 @@ public class HealthCareFacilityDeleteAddressForm extends BasicPageForm implement
}
public void init(FormSectionEvent fse) {
-
}
-
+
+ @Override
public void addWidgets() {
- add(new Label((String)HealthCareFacilityGlobalizationUtil.globalize("cms.contenttypes.ui.healthCareFacility.delete_address.label").localize()));
+ add(new Label((String) HealthCareFacilityGlobalizationUtil.globalize("cms.contenttypes.ui.healthCareFacility.delete_address.label").localize()));
}
-
+
/**
* Creates the section with the save and the cancel button.
*/
+ @Override
public void addSaveCancelSection() {
try {
getSaveCancelSection().getSaveButton().addPrintListener(new PrintListener() {
public void prepare(PrintEvent e) {
- HealthCareFacility healthCareFacility = (HealthCareFacility)getItemSelectionModel().getSelectedObject(e.getPageState());
+ HealthCareFacility healthCareFacility = (HealthCareFacility) getItemSelectionModel().getSelectedObject(e.getPageState());
Submit target = (Submit) e.getTarget();
- target.setButtonLabel((String)HealthCareFacilityGlobalizationUtil.globalize("cms.contenttypes.ui.healthCareFacility.delete_address.button_label").localize());
+ target.setButtonLabel((String) HealthCareFacilityGlobalizationUtil.globalize("cms.contenttypes.ui.healthCareFacility.delete_address.button_label").localize());
}
});
} catch (Exception ex) {
throw new UncheckedWrapperException("this cannot happen", ex);
}
}
-
+
public final void process(final FormSectionEvent fse) throws FormProcessException {
-
+
final PageState state = fse.getPageState();
- final HealthCareFacility healthCareFacility = (HealthCareFacility)getItemSelectionModel().getSelectedObject(state);
-
+ final HealthCareFacility healthCareFacility = (HealthCareFacility) getItemSelectionModel().getSelectedObject(state);
+
if (healthCareFacility != null && healthCareFacility.getAddress() != null) {
healthCareFacility.unsetAddress();
}
}
-
}
diff --git a/ccm-cms-types-healthCareFacility/src/com/arsdigita/cms/contenttypes/ui/HealthCareFacilityEditAddressPropertyForm.java b/ccm-cms-types-healthCareFacility/src/com/arsdigita/cms/contenttypes/ui/HealthCareFacilityEditAddressPropertyForm.java
index bcc5e1582..b4e9992a0 100644
--- a/ccm-cms-types-healthCareFacility/src/com/arsdigita/cms/contenttypes/ui/HealthCareFacilityEditAddressPropertyForm.java
+++ b/ccm-cms-types-healthCareFacility/src/com/arsdigita/cms/contenttypes/ui/HealthCareFacilityEditAddressPropertyForm.java
@@ -6,7 +6,6 @@
* To change this template, choose Tools | Template Manager
* and open the template in the editor.
*/
-
package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.bebop.FormData;
@@ -32,9 +31,8 @@ import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.ui.authoring.BasicPageForm;
import java.util.Iterator;
import java.util.Map;
-import com.arsdigita.cms.contenttypes.BaseAddress;
import com.arsdigita.cms.contenttypes.HealthCareFacility;
-import com.arsdigita.cms.contenttypes.util.BaseAddressGlobalizationUtil;
+import com.arsdigita.cms.basetypes.util.BasetypesGlobalizationUtil;
import org.apache.log4j.Logger;
@@ -43,17 +41,14 @@ import org.apache.log4j.Logger;
* @author quasi
*/
public class HealthCareFacilityEditAddressPropertyForm extends BasicPageForm implements FormProcessListener, FormInitListener, FormSubmissionListener {
-
+
private static final Logger logger = Logger.getLogger(HealthCareFacilityPropertyForm.class);
-
private HealthCareFacilityAddressPropertiesStep m_step;
-
- public static final String ADDRESS = BaseAddress.ADDRESS;
- public static final String POSTAL_CODE = BaseAddress.POSTAL_CODE;
- public static final String CITY = BaseAddress.CITY;
- public static final String STATE = BaseAddress.STATE;
- public static final String ISO_COUNTRY_CODE = BaseAddress.ISO_COUNTRY_CODE;
-
+ public static final String ADDRESS = com.arsdigita.cms.basetypes.Address.ADDRESS;
+ public static final String POSTAL_CODE = com.arsdigita.cms.basetypes.Address.POSTAL_CODE;
+ public static final String CITY = com.arsdigita.cms.basetypes.Address.CITY;
+ public static final String STATE = com.arsdigita.cms.basetypes.Address.STATE;
+ public static final String ISO_COUNTRY_CODE = com.arsdigita.cms.basetypes.Address.ISO_COUNTRY_CODE;
/**
* ID of the form
*/
@@ -64,7 +59,7 @@ public class HealthCareFacilityEditAddressPropertyForm extends BasicPageForm imp
*
* @param itemModel
*/
- public HealthCareFacilityEditAddressPropertyForm(ItemSelectionModel itemModel) {
+ public HealthCareFacilityEditAddressPropertyForm(ItemSelectionModel itemModel) {
this(itemModel, null);
}
@@ -82,61 +77,61 @@ public class HealthCareFacilityEditAddressPropertyForm extends BasicPageForm imp
@Override
public void addWidgets() {
- add(new Label((String)BaseAddressGlobalizationUtil.globalize("cms.contenttypes.ui.baseAddress.address").localize()));
- ParameterModel addressParam = new StringParameter(ADDRESS);
- addressParam.addParameterListener( new NotNullValidationListener( ) );
- addressParam.addParameterListener( new StringInRangeValidationListener(0, 1000) );
- TextArea address = new TextArea(addressParam);
+ add(new Label((String) BasetypesGlobalizationUtil.globalize("cms.basetypes.ui.address.address").localize()));
+ ParameterModel addressParam = new StringParameter(ADDRESS);
+ addressParam.addParameterListener(new NotNullValidationListener());
+ addressParam.addParameterListener(new StringInRangeValidationListener(0, 1000));
+ TextArea address = new TextArea(addressParam);
address.setRows(5);
address.setCols(30);
- add(address);
+ add(address);
- if(!HealthCareFacility.getConfig().getHideAddressPostalCode()) {
- add(new Label((String)BaseAddressGlobalizationUtil.globalize("cms.contenttypes.ui.baseAddress.postal_code").localize()));
+ if (!HealthCareFacility.getConfig().getHideAddressPostalCode()) {
+ add(new Label((String) BasetypesGlobalizationUtil.globalize("cms.basetypes.ui.address.postal_code").localize()));
ParameterModel postalCodeParam = new StringParameter(POSTAL_CODE);
TextField postalCode = new TextField(postalCodeParam);
/* XXX NumberListener ?*/
add(postalCode);
}
- add(new Label((String)BaseAddressGlobalizationUtil.globalize("cms.contenttypes.ui.baseAddress.city").localize()));
- ParameterModel cityParam = new StringParameter(CITY);
- TextField city = new TextField(cityParam);
- add(city);
+ add(new Label((String) BasetypesGlobalizationUtil.globalize("cms.basetypes.ui.address.city").localize()));
+ ParameterModel cityParam = new StringParameter(CITY);
+ TextField city = new TextField(cityParam);
+ add(city);
- if(!HealthCareFacility.getConfig().getHideAddressState()) {
- add(new Label((String)BaseAddressGlobalizationUtil.globalize("cms.contenttypes.ui.baseAddress.state").localize()));
+ if (!HealthCareFacility.getConfig().getHideAddressState()) {
+ add(new Label((String) BasetypesGlobalizationUtil.globalize("cms.basetypes.ui.address.state").localize()));
ParameterModel stateParam = new StringParameter(STATE);
TextField state = new TextField(stateParam);
add(state);
}
-
+
if (!HealthCareFacility.getConfig().getHideAddressCountry()) {
- add(new Label((String)BaseAddressGlobalizationUtil.globalize("cms.contenttypes.ui.baseAddress.iso_country_code").localize()));
+ add(new Label((String) BasetypesGlobalizationUtil.globalize("cms.basetypes.ui.address.iso_country_code").localize()));
ParameterModel countryParam = new StringParameter(ISO_COUNTRY_CODE);
countryParam.addParameterListener(new StringInRangeValidationListener(0, 2));
-
+
SingleSelect country = new SingleSelect(countryParam);
- country.addOption(new Option("", new Label((String)BaseAddressGlobalizationUtil.globalize("cms.ui.select_one" ).localize())));
+ country.addOption(new Option("", new Label((String) BasetypesGlobalizationUtil.globalize("cms.ui.select_one").localize())));
- Iterator countries = BaseAddress.getSortedListOfCountries(null).entrySet().iterator();
- while(countries.hasNext()) {
- Map.Entry|
- |
- ||
-
|
-
|
+ |
+ ||
+
|
+