chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fguilla...@apache.org
Subject svn commit: r934854 [5/5] - in /incubator/chemistry/opencmis/trunk: chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/ chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/ja...
Date Fri, 16 Apr 2010 12:52:00 GMT
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/AbstractServiceWrapper.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/AbstractServiceWrapper.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/AbstractServiceWrapper.java
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/AbstractServiceWrapper.java
Fri Apr 16 12:51:57 2010
@@ -22,11 +22,11 @@ import java.math.BigInteger;
 
 import org.apache.chemistry.opencmis.commons.api.ContentStream;
 import org.apache.chemistry.opencmis.commons.api.Holder;
-import org.apache.chemistry.opencmis.commons.api.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.Properties;
 import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
 import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
 import org.apache.chemistry.opencmis.commons.enums.RelationshipDirection;
-import org.apache.chemistry.opencmis.commons.enums.UnfileObjects;
+import org.apache.chemistry.opencmis.commons.enums.UnfileObject;
 import org.apache.chemistry.opencmis.commons.enums.VersioningState;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisBaseException;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
@@ -136,7 +136,7 @@ public abstract class AbstractServiceWra
   /**
    * Throws an exception if the given properties set is <code>null</code>.
    */
-  protected void checkProperties(PropertiesData properties) {
+  protected void checkProperties(Properties properties) {
     if (properties == null) {
       throw new CmisInvalidArgumentException("Properties must be set!");
     }
@@ -211,9 +211,9 @@ public abstract class AbstractServiceWra
   /**
    * Returns the <code>UnfileObjects.DELETE<code> if <code>value</code>
is <code>null</code>.
    */
-  protected UnfileObjects getDefault(UnfileObjects value) {
+  protected UnfileObject getDefault(UnfileObject value) {
     if (value == null) {
-      return UnfileObjects.DELETE;
+      return UnfileObject.DELETE;
     }
 
     return value;

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/ObjectServiceWrapper.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/ObjectServiceWrapper.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/ObjectServiceWrapper.java
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/ObjectServiceWrapper.java
Fri Apr 16 12:51:57 2010
@@ -28,10 +28,10 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.api.FailedToDeleteData;
 import org.apache.chemistry.opencmis.commons.api.Holder;
 import org.apache.chemistry.opencmis.commons.api.ObjectData;
-import org.apache.chemistry.opencmis.commons.api.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.Properties;
 import org.apache.chemistry.opencmis.commons.api.RenditionData;
 import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
-import org.apache.chemistry.opencmis.commons.enums.UnfileObjects;
+import org.apache.chemistry.opencmis.commons.enums.UnfileObject;
 import org.apache.chemistry.opencmis.commons.enums.VersioningState;
 import org.apache.chemistry.opencmis.server.spi.CallContext;
 import org.apache.chemistry.opencmis.server.spi.CmisObjectService;
@@ -75,7 +75,7 @@ public class ObjectServiceWrapper extend
    * org.apache.opencmis.commons.api.ExtensionsData,
    * org.apache.opencmis.server.spi.ObjectInfoHolder)
    */
-  public ObjectData create(CallContext context, String repositoryId, PropertiesData properties,
+  public ObjectData create(CallContext context, String repositoryId, Properties properties,
       String folderId, ContentStream contentStream, VersioningState versioningState,
       List<String> policies, ExtensionsData extension, ObjectInfoHolder objectInfos)
{
     checkRepositoryId(repositoryId);
@@ -103,7 +103,7 @@ public class ObjectServiceWrapper extend
    * org.apache.opencmis.commons.provider.AccessControlList,
    * org.apache.opencmis.commons.api.ExtensionsData)
    */
-  public String createDocument(CallContext context, String repositoryId, PropertiesData properties,
+  public String createDocument(CallContext context, String repositoryId, Properties properties,
       String folderId, ContentStream contentStream, VersioningState versioningState,
       List<String> policies, Acl addAces, Acl removeAces,
       ExtensionsData extension) {
@@ -133,7 +133,7 @@ public class ObjectServiceWrapper extend
    * org.apache.opencmis.commons.api.ExtensionsData)
    */
   public String createDocumentFromSource(CallContext context, String repositoryId, String
sourceId,
-      PropertiesData properties, String folderId, VersioningState versioningState,
+      Properties properties, String folderId, VersioningState versioningState,
       List<String> policies, Acl addAces, Acl removeAces,
       ExtensionsData extension) {
     checkRepositoryId(repositoryId);
@@ -159,7 +159,7 @@ public class ObjectServiceWrapper extend
    * org.apache.opencmis.commons.provider.AccessControlList,
    * org.apache.opencmis.commons.api.ExtensionsData)
    */
-  public String createFolder(CallContext context, String repositoryId, PropertiesData properties,
+  public String createFolder(CallContext context, String repositoryId, Properties properties,
       String folderId, List<String> policies, Acl addAces,
       Acl removeAces, ExtensionsData extension) {
     checkRepositoryId(repositoryId);
@@ -185,7 +185,7 @@ public class ObjectServiceWrapper extend
    * org.apache.opencmis.commons.provider.AccessControlList,
    * org.apache.opencmis.commons.api.ExtensionsData)
    */
-  public String createPolicy(CallContext context, String repositoryId, PropertiesData properties,
+  public String createPolicy(CallContext context, String repositoryId, Properties properties,
       String folderId, List<String> policies, Acl addAces,
       Acl removeAces, ExtensionsData extension) {
     checkRepositoryId(repositoryId);
@@ -211,7 +211,7 @@ public class ObjectServiceWrapper extend
    * org.apache.opencmis.commons.api.ExtensionsData)
    */
   public String createRelationship(CallContext context, String repositoryId,
-      PropertiesData properties, List<String> policies, Acl addAces,
+      Properties properties, List<String> policies, Acl addAces,
       Acl removeAces, ExtensionsData extension) {
     checkRepositoryId(repositoryId);
     checkProperties(properties);
@@ -279,7 +279,7 @@ public class ObjectServiceWrapper extend
    * org.apache.opencmis.commons.api.ExtensionsData)
    */
   public FailedToDeleteData deleteTree(CallContext context, String repositoryId, String folderId,
-      Boolean allVersions, UnfileObjects unfileObjects, Boolean continueOnFailure,
+      Boolean allVersions, UnfileObject unfileObjects, Boolean continueOnFailure,
       ExtensionsData extension) {
     checkRepositoryId(repositoryId);
     checkId("Folder Id", folderId);
@@ -413,7 +413,7 @@ public class ObjectServiceWrapper extend
    * .CallContext, java.lang.String, java.lang.String, java.lang.String,
    * org.apache.opencmis.commons.api.ExtensionsData)
    */
-  public PropertiesData getProperties(CallContext context, String repositoryId, String objectId,
+  public Properties getProperties(CallContext context, String repositoryId, String objectId,
       String filter, ExtensionsData extension) {
     checkRepositoryId(repositoryId);
     checkId("Object Id", objectId);
@@ -517,7 +517,7 @@ public class ObjectServiceWrapper extend
    * org.apache.opencmis.server.spi.ObjectInfoHolder)
    */
   public ObjectData updateProperties(CallContext context, String repositoryId,
-      Holder<String> objectId, Holder<String> changeToken, PropertiesData properties,
+      Holder<String> objectId, Holder<String> changeToken, Properties properties,
       Acl acl, ExtensionsData extension, ObjectInfoHolder objectInfos) {
     checkRepositoryId(repositoryId);
     checkHolderId("Object Id", objectId);

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/VersioningServiceWrapper.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/VersioningServiceWrapper.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/VersioningServiceWrapper.java
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/VersioningServiceWrapper.java
Fri Apr 16 12:51:57 2010
@@ -25,7 +25,7 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
 import org.apache.chemistry.opencmis.commons.api.Holder;
 import org.apache.chemistry.opencmis.commons.api.ObjectData;
-import org.apache.chemistry.opencmis.commons.api.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.Properties;
 import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
 import org.apache.chemistry.opencmis.server.spi.CallContext;
 import org.apache.chemistry.opencmis.server.spi.CmisVersioningService;
@@ -91,7 +91,7 @@ public class VersioningServiceWrapper ex
    * org.apache.opencmis.server.spi.ObjectInfoHolder)
    */
   public ObjectData checkIn(CallContext context, String repositoryId, Holder<String>
objectId,
-      Boolean major, PropertiesData properties, ContentStream contentStream,
+      Boolean major, Properties properties, ContentStream contentStream,
       String checkinComment, List<String> policies, Acl addAces,
       Acl removeAces, ExtensionsData extension, ObjectInfoHolder objectInfos) {
     checkRepositoryId(repositoryId);
@@ -197,7 +197,7 @@ public class VersioningServiceWrapper ex
    * .opencmis.server.spi.CallContext, java.lang.String, java.lang.String, java.lang.Boolean,
    * java.lang.String, org.apache.opencmis.commons.api.ExtensionsData)
    */
-  public PropertiesData getPropertiesOfLatestVersion(CallContext context, String repositoryId,
+  public Properties getPropertiesOfLatestVersion(CallContext context, String repositoryId,
       String versionSeriesId, Boolean major, String filter, ExtensionsData extension) {
     checkRepositoryId(repositoryId);
     checkId("Object Id", versionSeriesId);

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AbstractBindingIT.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AbstractBindingIT.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AbstractBindingIT.java
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AbstractBindingIT.java
Fri Apr 16 12:51:57 2010
@@ -25,10 +25,10 @@ import java.util.List;
 
 import org.apache.chemistry.opencmis.commons.PropertyIds;
 import org.apache.chemistry.opencmis.commons.api.CmisBinding;
-import org.apache.chemistry.opencmis.commons.api.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.Properties;
 import org.apache.chemistry.opencmis.commons.api.PropertyData;
 import org.apache.chemistry.opencmis.commons.api.RepositoryInfo;
-import org.apache.chemistry.opencmis.commons.enums.UnfileObjects;
+import org.apache.chemistry.opencmis.commons.enums.UnfileObject;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -116,7 +116,7 @@ public abstract class AbstractBindingIT 
     propertyList.add(getBinding().getObjectFactory().createPropertyIdData(
         PropertyIds.OBJECT_TYPE_ID, FOLDER_TYPE));
 
-    PropertiesData properties = getBinding().getObjectFactory().createPropertiesData(propertyList);
+    Properties properties = getBinding().getObjectFactory().createPropertiesData(propertyList);
 
     // create the folder
     fTestFolderId = getBinding().getObjectService().createFolder(fRepositoryId, properties,
@@ -135,6 +135,6 @@ public abstract class AbstractBindingIT 
 
     // delete the whole tree
     getBinding().getObjectService().deleteTree(fRepositoryId, fTestFolderId, true,
-        UnfileObjects.DELETE, true, null);
+        UnfileObject.DELETE, true, null);
   }
 }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AbstractSimpleBindingIT.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AbstractSimpleBindingIT.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AbstractSimpleBindingIT.java
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AbstractSimpleBindingIT.java
Fri Apr 16 12:51:57 2010
@@ -29,7 +29,7 @@ import java.util.List;
 import org.apache.chemistry.opencmis.commons.PropertyIds;
 import org.apache.chemistry.opencmis.commons.api.ContentStream;
 import org.apache.chemistry.opencmis.commons.api.ObjectData;
-import org.apache.chemistry.opencmis.commons.api.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.Properties;
 import org.apache.chemistry.opencmis.commons.api.PropertyData;
 import org.apache.chemistry.opencmis.commons.api.RepositoryInfo;
 import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
@@ -66,7 +66,7 @@ public abstract class AbstractSimpleBind
     propertyList.add(getBinding().getObjectFactory().createPropertyIdData(
         PropertyIds.OBJECT_TYPE_ID, DOCUMENT_TYPE));
 
-    PropertiesData properties = getBinding().getObjectFactory().createPropertiesData(propertyList);
+    Properties properties = getBinding().getObjectFactory().createPropertiesData(propertyList);
 
     // set up content
     byte[] content = "This is a test file!".getBytes();

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/FixtureSetup.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/FixtureSetup.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/FixtureSetup.java
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/FixtureSetup.java
Fri Apr 16 12:51:57 2010
@@ -25,10 +25,10 @@ import org.apache.chemistry.opencmis.cli
 import org.apache.chemistry.opencmis.commons.PropertyIds;
 import org.apache.chemistry.opencmis.commons.SessionParameter;
 import org.apache.chemistry.opencmis.commons.api.CmisBinding;
-import org.apache.chemistry.opencmis.commons.api.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.Properties;
 import org.apache.chemistry.opencmis.commons.api.PropertyData;
 import org.apache.chemistry.opencmis.commons.api.RepositoryInfo;
-import org.apache.chemistry.opencmis.commons.enums.UnfileObjects;
+import org.apache.chemistry.opencmis.commons.enums.UnfileObject;
 import org.apache.chemistry.opencmis.util.repository.ObjectGenerator;
 import org.junit.Assert;
 
@@ -41,7 +41,7 @@ public class FixtureSetup {
 
 	public void teardown() {
 		this.binding.getObjectService().deleteTree(this.repositoryId,
-				this.testRootFolderId, true, UnfileObjects.DELETE, true, null);
+				this.testRootFolderId, true, UnfileObject.DELETE, true, null);
 	}
 
 	public void setup() {
@@ -81,7 +81,7 @@ public class FixtureSetup {
 		propList.add(this.binding.getObjectFactory().createPropertyIdData(
 				PropertyIds.OBJECT_TYPE_ID, folderTypeId));
 
-		PropertiesData properties = this.binding.getObjectFactory()
+		Properties properties = this.binding.getObjectFactory()
 				.createPropertiesData(propList);
 
 		this.testRootFolderId = this.binding.getObjectService().createFolder(

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/WriteObjectIT.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/WriteObjectIT.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/WriteObjectIT.java
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/WriteObjectIT.java
Fri Apr 16 12:51:57 2010
@@ -241,7 +241,7 @@ public class WriteObjectIT extends Abstr
                 filename, buf1.length, mimetype, in1);
         assertNotNull(contentStream);
 
-        document.setContentStream(true, contentStream);
+        document.setContentStream(contentStream, true);
 
         // check default content
         ContentStream contentStream2 = document.getContentStream();

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjectGenerator.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjectGenerator.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjectGenerator.java
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjectGenerator.java
Fri Apr 16 12:51:57 2010
@@ -39,11 +39,11 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.api.ObjectInFolderData;
 import org.apache.chemistry.opencmis.commons.api.ObjectInFolderList;
 import org.apache.chemistry.opencmis.commons.api.ObjectService;
-import org.apache.chemistry.opencmis.commons.api.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.Properties;
 import org.apache.chemistry.opencmis.commons.api.PropertyData;
 import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
 import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
-import org.apache.chemistry.opencmis.commons.enums.UnfileObjects;
+import org.apache.chemistry.opencmis.commons.enums.UnfileObject;
 import org.apache.chemistry.opencmis.commons.enums.VersioningState;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.ContentStreamImpl;
 import org.apache.commons.logging.Log;
@@ -355,7 +355,7 @@ public class ObjectGenerator {
          + ", max levels " + levels);
     
     for (int i = 0; i < childrenPerLevel; i++) {
-      PropertiesData props = createFolderProperties(i, level);
+      Properties props = createFolderProperties(i, level);
       try {
         fTimeLoggerCreateFolder.start();
         id = fObjSvc.createFolder(fRepositoryId, props, parentId, null, null, null, null);
@@ -378,7 +378,7 @@ public class ObjectGenerator {
   }
 
   private String createFolder(String parentId) {
-    PropertiesData props = createFolderProperties(0, 0);
+    Properties props = createFolderProperties(0, 0);
     String id = null;
     try {
       fTimeLoggerCreateFolder.start();
@@ -399,7 +399,7 @@ public class ObjectGenerator {
     ExtensionsData extension = null;
 
     // log.info("create document in folder " + folderId);
-    PropertiesData props = createDocumentProperties(no, level);
+    Properties props = createDocumentProperties(no, level);
     String id = null;
     if (fContentSizeInK > 0)
       contentStream = createContent();
@@ -428,7 +428,7 @@ public class ObjectGenerator {
     for (String id : fTopLevelFoldersCreated) {
       try {
         fTimeLoggerDelete.start();
-        fObjSvc.deleteTree(fRepositoryId, id, true, UnfileObjects.DELETE, true, null);
+        fObjSvc.deleteTree(fRepositoryId, id, true, UnfileObject.DELETE, true, null);
       } finally {
         fTimeLoggerDelete.stop();
       }    
@@ -468,7 +468,7 @@ public class ObjectGenerator {
     return content;
   }
 
-  private PropertiesData createFolderProperties(int no, int level) {
+  private Properties createFolderProperties(int no, int level) {
     List<PropertyData<?>> properties = new ArrayList<PropertyData<?>>();
     properties.add(fFactory.createPropertyStringData(PropertyIds.NAME, generateFolderNameValue(no,
level)));
     properties.add(fFactory.createPropertyIdData(PropertyIds.OBJECT_TYPE_ID, fFolderTypeId));
@@ -476,11 +476,11 @@ public class ObjectGenerator {
     for (String stringPropId : fStringPropertyIdsToSetForFolder) {
       properties.add(fFactory.createPropertyStringData(stringPropId, generateStringPropValueFolder()));
     
     }
-    PropertiesData props = fFactory.createPropertiesData(properties);
+    Properties props = fFactory.createPropertiesData(properties);
     return props;
   }
 
-  private PropertiesData createDocumentProperties(int no, int level) {
+  private Properties createDocumentProperties(int no, int level) {
     List<PropertyData<?>> properties = new ArrayList<PropertyData<?>>();
     properties.add(fFactory.createPropertyStringData(PropertyIds.NAME, generateDocNameValue(no,
level)));
     properties.add(fFactory.createPropertyIdData(PropertyIds.OBJECT_TYPE_ID, fDocTypeId));
@@ -488,7 +488,7 @@ public class ObjectGenerator {
     for (String stringPropId : fStringPropertyIdsToSetForDocument) {
       properties.add(fFactory.createPropertyStringData(stringPropId, generateStringPropValueDoc()));
     
     }
-    PropertiesData props = fFactory.createPropertiesData(properties);
+    Properties props = fFactory.createPropertiesData(properties);
     return props;
   }
   
@@ -572,7 +572,7 @@ public class ObjectGenerator {
     Map<String, PropertyData<?>> propMap;
     if (mustFetchProperties) {
       String objId = (String) object.getProperties().getProperties().get(PropertyIds.OBJECT_ID).getFirstValue();
-      PropertiesData props = fObjSvc.getProperties(fRepositoryId, objId, propertyFilter,
null);
+      Properties props = fObjSvc.getProperties(fRepositoryId, objId, propertyFilter, null);
       propMap = props.getProperties();
     } else {
       propMap = object.getProperties().getProperties();



Mime
View raw message