diff --git a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/MembershipStatusCollection.java b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/MembershipStatusCollection.java index fcdbe9c9a..7f2d98db5 100644 --- a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/MembershipStatusCollection.java +++ b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/MembershipStatusCollection.java @@ -2,7 +2,6 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ - package com.arsdigita.cms.contenttypes; import com.arsdigita.domain.DomainCollection; @@ -11,6 +10,7 @@ import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.SessionManager; import java.math.BigDecimal; import org.apache.log4j.Logger; + /** * * @author Jens Pelzetter @@ -21,19 +21,28 @@ public class MembershipStatusCollection extends DomainCollection { public static MembershipStatusCollection getMembershipStatusCollection() { logger.debug("Getting MembershipStatusCollection..."); - SessionManager.getSession().retrieve(MembershipStatus.BASE_DATA_OBJECT_TYPE); + //SessionManager.getSession().retrieve(MembershipStatus.BASE_DATA_OBJECT_TYPE); DataCollection statusCollection = SessionManager.getSession().retrieve(MembershipStatus.BASE_DATA_OBJECT_TYPE); + logger.debug("statusCollection.isEmpty() returns: " + statusCollection.isEmpty()); + logger.debug("statusCollection.size() = " + statusCollection.size()); + return new MembershipStatusCollection(statusCollection); } - private MembershipStatusCollection(DataCollection dataCollection) { + private MembershipStatusCollection(DataCollection dataCollection) { super(dataCollection); - logger.debug("MembershipStatusCollection constructor..."); + logger.debug("MembershipStatusCollection constructor..."); } - + @Override public DomainObject getDomainObject() { - return new MembershipStatus(m_dataCollection.getDataObject()); + logger.debug("m_dataCollection.isEmpty(): " + m_dataCollection.isEmpty()); + if (m_dataCollection.isEmpty()) { + return null; + } else { + logger.debug("Returning data object: " + m_dataCollection.getDataObject()); + return new MembershipStatus(m_dataCollection.getDataObject()); + } } public MembershipStatus getMembershipStatus() { diff --git a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipPropertyForm.java b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipPropertyForm.java index d596855b5..93e22df9a 100644 --- a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipPropertyForm.java +++ b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipPropertyForm.java @@ -25,10 +25,14 @@ import com.arsdigita.bebop.util.GlobalizationUtil; import com.arsdigita.cms.ContentType; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.contenttypes.Membership; +import com.arsdigita.cms.contenttypes.MembershipStatus; import com.arsdigita.cms.contenttypes.MembershipStatusCollection; import com.arsdigita.cms.contenttypes.OrganizationalUnit; import com.arsdigita.cms.contenttypes.Person; import com.arsdigita.cms.ui.ItemSearchWidget; +import com.arsdigita.domain.DomainObjectFactory; +import com.arsdigita.persistence.DataCollection; +import com.arsdigita.persistence.SessionManager; import com.arsdigita.util.Assert; import com.arsdigita.util.UncheckedWrapperException; import org.apache.log4j.Logger; @@ -37,14 +41,12 @@ import org.apache.log4j.Logger; * * @author Jens Pelzetter */ -public class MembershipPropertyForm extends FormSection implements FormInitListener, FormProcessListener, FormValidationListener, FormSubmissionListener { +public class MembershipPropertyForm extends FormSection implements FormInitListener, FormProcessListener, FormValidationListener, FormSubmissionListener { private final static Logger logger = Logger.getLogger(MembershipPropertyForm.class); - public final static String ID = "membership_edit"; private ItemSelectionModel m_itemModel; private MembershipSelectionModel m_membershipModel; - private ItemSearchWidget m_personSearch; private final static String PERSON_SEARCH = "membership"; private SingleSelect m_status; @@ -75,9 +77,12 @@ public class MembershipPropertyForm extends FormSection implements FormInitList ParameterModel statusParam = new StringParameter((Membership.STATUS)); this.m_status = new SingleSelect(statusParam); add(this.m_status); - MembershipStatusCollection statusValues = MembershipStatusCollection.getMembershipStatusCollection(); - while(statusValues.next()) { - this.m_status.addOption(new Option(statusValues.getMembershipStatusId().toString(), statusValues.getMembershipStatusName())); + //MembershipStatusCollection statusValues = MembershipStatusCollection.getMembershipStatusCollection(); + DataCollection statusValues = SessionManager.getSession().retrieve(MembershipStatus.BASE_DATA_OBJECT_TYPE); + while (statusValues.next()) { + //this.m_status.addOption(new Option(statusValues.getMembershipStatusId().toString(), statusValues.getMembershipStatusName())); + MembershipStatus status = (MembershipStatus) DomainObjectFactory.newInstance(statusValues.getDataObject()); + this.m_status.addOption(new Option(status.getID().toString(), status.getStatusName())); } add(new Label(GlobalizationUtil.globalize("cms.contenttypes.ui.organizationalunit.membership.from"))); @@ -118,7 +123,7 @@ public class MembershipPropertyForm extends FormSection implements FormInitList } } }); - } catch(Exception ex) { + } catch (Exception ex) { throw new UncheckedWrapperException("this cannot happen", ex); } add(this.m_saveCancelSection, ColumnPanel.FULL_WIDTH); @@ -172,7 +177,7 @@ public class MembershipPropertyForm extends FormSection implements FormInitList } } else { data.put(PERSON_SEARCH, null); - } + } } public void process(FormSectionEvent e) throws FormProcessException { @@ -199,7 +204,7 @@ public class MembershipPropertyForm extends FormSection implements FormInitList throw new FormProcessException("Person selection is required"); } - if(e.getFormData().get(Membership.STATUS) == null) { + if (e.getFormData().get(Membership.STATUS) == null) { throw new FormProcessException("Status of membership is required"); } } diff --git a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipStatusPropertyForm.java b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipStatusPropertyForm.java index 112e5f4d4..532e2d484 100644 --- a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipStatusPropertyForm.java +++ b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipStatusPropertyForm.java @@ -1,7 +1,6 @@ package com.arsdigita.cms.contenttypes.ui.organizationalunit; import com.arsdigita.bebop.ColumnPanel; -import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.FormSection; import com.arsdigita.bebop.Label; @@ -20,6 +19,7 @@ import com.arsdigita.bebop.parameters.NotNullValidationListener; import com.arsdigita.bebop.util.GlobalizationUtil; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.contenttypes.MembershipStatus; +import com.arsdigita.persistence.SessionManager; import com.arsdigita.util.UncheckedWrapperException; import org.apache.log4j.Logger; @@ -55,7 +55,7 @@ public class MembershipStatusPropertyForm extends FormSection implements FormIni protected void addWidgets() { logger.debug("Adding widgets..."); - add(new Label(GlobalizationUtil.globalize("cms.contenttypes.ui.membershipstatus.warning_changes_here_significant_for_all"))); + add(new Label(GlobalizationUtil.globalize("cms.contenttypes.ui.membershipstatus.warning_changes_here_significant_for_all")), ColumnPanel.FULL_WIDTH); this.m_statusName = new TextField("statusName"); this.m_statusName.addValidationListener(new NotNullValidationListener()); add(new Label(GlobalizationUtil.globalize("cms.contenttypes.ui.membershipstatus.statusname"))); @@ -118,7 +118,6 @@ public class MembershipStatusPropertyForm extends FormSection implements FormIni //FormData data = e.getFormData(); status.setStatusName((String) m_statusName.getValue(state)); - status.save(); logger.debug("properties set"); } diff --git a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipStatusTable.java b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipStatusTable.java index 45b527ab7..1b612a1f2 100644 --- a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipStatusTable.java +++ b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipStatusTable.java @@ -59,7 +59,7 @@ public class MembershipStatusTable extends Table { } }; - Label empty = new Label("There are no status."); + Label empty = new Label("There are no status values available."); setEmptyView(empty); addTableActionListener(new MembershipStatusTableActionListener()); setRowSelectionModel(this.m_statusModel); diff --git a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipStatusTableModelBuilder.java b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipStatusTableModelBuilder.java index 45887219c..b07400cfe 100644 --- a/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipStatusTableModelBuilder.java +++ b/ccm-cms-types-organizationalunit/src/com/arsdigita/cms/contenttypes/ui/organizationalunit/MembershipStatusTableModelBuilder.java @@ -10,6 +10,7 @@ import com.arsdigita.cms.contenttypes.MembershipStatusCollection; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.SessionManager; import com.arsdigita.util.Assert; import com.arsdigita.util.LockableImpl; import org.apache.log4j.Logger; @@ -30,7 +31,8 @@ public class MembershipStatusTableModelBuilder extends LockableImpl implements T public TableModel makeModel(Table t, PageState s) { DataCollection statusValues = getStatus(s); - if (statusValues.isEmpty()) { + if (statusValues == null || + statusValues.isEmpty()) { return Table.EMPTY_MODEL; } else { return new MembershipStatusTableModel(statusValues); @@ -39,7 +41,14 @@ public class MembershipStatusTableModelBuilder extends LockableImpl implements T public DataCollection getStatus(PageState state) { //Assert.isTrue(this.m_itemModel.isSelected(state), "item selected"); - return (DataCollection) MembershipStatusCollection.getMembershipStatusCollection().getDomainObject(); + /*try { + logger.debug("Returning data collection..."); + return (DataCollection) MembershipStatusCollection.getMembershipStatusCollection().getDomainObject(); + } catch (Exception ex) { + logger.debug("returning null because I got this exception:\n", ex); + return null; + }*/ + return SessionManager.getSession().retrieve(MembershipStatus.BASE_DATA_OBJECT_TYPE); } public static class MembershipStatusTableModel implements TableModel { diff --git a/ccm-core/src/com/arsdigita/persistence/DataCollectionImpl.java b/ccm-core/src/com/arsdigita/persistence/DataCollectionImpl.java index e53789b51..817f2672c 100755 --- a/ccm-core/src/com/arsdigita/persistence/DataCollectionImpl.java +++ b/ccm-core/src/com/arsdigita/persistence/DataCollectionImpl.java @@ -21,6 +21,7 @@ package com.arsdigita.persistence; import com.arsdigita.persistence.metadata.ObjectType; import com.redhat.persistence.DataSet; import com.redhat.persistence.common.Path; +import org.apache.log4j.Logger; /** * DataCollectionImpl @@ -28,7 +29,6 @@ import com.redhat.persistence.common.Path; * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #13 $ $Date: 2004/08/16 $ **/ - class DataCollectionImpl extends DataQueryImpl implements DataCollection { public final static String versionId = "$Id: DataCollectionImpl.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; @@ -50,7 +50,6 @@ class DataCollectionImpl extends DataQueryImpl implements DataCollection { /** * @deprecated **/ - public void setParameter(String p, Object o) { super.setParameter(p, o); } @@ -58,7 +57,6 @@ class DataCollectionImpl extends DataQueryImpl implements DataCollection { /** * @deprecated **/ - public Object getParameter(String p) { return super.getParameter(p); } @@ -70,5 +68,4 @@ class DataCollectionImpl extends DataQueryImpl implements DataCollection { public boolean contains(DataObject data) { throw new Error("not implemented"); } - } diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/ANSIWriter.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/ANSIWriter.java index 8c958d843..6b1351c8d 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/ANSIWriter.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/ANSIWriter.java @@ -151,6 +151,7 @@ public class ANSIWriter extends SQLWriter { class RetainUpdatesWriter extends ANSIWriter { + @Override public void write(StaticOperation sop) { write(sop.getSQLBlock().getSQL()); }