From 5d27d71202d95e75d2a93014eb16754735fd6c25 Mon Sep 17 00:00:00 2001 From: jensp Date: Thu, 24 Oct 2013 06:59:10 +0000 Subject: [PATCH] =?UTF-8?q?Fehlenden=20Konstruktor=20GenericOrgaUnitText(S?= =?UTF-8?q?tring)=20im=20GenericOrgaUnitTextAsset=20erg=C3=A4nzt.=20Durch?= =?UTF-8?q?=20den=20fehlenden=20Konstruktor=20konnten=20Items=20mit=20eine?= =?UTF-8?q?m=20solchen=20Asset=20nicht=20publiziert=20werden.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@2378 8810af33-2d31-482b-a856-94f89814c4df --- .../GenericOrgaUnitTextAsset.java | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/ccm-cms-assets-orgaunittext/src/com/arsdigita/cms/contentassets/GenericOrgaUnitTextAsset.java b/ccm-cms-assets-orgaunittext/src/com/arsdigita/cms/contentassets/GenericOrgaUnitTextAsset.java index 5ffe56c18..be25f12f7 100644 --- a/ccm-cms-assets-orgaunittext/src/com/arsdigita/cms/contentassets/GenericOrgaUnitTextAsset.java +++ b/ccm-cms-assets-orgaunittext/src/com/arsdigita/cms/contentassets/GenericOrgaUnitTextAsset.java @@ -60,7 +60,6 @@ public class GenericOrgaUnitTextAsset extends ACSObject { // // }); // } - public static final String TEXT_ASSET_NAME = "textAssetName"; public static final String CONTENT = "content"; public static final String ORGAUNIT = "orgaunit"; @@ -74,6 +73,10 @@ public class GenericOrgaUnitTextAsset extends ACSObject { super(BASE_DATA_OBJECT_TYPE); } + public GenericOrgaUnitTextAsset(final String type) { + super(type); + } + public GenericOrgaUnitTextAsset(final DataObject dataObject) { super(dataObject); } @@ -90,40 +93,37 @@ public class GenericOrgaUnitTextAsset extends ACSObject { // @Override // protected void initialize() { // super.initialize(); - // final DataObject dataObject = (DataObject) get(AUDIT); // if (dataObject == null) { // auditTrail = BasicAuditTrail.retrieveForACSObject(this); // } else { // auditTrail = new BasicAuditTrail(dataObject); // } - // addObserver(new AuditingObserver(auditTrail)); // } - public String getTextAssetName() { return (String) get(TEXT_ASSET_NAME); } - + public void setTextAssetName(final String textAssetName) { set(TEXT_ASSET_NAME, textAssetName); } - + public String getContent() { return (String) get(CONTENT); } - + public void setContent(final String content) { set(CONTENT, content); } - + public GenericOrganizationalUnit getOwner() { final DataObject dataObject = (DataObject) get(ORGAUNIT); Assert.exists(dataObject, DataObject.class); - + return (GenericOrganizationalUnit) DomainObjectFactory.newInstance(dataObject); } - + // public User getTextAssetAuthor() { // return auditTrail.getCreationUser(); // } @@ -131,16 +131,16 @@ public class GenericOrgaUnitTextAsset extends ACSObject { // public Date getCreationDate() { // return auditTrail.getCreationDate(); // } - public static DataCollection getTextAssets(final GenericOrganizationalUnit orgaunit) { Assert.exists(orgaunit, GenericOrganizationalUnit.class); - - final DataCollection textAssets = SessionManager.getSession().retrieve(BASE_DATA_OBJECT_TYPE); + + final DataCollection textAssets = SessionManager.getSession(). + retrieve(BASE_DATA_OBJECT_TYPE); textAssets.addEqualsFilter(ORGAUNIT, orgaunit.getID()); - + return textAssets; } - + // @Override // protected void beforeSave() { // super.beforeSave(); @@ -159,5 +159,4 @@ public class GenericOrgaUnitTextAsset extends ACSObject { // isNew = false; // } // } - }