chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfermig...@apache.org
Subject svn commit: r897726 - in /incubator/chemistry/trunk/chemistry: chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/ chemistry-atompub/src/main/java/org/apache/chemistry/atompub/ chemistry-atompub/src/main/java/org/apache/chemistr...
Date Sun, 10 Jan 2010 22:44:20 GMT
Author: sfermigier
Date: Sun Jan 10 22:44:20 2010
New Revision: 897726

URL: http://svn.apache.org/viewvc?rev=897726&view=rev
Log:
Cleanup.


Modified:
    incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISObjectsCollection.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/AtomPubCMIS.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/ObjectElement.java
    incubator/chemistry/trunk/chemistry/chemistry-tests/src/main/java/org/apache/chemistry/test/BasicTestCase.java
    incubator/chemistry/trunk/chemistry/chemistry-tests/src/test/java/org/apache/chemistry/test/TestJcrRepository.java

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISObjectsCollection.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISObjectsCollection.java?rev=897726&r1=897725&r2=897726&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISObjectsCollection.java
(original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISObjectsCollection.java
Sun Jan 10 22:44:20 2010
@@ -354,12 +354,12 @@
         }
 
         // get properties and type from entry
-        Map<String, Serializable> properties;
         Element obb = entry.getFirstChild(AtomPubCMIS.OBJECT);
         if (obb == null) {
             // compat with buggy CMISSpacesAir
             obb = entry.getFirstChild(new QName(CMIS.CMIS_NS, "object"));
         }
+        Map<String, Serializable> properties;
         if (obb == null) {
             // no CMIS object, basic AtomPub post/put
             properties = new HashMap<String, Serializable>();

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/AtomPubCMIS.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/AtomPubCMIS.java?rev=897726&r1=897725&r2=897726&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/AtomPubCMIS.java
(original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/AtomPubCMIS.java
Sun Jan 10 22:44:20 2010
@@ -136,7 +136,7 @@
 
     public static final String PARAM_INCLUDE_PROPERTY_DEFINITIONS = "includePropertyDefinitions";
 
-    public final static String PARAM_FOLDER_ID = "folderId";
+    public static final String PARAM_FOLDER_ID = "folderId";
 
     public static final String PARAM_RENDITION_FILTER = "renditionFilter";
 

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/ObjectElement.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/ObjectElement.java?rev=897726&r1=897725&r2=897726&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/ObjectElement.java
(original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/ObjectElement.java
Sun Jan 10 22:44:20 2010
@@ -38,8 +38,6 @@
 
     /**
      * Constructor used when parsing XML.
-     *
-     * @param repository
      */
     public ObjectElement(Element internal, Repository repository) {
         super(internal);

Modified: incubator/chemistry/trunk/chemistry/chemistry-tests/src/main/java/org/apache/chemistry/test/BasicTestCase.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tests/src/main/java/org/apache/chemistry/test/BasicTestCase.java?rev=897726&r1=897725&r2=897726&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tests/src/main/java/org/apache/chemistry/test/BasicTestCase.java
(original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tests/src/main/java/org/apache/chemistry/test/BasicTestCase.java
Sun Jan 10 22:44:20 2010
@@ -190,7 +190,7 @@
         assertEquals(expectedRootTypeId, rootType.getId());
         assertEquals(expectedRootTypeId, root.getTypeId());
         assertEquals(ROOT_FOLDER_NAME, root.getName());
-        assertEquals(null, root.getParent());
+        assertNull(root.getParent());
         Map<String, Property> props = root.getProperties();
         assertNotNull(props);
         assertTrue(props.size() > 0);

Modified: incubator/chemistry/trunk/chemistry/chemistry-tests/src/test/java/org/apache/chemistry/test/TestJcrRepository.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tests/src/test/java/org/apache/chemistry/test/TestJcrRepository.java?rev=897726&r1=897725&r2=897726&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tests/src/test/java/org/apache/chemistry/test/TestJcrRepository.java
(original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tests/src/test/java/org/apache/chemistry/test/TestJcrRepository.java
Sun Jan 10 22:44:20 2010
@@ -24,7 +24,6 @@
 import javax.jcr.Session;
 import javax.jcr.SimpleCredentials;
 import javax.jcr.Workspace;
-import javax.jcr.nodetype.NodeTypeManager;
 
 import org.apache.chemistry.CapabilityQuery;
 import org.apache.chemistry.Repository;



Mime
View raw message