Return-Path: Delivered-To: apmail-incubator-chemistry-commits-archive@minotaur.apache.org Received: (qmail 4164 invoked from network); 15 Nov 2010 12:33:00 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 15 Nov 2010 12:33:00 -0000 Received: (qmail 32172 invoked by uid 500); 15 Nov 2010 12:33:31 -0000 Delivered-To: apmail-incubator-chemistry-commits-archive@incubator.apache.org Received: (qmail 32085 invoked by uid 500); 15 Nov 2010 12:33:30 -0000 Mailing-List: contact chemistry-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: chemistry-dev@incubator.apache.org Delivered-To: mailing list chemistry-commits@incubator.apache.org Received: (qmail 32054 invoked by uid 99); 15 Nov 2010 12:33:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Nov 2010 12:33:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Nov 2010 12:33:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A143623889E9; Mon, 15 Nov 2010 12:32:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1035246 [2/3] - in /incubator/chemistry/opencmis/branches/client-api-refactoring: chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/ chemistry-opencmis-client/chemistry-opencmis-... Date: Mon, 15 Nov 2010 12:32:07 -0000 To: chemistry-commits@incubator.apache.org From: fmui@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101115123208.A143623889E9@eris.apache.org> Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/repository/RepositoryImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/repository/RepositoryImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/repository/RepositoryImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/repository/RepositoryImpl.java Mon Nov 15 12:32:05 2010 @@ -47,11 +47,6 @@ public class RepositoryImpl extends Repo this.sessionFactory = sessionFactory; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.api.repository.Repository#createSession() - */ @SuppressWarnings("unchecked") public T createSession() { return (T) sessionFactory.createSession(parameters); Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/java/org/apache/chemistry/opencmis/client/runtime/CacheTest.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/java/org/apache/chemistry/opencmis/client/runtime/CacheTest.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/java/org/apache/chemistry/opencmis/client/runtime/CacheTest.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/java/org/apache/chemistry/opencmis/client/runtime/CacheTest.java Mon Nov 15 12:32:05 2010 @@ -23,12 +23,15 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.util.HashMap; +import java.util.Map; import junit.framework.Assert; import org.apache.chemistry.opencmis.client.api.CmisObject; import org.apache.chemistry.opencmis.client.runtime.cache.Cache; import org.apache.chemistry.opencmis.client.runtime.cache.CacheImpl; +import org.apache.chemistry.opencmis.commons.SessionParameter; import org.junit.Before; import org.junit.Test; @@ -40,7 +43,7 @@ public class CacheTest { @Test public void cacheSingleObjectTest() { - Cache cache = CacheImpl.newInstance(); + Cache cache = createCache(100); String id = "1"; // String path = "/1"; @@ -71,14 +74,14 @@ public class CacheTest { @Test public void cacheSizeTest() { int cacheSize = 50000; - Cache cache = CacheImpl.newInstance(cacheSize); + Cache cache = createCache(cacheSize); Assert.assertEquals(cacheSize, cache.getCacheSize()); } @Test public void lruTest() { int cacheSize = 3; - Cache cache = CacheImpl.newInstance(cacheSize); + Cache cache = createCache(cacheSize); String cacheKey = "key"; @@ -96,7 +99,7 @@ public class CacheTest { @Test public void serializationTest() throws IOException, ClassNotFoundException { int cacheSize = 10; - Cache cache = CacheImpl.newInstance(cacheSize); + Cache cache = createCache(cacheSize); String cacheKey = "key"; @@ -119,7 +122,6 @@ public class CacheTest { CmisObject o2 = cache2.getById("id" + k, cacheKey); Assert.assertEquals(o1.getId(), o2.getId()); } - } /** @@ -132,4 +134,15 @@ public class CacheTest { private CmisObject createCmisObject(final String id) { return new CmisObjectMock(id); } + + private Cache createCache(int cacheSize) { + Cache cache = new CacheImpl(); + + Map parameters = new HashMap(); + parameters.put(SessionParameter.CACHE_SIZE_OBJECTS, "" + cacheSize); + + cache.initialize(null, parameters); + + return cache; + } } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/java/org/apache/chemistry/opencmis/client/runtime/CmisObjectMock.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/java/org/apache/chemistry/opencmis/client/runtime/CmisObjectMock.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/java/org/apache/chemistry/opencmis/client/runtime/CmisObjectMock.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/java/org/apache/chemistry/opencmis/client/runtime/CmisObjectMock.java Mon Nov 15 12:32:05 2010 @@ -175,8 +175,7 @@ public class CmisObjectMock implements C return null; } - public ObjectId updatePropertiesOnly(Map properties) { - + public ObjectId updateProperties(Map properties, boolean refresh) { return null; } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SessionParameter.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SessionParameter.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SessionParameter.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/SessionParameter.java Mon Nov 15 12:32:05 2010 @@ -82,5 +82,8 @@ public final class SessionParameter { public static final String LOCALE_ISO3166_COUNTRY = "org.apache.chemistry.opencmis.locale.iso3166"; public static final String LOCALE_VARIANT = "org.apache.chemistry.opencmis.locale.variant"; + public static final String OBJECT_FACTORY_CLASS = "org.apache.chemistry.opencmis.objectfactory.classname"; + public static final String CACHE_CLASS = "org.apache.chemistry.opencmis.cache.classname"; + public static final String REPOSITORY_ID = "org.apache.chemistry.opencmis.session.repository.id"; } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/data/CmisExtensionElement.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/data/CmisExtensionElement.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/data/CmisExtensionElement.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/data/CmisExtensionElement.java Mon Nov 15 12:32:05 2010 @@ -18,13 +18,14 @@ */ package org.apache.chemistry.opencmis.commons.data; +import java.io.Serializable; import java.util.List; import java.util.Map; /** * This class represents one node in the extension tree. */ -public interface CmisExtensionElement { +public interface CmisExtensionElement extends Serializable { /** * Returns the name of the extension. The name is never null. Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/data/ExtensionsData.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/data/ExtensionsData.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/data/ExtensionsData.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/data/ExtensionsData.java Mon Nov 15 12:32:05 2010 @@ -18,12 +18,13 @@ */ package org.apache.chemistry.opencmis.commons.data; +import java.io.Serializable; import java.util.List; /** * Holds extension data either set by the CMIS repository or the client. */ -public interface ExtensionsData { +public interface ExtensionsData extends Serializable { List getExtensions(); Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractExtensionData.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractExtensionData.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractExtensionData.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractExtensionData.java Mon Nov 15 12:32:05 2010 @@ -28,6 +28,8 @@ import org.apache.chemistry.opencmis.com */ public abstract class AbstractExtensionData implements ExtensionsData { + private static final long serialVersionUID = 1L; + private List extensions; public List getExtensions() { Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractPropertyData.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractPropertyData.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractPropertyData.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractPropertyData.java Mon Nov 15 12:32:05 2010 @@ -26,105 +26,74 @@ import org.apache.chemistry.opencmis.com /** * Abstract property data implementation. - * - * @author Florian Müller - * */ public abstract class AbstractPropertyData extends AbstractExtensionData implements PropertyData { - private String fId; - private String fDisplayName; - private String fLocalName; - private String fQueryName; - - private List fValues; - - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.PropertyData#getId() - */ + private static final long serialVersionUID = 1L; + + private String id; + private String displayName; + private String localName; + private String queryName; + + private List values; + public String getId() { - return fId; + return id; } public void setId(String id) { - fId = id; + this.id = id; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.PropertyData#getDisplayName() - */ public String getDisplayName() { - return fDisplayName; + return displayName; } public void setDisplayName(String displayName) { - fDisplayName = displayName; + this.displayName = displayName; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.PropertyData#getLocalName() - */ public String getLocalName() { - return fLocalName; + return localName; } public void setLocalName(String localName) { - fLocalName = localName; + this.localName = localName; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.PropertyData#getQueryName() - */ public String getQueryName() { - return fQueryName; + return queryName; } public void setQueryName(String queryName) { - fQueryName = queryName; + this.queryName = queryName; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.PropertyData#getValues() - */ public List getValues() { - return fValues; + return values; } public void setValues(List values) { if (values == null) { - fValues = Collections.emptyList(); + this.values = Collections.emptyList(); } else { - fValues = values; + this.values = values; } } public void setValue(T value) { if (value == null) { - fValues = Collections.emptyList(); + values = Collections.emptyList(); } else { - fValues = new ArrayList(1); - fValues.add(value); + values = new ArrayList(1); + values.add(value); } } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.PropertyData#getFirstValue() - */ public T getFirstValue() { - if ((fValues != null) && (!fValues.isEmpty())) { - return fValues.get(0); + if ((values != null) && (!values.isEmpty())) { + return values.get(0); } return null; @@ -132,7 +101,7 @@ public abstract class AbstractPropertyDa @Override public String toString() { - return "Property [id=" + fId + ", display Name=" + fDisplayName + ", local name=" + fLocalName - + ", query name=" + fQueryName + ", values=" + fValues + "]" + super.toString(); + return "Property [id=" + id + ", display Name=" + displayName + ", local name=" + localName + ", query name=" + + queryName + ", values=" + values + "]" + super.toString(); } } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlEntryImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlEntryImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlEntryImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlEntryImpl.java Mon Nov 15 12:32:05 2010 @@ -25,15 +25,14 @@ import org.apache.chemistry.opencmis.com /** * Access Control Entry data implementation. - * - * @author Florian Müller - * */ public class AccessControlEntryImpl extends AbstractExtensionData implements Ace { - private List fPermissions; - private Principal fPrincipal; - private boolean fIsDirect = true; + private static final long serialVersionUID = 1L; + + private List permissions; + private Principal principal; + private boolean isDirect = true; /** * Constructor. @@ -49,59 +48,37 @@ public class AccessControlEntryImpl exte setPermissions(permissions); } - /* - * (non-Javadoc) - * - * @see - * org.apache.opencmis.client.provider.AccessControlEntry#getPrincipal() - */ public Principal getPrincipal() { - return fPrincipal; + return principal; } public String getPrincipalId() { - return fPrincipal == null ? null : fPrincipal.getId(); + return principal == null ? null : principal.getId(); } public void setPrincipal(Principal principal) { - fPrincipal = principal; + this.principal = principal; } - /* - * (non-Javadoc) - * - * @see - * org.apache.opencmis.client.provider.AccessControlEntry#getPermissions() - */ public List getPermissions() { - return fPermissions; + return permissions; } public void setPermissions(List permissions) { - fPermissions = permissions; + this.permissions = permissions; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.AccessControlEntry#isDirect() - */ public boolean isDirect() { - return fIsDirect; + return isDirect; } public void setDirect(boolean direct) { - fIsDirect = direct; + this.isDirect = direct; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ @Override public String toString() { - return "Access Control Entry [principal=" + fPrincipal + ", permissions=" + fPermissions + ", is direct=" - + fIsDirect + "]" + super.toString(); + return "Access Control Entry [principal=" + principal + ", permissions=" + permissions + ", is direct=" + + isDirect + "]" + super.toString(); } } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlListImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlListImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlListImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlListImpl.java Mon Nov 15 12:32:05 2010 @@ -25,14 +25,13 @@ import org.apache.chemistry.opencmis.com /** * Access control list data implementation. - * - * @author Florian Müller - * */ public class AccessControlListImpl extends AbstractExtensionData implements Acl { - private List fAces; - private Boolean fIsExact; + private static final long serialVersionUID = 1L; + + private List aces; + private Boolean isExact; /** * Constructor. @@ -47,39 +46,24 @@ public class AccessControlListImpl exten setAces(aces); } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.AccessControlList#getACEs() - */ public List getAces() { - return fAces; + return aces; } public void setAces(List aces) { - fAces = aces; + this.aces = aces; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.AccessControlList#isExact() - */ public Boolean isExact() { - return fIsExact; + return isExact; } public void setExact(Boolean isExact) { - fIsExact = isExact; + this.isExact = isExact; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ @Override public String toString() { - return "Access Control List [ACEs=" + fAces + ", is exact=" + fIsExact + "]" + super.toString(); + return "Access Control List [ACEs=" + aces + ", is exact=" + isExact + "]" + super.toString(); } } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlPrincipalDataImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlPrincipalDataImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlPrincipalDataImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlPrincipalDataImpl.java Mon Nov 15 12:32:05 2010 @@ -21,12 +21,13 @@ package org.apache.chemistry.opencmis.co import org.apache.chemistry.opencmis.commons.data.Principal; /** - * @author Florian Müller - * + * AccessControlPrincipalData implementation. */ public class AccessControlPrincipalDataImpl extends AbstractExtensionData implements Principal { - private String fPrincipalId; + private static final long serialVersionUID = 1L; + + private String principalId; /** * Constructor. @@ -41,28 +42,16 @@ public class AccessControlPrincipalDataI setPrincipalId(principalId); } - /* - * (non-Javadoc) - * - * @see - * org.apache.opencmis.client.provider.AccessControlPrincipalData#getPrincipalId - * () - */ public String getId() { - return fPrincipalId; + return principalId; } public void setPrincipalId(String principalId) { - fPrincipalId = principalId; + this.principalId = principalId; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ @Override public String toString() { - return "Access Control Principal [principalId=" + fPrincipalId + "]" + super.toString(); + return "Access Control Principal [principalId=" + principalId + "]" + super.toString(); } } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AllowableActionsImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AllowableActionsImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AllowableActionsImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AllowableActionsImpl.java Mon Nov 15 12:32:05 2010 @@ -29,6 +29,8 @@ import org.apache.chemistry.opencmis.com */ public class AllowableActionsImpl extends AbstractExtensionData implements AllowableActions { + private static final long serialVersionUID = 1L; + private Set allowableActions = new HashSet(); public Set getAllowableActions() { Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ChangeEventInfoDataImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ChangeEventInfoDataImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ChangeEventInfoDataImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ChangeEventInfoDataImpl.java Mon Nov 15 12:32:05 2010 @@ -28,6 +28,8 @@ import org.apache.chemistry.opencmis.com */ public class ChangeEventInfoDataImpl extends AbstractExtensionData implements ChangeEventInfo { + private static final long serialVersionUID = 1L; + private GregorianCalendar changeTime; private ChangeType changeType; Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ChoiceImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ChoiceImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ChoiceImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ChoiceImpl.java Mon Nov 15 12:32:05 2010 @@ -23,51 +23,37 @@ import java.util.List; import org.apache.chemistry.opencmis.commons.definitions.Choice; /** - * @author Florian Müller - * + * Choice implementation. */ public class ChoiceImpl extends AbstractExtensionData implements Choice { - private String fDisplayName; - private List fValue; - private List> fChoice; - - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.Choice#getDisplayName() - */ + private static final long serialVersionUID = 1L; + + private String displayName; + private List value; + private List> choice; + public String getDisplayName() { - return fDisplayName; + return displayName; } public void setDisplayName(String displayName) { - fDisplayName = displayName; + this.displayName = displayName; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.Choice#getValue() - */ public List getValue() { - return fValue; + return value; } public void setValue(List value) { - fValue = value; + this.value = value; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.Choice#getChoice() - */ public List> getChoice() { - return fChoice; + return choice; } public void setChoice(List> choice) { - fChoice = choice; + this.choice = choice; } } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/CmisExtensionElementImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/CmisExtensionElementImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/CmisExtensionElementImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/CmisExtensionElementImpl.java Mon Nov 15 12:32:05 2010 @@ -28,6 +28,8 @@ import org.apache.chemistry.opencmis.com public class CmisExtensionElementImpl implements CmisExtensionElement { + private static final long serialVersionUID = 1L; + private String name; private String namespace; private String value; Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ContentStreamImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ContentStreamImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ContentStreamImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ContentStreamImpl.java Mon Nov 15 12:32:05 2010 @@ -31,10 +31,12 @@ import org.apache.chemistry.opencmis.com */ public class ContentStreamImpl extends AbstractExtensionData implements ContentStream { + private static final long serialVersionUID = 1L; + private String filename; private BigInteger length; private String mimeType; - private InputStream stream; + private transient InputStream stream; /** * Constructor. @@ -115,7 +117,8 @@ public class ContentStreamImpl extends A protected void finalize() throws Throwable { try { if (stream != null) { - // this stream must be closed to release the underlying network resources + // this stream must be closed to release the underlying network + // resources stream.close(); } } catch (IOException e) { Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ExtensionDataImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ExtensionDataImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ExtensionDataImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ExtensionDataImpl.java Mon Nov 15 12:32:05 2010 @@ -21,9 +21,8 @@ package org.apache.chemistry.opencmis.co import org.apache.chemistry.opencmis.commons.data.ExtensionsData; /** - * @author Florian Müller - * + * ExtensionsData implementation. */ public class ExtensionDataImpl extends AbstractExtensionData implements ExtensionsData { - + private static final long serialVersionUID = 1L; } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/FailedToDeleteDataImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/FailedToDeleteDataImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/FailedToDeleteDataImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/FailedToDeleteDataImpl.java Mon Nov 15 12:32:05 2010 @@ -23,23 +23,19 @@ import java.util.List; import org.apache.chemistry.opencmis.commons.data.FailedToDeleteData; /** - * @author Florian Müller - * + * FailedToDeleteData implementation. */ public class FailedToDeleteDataImpl extends AbstractExtensionData implements FailedToDeleteData { + private static final long serialVersionUID = 1L; + private List fIds; - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.FailedToDeleteData#getIds() - */ public List getIds() { return fIds; } public void setIds(List ids) { - fIds = ids; + this.fIds = ids; } } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectDataImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectDataImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectDataImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectDataImpl.java Mon Nov 15 12:32:05 2010 @@ -32,25 +32,21 @@ import org.apache.chemistry.opencmis.com import org.apache.chemistry.opencmis.commons.enums.BaseTypeId; /** - * @author Florian Müller - * + * ObjectData implementation. */ public class ObjectDataImpl extends AbstractExtensionData implements ObjectData { - private Properties fProperties; - private ChangeEventInfo fChangeEventInfo; - private List fRelationships; - private List fRenditions; - private PolicyIdList fPolicyIds; - private AllowableActions fAllowableActions; - private Acl fAcl; - private Boolean fIsExactAcl; - - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.ObjectData#getId() - */ + private static final long serialVersionUID = 1L; + + private Properties properties; + private ChangeEventInfo changeEventInfo; + private List relationships; + private List renditions; + private PolicyIdList policyIds; + private AllowableActions allowableActions; + private Acl acl; + private Boolean isExactAcl; + public String getId() { Object value = getFirstValue(PropertyIds.OBJECT_ID); if (value instanceof String) { @@ -60,11 +56,6 @@ public class ObjectDataImpl extends Abst return null; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.ObjectData#getBaseTypeId() - */ public BaseTypeId getBaseTypeId() { Object value = getFirstValue(PropertyIds.BASE_TYPE_ID); if (value instanceof String) { @@ -77,108 +68,68 @@ public class ObjectDataImpl extends Abst return null; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.ObjectData#getProperties() - */ public Properties getProperties() { - return fProperties; + return properties; } public void setProperties(Properties properties) { - fProperties = properties; + this.properties = properties; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.ObjectData#getChangeEventInfo() - */ public ChangeEventInfo getChangeEventInfo() { - return fChangeEventInfo; + return changeEventInfo; } public void setChangeEventInfo(ChangeEventInfo changeEventInfo) { - fChangeEventInfo = changeEventInfo; + this.changeEventInfo = changeEventInfo; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.ObjectData#getRelationships() - */ public List getRelationships() { - return fRelationships; + return relationships; } public void setRelationships(List relationships) { - fRelationships = relationships; + this.relationships = relationships; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.ObjectData#getRenditions() - */ public List getRenditions() { - return fRenditions; + return renditions; } public void setRenditions(List renditions) { - fRenditions = renditions; + this.renditions = renditions; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.ObjectData#getPolicyIds() - */ public PolicyIdList getPolicyIds() { - return fPolicyIds; + return policyIds; } public void setPolicyIds(PolicyIdList policyIds) { - fPolicyIds = policyIds; + this.policyIds = policyIds; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.ObjectData#getAllowableActions() - */ public AllowableActions getAllowableActions() { - return fAllowableActions; + return allowableActions; } public void setAllowableActions(AllowableActions allowableActions) { - fAllowableActions = allowableActions; + this.allowableActions = allowableActions; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.ObjectData#getACL() - */ public Acl getAcl() { - return fAcl; + return acl; } public void setAcl(Acl acl) { - fAcl = acl; + this.acl = acl; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.ObjectData#isExactACL() - */ public Boolean isExactAcl() { - return fIsExactAcl; + return isExactAcl; } public void setIsExactAcl(Boolean isExactACL) { - fIsExactAcl = isExactACL; + this.isExactAcl = isExactACL; } // ---- internal ---- @@ -188,11 +139,11 @@ public class ObjectDataImpl extends Abst * property is not set. */ private Object getFirstValue(String id) { - if ((fProperties == null) || (fProperties.getProperties() == null)) { + if ((properties == null) || (properties.getProperties() == null)) { return null; } - PropertyData property = fProperties.getProperties().get(id); + PropertyData property = properties.getProperties().get(id); if (property == null) { return null; } @@ -200,16 +151,11 @@ public class ObjectDataImpl extends Abst return property.getFirstValue(); } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ @Override public String toString() { - return "Object Data [properties=" + fProperties + ", allowable actions=" + fAllowableActions - + ", change event info=" + fChangeEventInfo + ", ACL=" + fAcl + ", is exact ACL=" + fIsExactAcl - + ", policy ids=" + fPolicyIds + ", relationships=" + fRelationships + ", renditions=" + fRenditions + return "Object Data [properties=" + properties + ", allowable actions=" + allowableActions + + ", change event info=" + changeEventInfo + ", ACL=" + acl + ", is exact ACL=" + isExactAcl + + ", policy ids=" + policyIds + ", relationships=" + relationships + ", renditions=" + renditions + "]" + super.toString(); } } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectInFolderContainerImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectInFolderContainerImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectInFolderContainerImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectInFolderContainerImpl.java Mon Nov 15 12:32:05 2010 @@ -24,13 +24,14 @@ import org.apache.chemistry.opencmis.com import org.apache.chemistry.opencmis.commons.data.ObjectInFolderData; /** - * @author Florian Müller - * + * ObjectInFolderContainer implementation. */ public class ObjectInFolderContainerImpl extends AbstractExtensionData implements ObjectInFolderContainer { - private ObjectInFolderData fObject; - private List fChildren; + private static final long serialVersionUID = 1L; + + private ObjectInFolderData object; + private List children; /** * Constructor. @@ -47,41 +48,24 @@ public class ObjectInFolderContainerImpl } - /* - * (non-Javadoc) - * - * @see - * org.apache.opencmis.client.provider.ObjectInFolderContainer#getObject() - */ public ObjectInFolderData getObject() { - return fObject; + return object; } public void setObject(ObjectInFolderData object) { - fObject = object; + this.object = object; } - /* - * (non-Javadoc) - * - * @see - * org.apache.opencmis.client.provider.ObjectInFolderContainer#getChildren() - */ public List getChildren() { - return fChildren; + return children; } public void setChildren(List children) { - fChildren = children; + this.children = children; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ @Override public String toString() { - return "ObjectInFolder Container [object=" + fObject + ", children=" + fChildren + "]"; + return "ObjectInFolder Container [object=" + object + ", children=" + children + "]"; } } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectInFolderDataImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectInFolderDataImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectInFolderDataImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectInFolderDataImpl.java Mon Nov 15 12:32:05 2010 @@ -22,13 +22,14 @@ import org.apache.chemistry.opencmis.com import org.apache.chemistry.opencmis.commons.data.ObjectInFolderData; /** - * @author Florian Müller - * + * ObjectInFolderData implementation. */ public class ObjectInFolderDataImpl extends AbstractExtensionData implements ObjectInFolderData { - private ObjectData fObject; - private String fPathSegment; + private static final long serialVersionUID = 1L; + + private ObjectData object; + private String pathSegment; /** * Constructor. @@ -43,40 +44,24 @@ public class ObjectInFolderDataImpl exte setObject(object); } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.ObjectInFolderData#getObject() - */ public ObjectData getObject() { - return fObject; + return object; } public void setObject(ObjectData object) { - fObject = object; + this.object = object; } - /* - * (non-Javadoc) - * - * @see - * org.apache.opencmis.client.provider.ObjectInFolderData#getPathSegment() - */ public String getPathSegment() { - return fPathSegment; + return pathSegment; } public void setPathSegment(String pathSegment) { - fPathSegment = pathSegment; + this.pathSegment = pathSegment; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ @Override public String toString() { - return "ObjectInFolder [object=" + fObject + ", path segment=" + fPathSegment + "]" + super.toString(); + return "ObjectInFolder [object=" + object + ", path segment=" + pathSegment + "]" + super.toString(); } } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectInFolderListImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectInFolderListImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectInFolderListImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectInFolderListImpl.java Mon Nov 15 12:32:05 2010 @@ -25,62 +25,43 @@ import org.apache.chemistry.opencmis.com import org.apache.chemistry.opencmis.commons.data.ObjectInFolderList; /** - * @author Florian Müller - * + * ObjectInFolderList implementation. */ public class ObjectInFolderListImpl extends AbstractExtensionData implements ObjectInFolderList { - private List fObjects; - private Boolean fHasMoreItems = Boolean.FALSE; - private BigInteger fNumItems; - - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.ObjectList#getObjects() - */ + private static final long serialVersionUID = 1L; + + private List objects; + private Boolean hasMoreItems = Boolean.FALSE; + private BigInteger numItems; + public List getObjects() { - return fObjects; + return objects; } public void setObjects(List objects) { - fObjects = objects; + this.objects = objects; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.ObjectList#hasMore() - */ public Boolean hasMoreItems() { - return fHasMoreItems; + return hasMoreItems; } public void setHasMoreItems(Boolean hasMoreItems) { - fHasMoreItems = hasMoreItems; + this.hasMoreItems = hasMoreItems; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.ObjectList#getNumItems() - */ public BigInteger getNumItems() { - return fNumItems; + return numItems; } public void setNumItems(BigInteger numItems) { - fNumItems = numItems; + this.numItems = numItems; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ @Override public String toString() { - return "ObjectInFolder List [objects=" + fObjects + ", has more items=" + fHasMoreItems + ", num items=" - + fNumItems + "]" + super.toString(); + return "ObjectInFolder List [objects=" + objects + ", has more items=" + hasMoreItems + ", num items=" + + numItems + "]" + super.toString(); } } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectListImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectListImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectListImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectListImpl.java Mon Nov 15 12:32:05 2010 @@ -25,62 +25,42 @@ import org.apache.chemistry.opencmis.com import org.apache.chemistry.opencmis.commons.data.ObjectList; /** - * @author Florian Müller - * + * ObjectList implementation. */ public class ObjectListImpl extends AbstractExtensionData implements ObjectList { - private List fObjects; - private Boolean fHasMoreItems = Boolean.FALSE; - private BigInteger fNumItems; - - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.ObjectList#getObjects() - */ + private static final long serialVersionUID = 1L; + + private List objects; + private Boolean hasMoreItems = Boolean.FALSE; + private BigInteger numItems; + public List getObjects() { - return fObjects; + return objects; } public void setObjects(List objects) { - fObjects = objects; + this.objects = objects; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.ObjectList#hasMoreItems() - */ public Boolean hasMoreItems() { - return fHasMoreItems; + return hasMoreItems; } public void setHasMoreItems(Boolean hasMoreItems) { - fHasMoreItems = hasMoreItems; + this.hasMoreItems = hasMoreItems; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.ObjectList#getNumItems() - */ public BigInteger getNumItems() { - return fNumItems; + return numItems; } public void setNumItems(BigInteger numItems) { - fNumItems = numItems; + this.numItems = numItems; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ @Override public String toString() { - return "Object List [objects=" + fObjects + ", has more items=" + fHasMoreItems + ", num items=" + fNumItems - + "]"; + return "Object List [objects=" + objects + ", has more items=" + hasMoreItems + ", num items=" + numItems + "]"; } } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectParentDataImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectParentDataImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectParentDataImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectParentDataImpl.java Mon Nov 15 12:32:05 2010 @@ -22,13 +22,14 @@ import org.apache.chemistry.opencmis.com import org.apache.chemistry.opencmis.commons.data.ObjectParentData; /** - * @author Florian Müller - * + * ObjectParentData implementation. */ public class ObjectParentDataImpl extends AbstractExtensionData implements ObjectParentData { - private ObjectData fObject; - private String fRelativePathSegment; + private static final long serialVersionUID = 1L; + + private ObjectData object; + private String relativePathSegment; /** * Constructor. @@ -43,41 +44,25 @@ public class ObjectParentDataImpl extend setObject(object); } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.ObjectInFolderData#getObject() - */ public ObjectData getObject() { - return fObject; + return object; } public void setObject(ObjectData object) { - fObject = object; + this.object = object; } - /* - * (non-Javadoc) - * - * @see - * org.apache.opencmis.client.provider.ObjectInFolderData#getPathSegment() - */ public String getRelativePathSegment() { - return fRelativePathSegment; + return relativePathSegment; } public void setRelativePathSegment(String relativePathSegment) { - fRelativePathSegment = relativePathSegment; + this.relativePathSegment = relativePathSegment; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ @Override public String toString() { - return "Object Parent [object=" + fObject + ", relative path segment=" + fRelativePathSegment + "]" + return "Object Parent [object=" + object + ", relative path segment=" + relativePathSegment + "]" + super.toString(); } } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PolicyIdListImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PolicyIdListImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PolicyIdListImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PolicyIdListImpl.java Mon Nov 15 12:32:05 2010 @@ -23,18 +23,14 @@ import java.util.List; import org.apache.chemistry.opencmis.commons.data.PolicyIdList; /** - * @author Florian Müller - * + * PolicyIdList implementation. */ public class PolicyIdListImpl extends AbstractExtensionData implements PolicyIdList { + private static final long serialVersionUID = 1L; + private List fPolicyIds; - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.PolicyIdListData#getPolicyIds() - */ public List getPolicyIds() { return fPolicyIds; } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertiesImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertiesImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertiesImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertiesImpl.java Mon Nov 15 12:32:05 2010 @@ -34,6 +34,8 @@ import org.apache.chemistry.opencmis.com */ public class PropertiesImpl extends AbstractExtensionData implements Properties { + private static final long serialVersionUID = 1L; + List> propertyList = new ArrayList>(); Map> properties = new LinkedHashMap>(); Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyBooleanImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyBooleanImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyBooleanImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyBooleanImpl.java Mon Nov 15 12:32:05 2010 @@ -24,12 +24,11 @@ import org.apache.chemistry.opencmis.com /** * Boolean property data implementation. - * - * @author Florian Müller - * */ public class PropertyBooleanImpl extends AbstractPropertyData implements PropertyBoolean { + private static final long serialVersionUID = 1L; + public PropertyBooleanImpl() { } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyDateTimeImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyDateTimeImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyDateTimeImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyDateTimeImpl.java Mon Nov 15 12:32:05 2010 @@ -25,12 +25,11 @@ import org.apache.chemistry.opencmis.com /** * DateTime property data implementation. - * - * @author Florian Müller - * */ public class PropertyDateTimeImpl extends AbstractPropertyData implements PropertyDateTime { + private static final long serialVersionUID = 1L; + public PropertyDateTimeImpl() { } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyDecimalImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyDecimalImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyDecimalImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyDecimalImpl.java Mon Nov 15 12:32:05 2010 @@ -25,12 +25,11 @@ import org.apache.chemistry.opencmis.com /** * Decimal property data implementation. - * - * @author Florian Müller - * */ public class PropertyDecimalImpl extends AbstractPropertyData implements PropertyDecimal { + private static final long serialVersionUID = 1L; + public PropertyDecimalImpl() { } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyHtmlImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyHtmlImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyHtmlImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyHtmlImpl.java Mon Nov 15 12:32:05 2010 @@ -24,12 +24,11 @@ import org.apache.chemistry.opencmis.com /** * Html property data implementation. - * - * @author Florian Müller - * */ public class PropertyHtmlImpl extends AbstractPropertyData implements PropertyHtml { + private static final long serialVersionUID = 1L; + public PropertyHtmlImpl() { } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyIdImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyIdImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyIdImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyIdImpl.java Mon Nov 15 12:32:05 2010 @@ -24,12 +24,11 @@ import org.apache.chemistry.opencmis.com /** * Id property data implementation. - * - * @author Florian Müller - * */ public class PropertyIdImpl extends AbstractPropertyData implements PropertyId { + private static final long serialVersionUID = 1L; + public PropertyIdImpl() { } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyIntegerImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyIntegerImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyIntegerImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyIntegerImpl.java Mon Nov 15 12:32:05 2010 @@ -25,12 +25,11 @@ import org.apache.chemistry.opencmis.com /** * Integer property data implementation. - * - * @author Florian Müller - * */ public class PropertyIntegerImpl extends AbstractPropertyData implements PropertyInteger { + private static final long serialVersionUID = 1L; + public PropertyIntegerImpl() { } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyStringImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyStringImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyStringImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyStringImpl.java Mon Nov 15 12:32:05 2010 @@ -24,12 +24,11 @@ import org.apache.chemistry.opencmis.com /** * String property data implementation. - * - * @author Florian Müller - * */ public class PropertyStringImpl extends AbstractPropertyData implements PropertyString { + private static final long serialVersionUID = 1L; + public PropertyStringImpl() { } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyUriImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyUriImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyUriImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyUriImpl.java Mon Nov 15 12:32:05 2010 @@ -24,12 +24,11 @@ import org.apache.chemistry.opencmis.com /** * Uri property data implementation. - * - * @author Florian Müller - * */ public class PropertyUriImpl extends AbstractPropertyData implements PropertyUri { + private static final long serialVersionUID = 1L; + public PropertyUriImpl() { } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/RenditionDataImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/RenditionDataImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/RenditionDataImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/RenditionDataImpl.java Mon Nov 15 12:32:05 2010 @@ -23,19 +23,20 @@ import java.math.BigInteger; import org.apache.chemistry.opencmis.commons.data.RenditionData; /** - * @author Florian Müller - * + * RenditionData implementation. */ public class RenditionDataImpl extends AbstractExtensionData implements RenditionData { - protected String fStreamId; - private String fMimeType; - protected BigInteger fLength; - private String fKind; - private String fTitle; - protected BigInteger fWidth; - protected BigInteger fHeight; - protected String fRenditionDocumentId; + private static final long serialVersionUID = 1L; + + protected String streamId; + private String mimeType; + protected BigInteger length; + private String kind; + private String title; + protected BigInteger width; + protected BigInteger height; + protected String renditionDocumentId; public RenditionDataImpl() { } @@ -52,122 +53,75 @@ public class RenditionDataImpl extends A setRenditionDocumentId(renditionDocumentId); } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.RenditionData#getStreamId() - */ public String getStreamId() { - return fStreamId; + return streamId; } public void setStreamId(String streamId) { - fStreamId = streamId; + this.streamId = streamId; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.RenditionData#getMimeType() - */ public String getMimeType() { - return fMimeType; + return mimeType; } public void setMimeType(String mimeType) { - fMimeType = mimeType; + this.mimeType = mimeType; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.RenditionData#getLength() - */ public BigInteger getBigLength() { - return fLength; + return length; } public void setBigLength(BigInteger length) { - fLength = length; + this.length = length; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.RenditionData#getKind() - */ public String getKind() { - return fKind; + return kind; } public void setKind(String kind) { - fKind = kind; + this.kind = kind; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.RenditionData#getTitle() - */ public String getTitle() { - return fTitle; + return title; } public void setTitle(String title) { - fTitle = title; + this.title = title; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.RenditionData#getHeight() - */ public BigInteger getBigHeight() { - return fHeight; + return height; } public void setBigHeight(BigInteger height) { - fHeight = height; + this.height = height; } - /* - * (non-Javadoc) - * - * @see org.apache.opencmis.client.provider.RenditionData#getWidth() - */ public BigInteger getBigWidth() { - return fWidth; + return width; } public void setBigWidth(BigInteger width) { - fWidth = width; + this.width = width; } - /* - * (non-Javadoc) - * - * @see - * org.apache.opencmis.client.provider.RenditionData#getRenditionDocumentId - * () - */ public String getRenditionDocumentId() { - return fRenditionDocumentId; + return renditionDocumentId; } public void setRenditionDocumentId(String renditionDocumentId) { - fRenditionDocumentId = renditionDocumentId; + this.renditionDocumentId = renditionDocumentId; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ @Override public String toString() { - return "RenditionDataImpl [, kind=" + fKind + ", title=" + fTitle + ", MIME type=" + fMimeType + ", length=" - + fLength + ", rendition document id=" + fRenditionDocumentId + ", stream id=" + fStreamId + " height=" - + fHeight + ", width=" + fWidth + "]" + super.toString(); + return "RenditionDataImpl [, kind=" + kind + ", title=" + title + ", MIME type=" + mimeType + ", length=" + + length + ", rendition document id=" + renditionDocumentId + ", stream id=" + streamId + " height=" + + height + ", width=" + width + "]" + super.toString(); } } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/TypeDefinitionContainerImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/TypeDefinitionContainerImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/TypeDefinitionContainerImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/TypeDefinitionContainerImpl.java Mon Nov 15 12:32:05 2010 @@ -25,58 +25,41 @@ import org.apache.chemistry.opencmis.com import org.apache.chemistry.opencmis.commons.definitions.TypeDefinitionContainer; /** - * @author Florian Müller - * + * TypeDefinitionContainer implementation. */ public class TypeDefinitionContainerImpl extends AbstractExtensionData implements TypeDefinitionContainer { - private TypeDefinition fType; - private List fChildren; + private static final long serialVersionUID = 1L; + + private TypeDefinition type; + private List children; public TypeDefinitionContainerImpl() { } public TypeDefinitionContainerImpl(TypeDefinition typeDef) { setTypeDefinition(typeDef); - fChildren = new ArrayList(); + children = new ArrayList(); } - /* - * (non-Javadoc) - * - * @see - * org.apache.opencmis.client.provider.TypeDefinitionContainer#getTypeDefinition - * () - */ public TypeDefinition getTypeDefinition() { - return fType; + return type; } public void setTypeDefinition(TypeDefinition type) { - fType = type; + this.type = type; } - /* - * (non-Javadoc) - * - * @see - * org.apache.opencmis.client.provider.TypeDefinitionContainer#getChildren() - */ public List getChildren() { - return fChildren; + return children; } public void setChildren(List children) { - fChildren = children; + this.children = children; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ @Override public String toString() { - return "Type Definition Container [type=" + fType + " ,children=" + fChildren + "]" + super.toString(); + return "Type Definition Container [type=" + type + " ,children=" + children + "]" + super.toString(); } } Modified: incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/TypeDefinitionListImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/TypeDefinitionListImpl.java?rev=1035246&r1=1035245&r2=1035246&view=diff ============================================================================== --- incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/TypeDefinitionListImpl.java (original) +++ incubator/chemistry/opencmis/branches/client-api-refactoring/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/TypeDefinitionListImpl.java Mon Nov 15 12:32:05 2010 @@ -25,10 +25,12 @@ import org.apache.chemistry.opencmis.com import org.apache.chemistry.opencmis.commons.definitions.TypeDefinitionList; /** - * @author Florian Müller + * TypeDefinitionList implementation. */ public class TypeDefinitionListImpl extends AbstractExtensionData implements TypeDefinitionList { + private static final long serialVersionUID = 1L; + private List fList; private Boolean fHasMoreItems = Boolean.FALSE; private BigInteger fNumItems; @@ -41,8 +43,9 @@ public class TypeDefinitionListImpl exte /** * Constructor from a list. - * - * @param list the initial list + * + * @param list + * the initial list */ public TypeDefinitionListImpl(List list) { fList = list;