You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by fm...@apache.org on 2013/05/15 19:02:52 UTC

svn commit: r1482957 - in /chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime: AbstractCmisObject.java RenditionImpl.java SessionImpl.java

Author: fmui
Date: Wed May 15 17:02:52 2013
New Revision: 1482957

URL: http://svn.apache.org/r1482957
Log:
minor client improvements

Modified:
    chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractCmisObject.java
    chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/RenditionImpl.java
    chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/SessionImpl.java

Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractCmisObject.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractCmisObject.java?rev=1482957&r1=1482956&r2=1482957&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractCmisObject.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractCmisObject.java Wed May 15 17:02:52 2013
@@ -157,7 +157,7 @@ public abstract class AbstractCmisObject
             if ((objectData.getPolicyIds() != null) && (objectData.getPolicyIds().getPolicyIds() != null)) {
                 policies = new ArrayList<Policy>();
                 for (String pid : objectData.getPolicyIds().getPolicyIds()) {
-                    CmisObject policy = session.getObject(getSession().createObjectId(pid));
+                    CmisObject policy = session.getObject(pid);
                     if (policy instanceof Policy) {
                         policies.add((Policy) policy);
                     }

Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/RenditionImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/RenditionImpl.java?rev=1482957&r1=1482956&r2=1482957&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/RenditionImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/RenditionImpl.java Wed May 15 17:02:52 2013
@@ -70,7 +70,7 @@ public class RenditionImpl extends Rendi
         if (renditionDocumentId == null) {
             return null;
         }
-        CmisObject rendDoc = session.getObject(session.createObjectId(renditionDocumentId), context);
+        CmisObject rendDoc = session.getObject(renditionDocumentId, context);
         if (!(rendDoc instanceof Document)) {
             return null;
         }
@@ -106,8 +106,8 @@ public class RenditionImpl extends Rendi
         }
         long length = bigLength == null ? -1 : bigLength.longValue();
 
-        return session.getObjectFactory().createContentStream(filename, length,
-                contentStream.getMimeType(), contentStream.getStream());
+        return session.getObjectFactory().createContentStream(filename, length, contentStream.getMimeType(),
+                contentStream.getStream());
     }
 
 }

Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/SessionImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/SessionImpl.java?rev=1482957&r1=1482956&r2=1482957&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/SessionImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/SessionImpl.java Wed May 15 17:02:52 2013
@@ -174,7 +174,7 @@ public class SessionImpl implements Sess
         cachePathOmit = Boolean.parseBoolean(parameters.get(SessionParameter.CACHE_PATH_OMIT));
     }
 
-    private static Locale determineLocale(Map<String, String> parameters) {
+    private Locale determineLocale(Map<String, String> parameters) {
         Locale locale = null;
 
         String language = parameters.get(SessionParameter.LOCALE_ISO639_LANGUAGE);
@@ -487,7 +487,7 @@ public class SessionImpl implements Sess
     public Folder getRootFolder(OperationContext context) {
         String rootFolderId = getRepositoryInfo().getRootFolderId();
 
-        CmisObject rootFolder = getObject(createObjectId(rootFolderId), context);
+        CmisObject rootFolder = getObject(rootFolderId, context);
         if (!(rootFolder instanceof Folder)) {
             throw new CmisRuntimeException("Root folder object is not a folder!");
         }
@@ -943,7 +943,7 @@ public class SessionImpl implements Sess
                 List<Relationship> page = new ArrayList<Relationship>();
                 if (relList.getObjects() != null) {
                     for (ObjectData rod : relList.getObjects()) {
-                        CmisObject relationship = getObject(createObjectId(rod.getId()), ctxt);
+                        CmisObject relationship = getObject(rod.getId(), ctxt);
                         if (!(relationship instanceof Relationship)) {
                             throw new CmisRuntimeException("Repository returned an object that is not a relationship!");
                         }