You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by sf...@apache.org on 2009/05/09 09:59:45 UTC

svn commit: r773176 - in /incubator/chemistry/trunk/chemistry: chemistry-api/src/main/java/org/apache/chemistry/ chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/ chemistry-atompub-server/src/test/java/org/apache/chemistry/ato...

Author: sfermigier
Date: Sat May  9 07:59:44 2009
New Revision: 773176

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


Modified:
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/RepositoryFactory.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISProvider.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/test/java/org/apache/chemistry/atompub/server/TestAtomPubServer.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/PropertiesElement.java
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseRepository.java
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleContentStream.java
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleType.java
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/test/java/org/apache/chemistry/impl/simple/TestSimpleRepository.java
    incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrConnection.java
    incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrContentStream.java
    incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrNewDocument.java
    incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrNewFolder.java
    incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrProperty.java
    incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrPropertyDefinition.java
    incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrRepository.java
    incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrType.java

Modified: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/RepositoryFactory.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/RepositoryFactory.java?rev=773176&r1=773175&r2=773176&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/RepositoryFactory.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/RepositoryFactory.java Sat May  9 07:59:44 2009
@@ -4,9 +4,9 @@
 
 public interface RepositoryFactory {
 
-    public Repository create(Map<String, String> params) throws Exception;
+    Repository create(Map<String, String> params) throws Exception;
 
-    public Repository create(Object context, Map<String, String> params)
+    Repository create(Object context, Map<String, String> params)
             throws Exception;
 }
 

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISProvider.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISProvider.java?rev=773176&r1=773175&r2=773176&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISProvider.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISProvider.java Sat May  9 07:59:44 2009
@@ -107,7 +107,6 @@
 
         SimpleWorkspaceInfo workspaceInfo = new SimpleWorkspaceInfo();
         workspaceInfo.setTitle(repository.getInfo().getName());
-        CollectionInfo ci;
 
         workspaceInfo.addCollection(new CMISCollectionForChildren(
                 CMIS.COL_ROOT_CHILDREN,
@@ -123,6 +122,7 @@
         workspaceInfo.addCollection(new CMISCollectionForOther(
                 CMIS.COL_CHECKED_OUT, "checkedout", null, repository));
 
+        CollectionInfo ci;
         ci = new CMISCollectionForTypes(CMIS.COL_TYPES_CHILDREN, repository);
         workspaceInfo.addCollection(ci);
 

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/test/java/org/apache/chemistry/atompub/server/TestAtomPubServer.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/test/java/org/apache/chemistry/atompub/server/TestAtomPubServer.java?rev=773176&r1=773175&r2=773176&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/test/java/org/apache/chemistry/atompub/server/TestAtomPubServer.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/test/java/org/apache/chemistry/atompub/server/TestAtomPubServer.java Sat May  9 07:59:44 2009
@@ -57,7 +57,7 @@
 
     private static final String TEST_FILE_CONTENT = "This is a test file.\nTesting, testing...\n";
 
-    protected static AbderaClient client = new AbderaClient();
+    protected static final AbderaClient client = new AbderaClient();
 
     protected static String doc3id;
 
@@ -184,7 +184,7 @@
         Element ob = resp.getDocument().getRoot();
         assertNotNull(ob);
 
-        HttpMethod method = new GetMethod((base + "/file/" + doc3id));
+        HttpMethod method = new GetMethod(base + "/file/" + doc3id);
         int status = new HttpClient().executeMethod(method);
         assertEquals(HttpStatus.SC_OK, status);
         assertEquals("text/plain",

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/PropertiesElement.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/PropertiesElement.java?rev=773176&r1=773175&r2=773176&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/PropertiesElement.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/PropertiesElement.java Sat May  9 07:59:44 2009
@@ -26,6 +26,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Arrays;
 
 import javax.xml.namespace.QName;
 
@@ -99,9 +100,7 @@
         case PropertyType.STRING_ORD:
         case PropertyType.ID_ORD:
             if (multi) {
-                for (String v : (String[]) value) {
-                    values.add(v);
-                }
+                values.addAll(Arrays.asList((String[]) value));
             } else {
                 values = Collections.singletonList((String) value);
             }

Modified: incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseRepository.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseRepository.java?rev=773176&r1=773175&r2=773176&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseRepository.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseRepository.java Sat May  9 07:59:44 2009
@@ -57,29 +57,29 @@
 
     public static final String POLICY_TYPE_ID = "policy";
 
-    public static SimpleType ROOT_TYPE = new SimpleType(ROOT_TYPE_ID,
+    public static final SimpleType ROOT_TYPE = new SimpleType(ROOT_TYPE_ID,
             FOLDER_TYPE_ID, "Root", "Root Folder Type", BaseType.FOLDER, "",
             false, false, false, false, false, false,
             ContentStreamPresence.NOT_ALLOWED, null, null,
             Collections.<PropertyDefinition> emptyList());
 
-    public static SimpleType DOCUMENT_TYPE = new SimpleType(DOCUMENT_TYPE_ID,
+    public static final SimpleType DOCUMENT_TYPE = new SimpleType(DOCUMENT_TYPE_ID,
             null, "Document", "Document Type", BaseType.DOCUMENT, "", true,
             true, true, true, true, true, ContentStreamPresence.ALLOWED, null,
             null, Collections.<PropertyDefinition> emptyList());
 
-    public static SimpleType FOLDER_TYPE = new SimpleType(FOLDER_TYPE_ID, null,
+    public static final SimpleType FOLDER_TYPE = new SimpleType(FOLDER_TYPE_ID, null,
             "Folder", "Folder Type", BaseType.FOLDER, "", true, true, false,
             true, true, false, ContentStreamPresence.NOT_ALLOWED, null, null,
             Collections.<PropertyDefinition> emptyList());
 
-    public static SimpleType RELATIONSHIP_TYPE = new SimpleType(
+    public static final SimpleType RELATIONSHIP_TYPE = new SimpleType(
             RELATIONSHIP_TYPE_ID, null, "Relationship", "Relationship Type",
             BaseType.RELATIONSHIP, "", true, true, false, true, false, false,
             ContentStreamPresence.NOT_ALLOWED, null, null,
             Collections.<PropertyDefinition> emptyList());
 
-    protected static SimpleType POLICY_TYPE = new SimpleType(POLICY_TYPE_ID,
+    protected static final SimpleType POLICY_TYPE = new SimpleType(POLICY_TYPE_ID,
             null, "Policy", "Policy Type", BaseType.POLICY, "", true, true,
             false, true, false, false, ContentStreamPresence.NOT_ALLOWED, null,
             null, Collections.<PropertyDefinition> emptyList());

Modified: incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleContentStream.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleContentStream.java?rev=773176&r1=773175&r2=773176&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleContentStream.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleContentStream.java Sat May  9 07:59:44 2009
@@ -42,7 +42,7 @@
     protected final long length;
 
     public SimpleContentStream(byte[] bytes, String mimeType, String filename,
-            URI uri) throws IOException {
+            URI uri) {
         this.mimeType = mimeType;
         this.filename = filename;
         this.uri = uri;

Modified: incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleType.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleType.java?rev=773176&r1=773175&r2=773176&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleType.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleType.java Sat May  9 07:59:44 2009
@@ -190,7 +190,7 @@
             PropertyType.STRING, false, null, false, true, null,
             Updatability.READ_WRITE, true, true, 0, null, null, -1, null, null);
 
-    private static final PropertyDefinition[] PROPS_COMMON = new SimplePropertyDefinition[] {
+    private static final PropertyDefinition[] PROPS_COMMON = {
             PROP_ID, //
             PROP_URI, //
             PROP_TYPE_ID, //
@@ -202,7 +202,7 @@
 
     private static List<PropertyDefinition> commonPlus(
             PropertyDefinition... array) {
-        ArrayList<PropertyDefinition> list = new ArrayList<PropertyDefinition>(
+        List<PropertyDefinition> list = new ArrayList<PropertyDefinition>(
                 PROPS_COMMON.length + array.length);
         list.addAll(Arrays.asList(PROPS_COMMON));
         list.addAll(Arrays.asList(array));

Modified: incubator/chemistry/trunk/chemistry/chemistry-commons/src/test/java/org/apache/chemistry/impl/simple/TestSimpleRepository.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-commons/src/test/java/org/apache/chemistry/impl/simple/TestSimpleRepository.java?rev=773176&r1=773175&r2=773176&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-commons/src/test/java/org/apache/chemistry/impl/simple/TestSimpleRepository.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-commons/src/test/java/org/apache/chemistry/impl/simple/TestSimpleRepository.java Sat May  9 07:59:44 2009
@@ -79,13 +79,15 @@
     public void testInit() throws Exception {
         assertEquals("test", repo.getId());
         assertEquals("test", repo.getName());
+
         RepositoryInfo info = repo.getInfo();
         assertNotNull(info.getRootFolderId());
         assertEquals("Apache", info.getVendorName());
         assertEquals("Chemistry Simple Repository", info.getProductName());
         assertEquals("0.1-SNAPSHOT", info.getProductVersion());
         assertEquals("0.61", info.getVersionSupported());
-        assertEquals(null, info.getRepositorySpecificInformation());
+        assertNull(info.getRepositorySpecificInformation());
+
         RepositoryCapabilities capabilities = info.getCapabilities();
         assertFalse(capabilities.hasMultifiling());
         assertFalse(capabilities.hasUnfiling());
@@ -96,6 +98,7 @@
         assertEquals(JoinCapability.NO_JOIN, capabilities.getJoinCapability());
         assertEquals(QueryCapability.BOTH_COMBINED,
                 capabilities.getQueryCapability());
+
         Collection<Type> types = repo.getTypes(null, true);
         assertEquals(5 + 2, types.size()); // default types have been added
     }
@@ -103,6 +106,7 @@
     public void testRoot() throws Exception {
         Connection conn = repo.getConnection(null);
         assertNotNull(conn);
+
         Folder root = conn.getRootFolder();
         assertNotNull(root);
         assertEquals(repo.getRootFolderId().getId(), root.getId());
@@ -116,13 +120,17 @@
         Folder root = conn.getRootFolder();
         Folder f1 = root.newFolder("fold");
         assertEquals(12 + 1, f1.getType().getPropertyDefinitions().size());
+
         List<CMISObject> children = root.getChildren(null);
         assertEquals(0, children.size());
+
         f1.save();
         assertEquals(root.getId(), f1.getParent().getId());
+
         children = root.getChildren(null);
         assertEquals(1, children.size());
         assertTrue(children.get(0) instanceof Folder);
+
         Document d1 = root.newDocument("doc");
         d1.save();
         children = root.getChildren(null);
@@ -136,13 +144,17 @@
         Folder root = conn.getRootFolder();
         Document d1 = root.newDocument("doc");
         assertEquals(22 + 3, d1.getType().getPropertyDefinitions().size());
+
         d1.save();
         assertEquals(root.getId(), d1.getParent().getId());
+
         d1.setValue("title", "Yo!");
         assertEquals("Yo!", d1.getString("title"));
         // refetch
+
         d1 = (Document) conn.getObject(d1, null);
         assertEquals("Yo!", d1.getString("title"));
+
         Property prop = d1.getProperty("title");
         assertNotNull(prop);
         assertEquals("Yo!", prop.getValue());
@@ -166,6 +178,7 @@
         assertEquals("text/plain", cs.getMimeType());
         assertEquals("houston.txt", cs.getFilename());
         assertEquals(new URI("http://houston.example.com"), cs.getURI());
+
         byte[] bytes = SimpleContentStream.getBytes(cs.getStream());
         assertEquals(string, new String(bytes, "UTF-8"));
     }

Modified: incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrConnection.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrConnection.java?rev=773176&r1=773175&r2=773176&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrConnection.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrConnection.java Sat May  9 07:59:44 2009
@@ -58,8 +58,8 @@
 
     private static final Log log = LogFactory.getLog(JcrConnection.class);
 
-    private Session session;
-    private JcrRepository repository;
+    private final Session session;
+    private final JcrRepository repository;
 
     public JcrConnection(Session session, JcrRepository repository) {
         this.session = session;

Modified: incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrContentStream.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrContentStream.java?rev=773176&r1=773175&r2=773176&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrContentStream.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrContentStream.java Sat May  9 07:59:44 2009
@@ -31,7 +31,8 @@
 public class JcrContentStream implements ContentStream {
 
     private static final Log log = LogFactory.getLog(JcrFolder.class);
-    private Node content;
+
+    private final Node content;
 
     public JcrContentStream(Node content) {
         this.content = content;

Modified: incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrNewDocument.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrNewDocument.java?rev=773176&r1=773175&r2=773176&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrNewDocument.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrNewDocument.java Sat May  9 07:59:44 2009
@@ -39,9 +39,9 @@
 
     private static final Log log = LogFactory.getLog(JcrNewDocument.class);
 
-    private Node parent;
+    private final Node parent;
+    private final Map<String, Serializable> values = new HashMap<String, Serializable>();
     private String name;
-    private Map<String, Serializable> values = new HashMap<String, Serializable>();
     private ContentStream cs;
     private boolean saved;
 

Modified: incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrNewFolder.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrNewFolder.java?rev=773176&r1=773175&r2=773176&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrNewFolder.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrNewFolder.java Sat May  9 07:59:44 2009
@@ -39,9 +39,9 @@
 
     private static final Log log = LogFactory.getLog(JcrNewFolder.class);
 
-    private Node parent;
+    private final Node parent;
+    private final Map<String, Serializable> values = new HashMap<String, Serializable>();
     private String name;
-    private Map<String, Serializable> values = new HashMap<String, Serializable>();
     private boolean saved;
 
     public JcrNewFolder(Node parent) {

Modified: incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrProperty.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrProperty.java?rev=773176&r1=773175&r2=773176&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrProperty.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrProperty.java Sat May  9 07:59:44 2009
@@ -29,7 +29,7 @@
 
     private static final Log log = LogFactory.getLog(JcrProperty.class);
 
-    private javax.jcr.Property property;
+    private final javax.jcr.Property property;
 
     public JcrProperty(javax.jcr.Property property) {
         this.property = property;

Modified: incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrPropertyDefinition.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrPropertyDefinition.java?rev=773176&r1=773175&r2=773176&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrPropertyDefinition.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrPropertyDefinition.java Sat May  9 07:59:44 2009
@@ -27,7 +27,7 @@
 
 public class JcrPropertyDefinition implements PropertyDefinition {
 
-    private javax.jcr.nodetype.PropertyDefinition propDef;
+    private final javax.jcr.nodetype.PropertyDefinition propDef;
 
     public JcrPropertyDefinition(javax.jcr.nodetype.PropertyDefinition propDef) {
         this.propDef = propDef;

Modified: incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrRepository.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrRepository.java?rev=773176&r1=773175&r2=773176&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrRepository.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrRepository.java Sat May  9 07:59:44 2009
@@ -51,8 +51,9 @@
         RepositoryCapabilities {
 
     private static final Log log = LogFactory.getLog(JcrRepository.class);
-    private javax.jcr.Repository repository;
-    private String workspace;
+
+    private final javax.jcr.Repository repository;
+    private final String workspace;
 
     public JcrRepository(javax.jcr.Repository repository, String workspace) {
         this.repository = repository;
@@ -129,7 +130,7 @@
             SimpleCredentials creds = new SimpleCredentials("admin", "admin"
                     .toCharArray());
 
-            ArrayList<Type> result = new ArrayList<Type>();
+            List<Type> result = new ArrayList<Type>();
 
             Session session = repository.login(creds, workspace);
 

Modified: incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrType.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrType.java?rev=773176&r1=773175&r2=773176&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrType.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrType.java Sat May  9 07:59:44 2009
@@ -28,8 +28,8 @@
 
 public class JcrType implements Type {
 
-    private NodeType nodeType;
-    private BaseType baseType;
+    private final NodeType nodeType;
+    private final BaseType baseType;
 
     public JcrType(NodeType nodeType, BaseType baseType) {
         this.nodeType = nodeType;