jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r161972 - in incubator/jackrabbit/trunk: ./ src/java/org/apache/jackrabbit/core/ src/java/org/apache/jackrabbit/core/fs/ src/java/org/apache/jackrabbit/core/lock/ src/java/org/apache/jackrabbit/core/nodetype/ src/java/org/apache/jackrabbit/core/nodetype/xml/ src/java/org/apache/jackrabbit/core/security/ src/java/org/apache/jackrabbit/core/xml/
Date Tue, 19 Apr 2005 20:48:24 GMT
Author: jukka
Date: Tue Apr 19 13:48:22 2005
New Revision: 161972

URL: http://svn.apache.org/viewcvs?view=rev&rev=161972
Log:
JCR-97: Improved Checkstyle conformance by removing unnecessary "static" and "final" keywords
from interface declarations and by suppressing the checking of generated Java files.

Modified:
    incubator/jackrabbit/trunk/checkstyle-suppressions.xml
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Constants.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/FileSystem.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/lock/PathMap.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/ItemDef.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/xml/Constants.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/security/AccessManager.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/ImportHandler.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/Importer.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/TargetImportHandler.java

Modified: incubator/jackrabbit/trunk/checkstyle-suppressions.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/checkstyle-suppressions.xml?view=diff&r1=161971&r2=161972
==============================================================================
--- incubator/jackrabbit/trunk/checkstyle-suppressions.xml (original)
+++ incubator/jackrabbit/trunk/checkstyle-suppressions.xml Tue Apr 19 13:48:22 2005
@@ -8,6 +8,7 @@
     <!-- 
       Suppressions for generated JCRQL parser
     -->
-    <suppress checks=".*"
-              files=".*JCRQLParser.*|Token.java|SimpleCharStream.java|TokenMgrError.java|ParseException.java|SimpleNode.java"
/>
-</suppressions>
\ No newline at end of file
+    <suppress checks=".*" files="(JJT)?JCRSQL.*.java"/>
+    <!-- Suppressions for the generated XPath parser -->
+    <suppress checks=".*" files="(JJT)?XPath.*.java"/>
+</suppressions>

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Constants.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Constants.java?view=diff&r1=161971&r2=161972
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Constants.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Constants.java Tue Apr
19 13:48:22 2005
@@ -24,376 +24,376 @@
 
     //------------------------------------------< namespace related constants >
     // default namespace (empty uri)
-    static final String NS_EMPTY_PREFIX = "";
-    static final String NS_DEFAULT_URI = "";
+    String NS_EMPTY_PREFIX = "";
+    String NS_DEFAULT_URI = "";
 
     // reserved namespace for repository internal node types
-    static final String NS_REP_PREFIX = "rep";
-    static final String NS_REP_URI = "internal";
+    String NS_REP_PREFIX = "rep";
+    String NS_REP_URI = "internal";
 
     // reserved namespace for items defined by built-in node types
-    static final String NS_JCR_PREFIX = "jcr";
-    static final String NS_JCR_URI = "http://www.jcp.org/jcr/1.0";
+    String NS_JCR_PREFIX = "jcr";
+    String NS_JCR_URI = "http://www.jcp.org/jcr/1.0";
 
     // reserved namespace for built-in primary node types
-    static final String NS_NT_PREFIX = "nt";
-    static final String NS_NT_URI = "http://www.jcp.org/jcr/nt/1.0";
+    String NS_NT_PREFIX = "nt";
+    String NS_NT_URI = "http://www.jcp.org/jcr/nt/1.0";
 
     // reserved namespace for built-in mixin node types
-    static final String NS_MIX_PREFIX = "mix";
-    static final String NS_MIX_URI = "http://www.jcp.org/jcr/mix/1.0";
+    String NS_MIX_PREFIX = "mix";
+    String NS_MIX_URI = "http://www.jcp.org/jcr/mix/1.0";
 
     // reserved namespace used in the system view XML serialization format
-    static final String NS_SV_PREFIX = "sv";
-    static final String NS_SV_URI = "http://www.jcp.org/jcr/sv/1.0";
+    String NS_SV_PREFIX = "sv";
+    String NS_SV_URI = "http://www.jcp.org/jcr/sv/1.0";
 
     // reserved namespaces that must not be redefined and should not be used
-    static final String NS_XML_PREFIX = "xml";
-    static final String NS_XML_URI = "http://www.w3.org/XML/1998/namespace";
-    static final String NS_XMLNS_PREFIX = "xmlns";
-    static final String NS_XMLNS_URI = "http://www.w3.org/2000/xmlns/";
+    String NS_XML_PREFIX = "xml";
+    String NS_XML_URI = "http://www.w3.org/XML/1998/namespace";
+    String NS_XMLNS_PREFIX = "xmlns";
+    String NS_XMLNS_URI = "http://www.w3.org/2000/xmlns/";
 
     //----------------------------------------< general item name constants >---
 
     /**
      * jcr:system
      */
-    static final QName JCR_SYSTEM = new QName(NS_JCR_URI, "system");
+    QName JCR_SYSTEM = new QName(NS_JCR_URI, "system");
 
     /**
      * jcr:nodeTypes
      */
-    static final QName JCR_NODETYPES = new QName(NS_JCR_URI, "nodeTypes");
+    QName JCR_NODETYPES = new QName(NS_JCR_URI, "nodeTypes");
 
     /**
      * jcr:uuid
      */
-    static final QName JCR_UUID = new QName(NS_JCR_URI, "uuid");
+    QName JCR_UUID = new QName(NS_JCR_URI, "uuid");
 
     /**
      * jcr:primaryType
      */
-    static final QName JCR_PRIMARYTYPE = new QName(NS_JCR_URI, "primaryType");
+    QName JCR_PRIMARYTYPE = new QName(NS_JCR_URI, "primaryType");
 
     /**
      * jcr:mixinTypes
      */
-    static final QName JCR_MIXINTYPES = new QName(NS_JCR_URI, "mixinTypes");
+    QName JCR_MIXINTYPES = new QName(NS_JCR_URI, "mixinTypes");
 
     /**
      * jcr:created
      */
-    static final QName JCR_CREATED = new QName(NS_JCR_URI, "created");
+    QName JCR_CREATED = new QName(NS_JCR_URI, "created");
 
     /**
      * jcr:lastModified
      */
-    static final QName JCR_LASTMODIFIED = new QName(NS_JCR_URI, "lastModified");
+    QName JCR_LASTMODIFIED = new QName(NS_JCR_URI, "lastModified");
 
     //------------------------------------< xml related item name constants >---
 
     /**
      * jcr:root (dummy name for root node used in XML serialization)
      */
-    static final QName JCR_ROOT = new QName(NS_JCR_URI, "root");
+    QName JCR_ROOT = new QName(NS_JCR_URI, "root");
 
     /**
      * jcr:xmltext
      */
-    static final QName JCR_XMLTEXT = new QName(NS_JCR_URI, "xmltext");
+    QName JCR_XMLTEXT = new QName(NS_JCR_URI, "xmltext");
 
     /**
      * jcr:xmlcharacters
      */
-    static final QName JCR_XMLCHARACTERS = new QName(NS_JCR_URI, "xmlcharacters");
+    QName JCR_XMLCHARACTERS = new QName(NS_JCR_URI, "xmlcharacters");
 
     //----------------------------------------< locking item name constants >---
 
     /**
      * jcr:lockOwner
      */
-    static final QName JCR_LOCKOWNER = new QName(NS_JCR_URI, "lockOwner");
+    QName JCR_LOCKOWNER = new QName(NS_JCR_URI, "lockOwner");
 
     /**
      * jcr:lockIsDeep
      */
-    static final QName JCR_LOCKISDEEP = new QName(NS_JCR_URI, "lockIsDeep");
+    QName JCR_LOCKISDEEP = new QName(NS_JCR_URI, "lockIsDeep");
 
     //-------------------------------------< versioning item name constants >---
 
     /**
      * jcr:versionStorage
      */
-    static final QName JCR_VERSIONSTORAGE = new QName(NS_JCR_URI, "versionStorage");
+    QName JCR_VERSIONSTORAGE = new QName(NS_JCR_URI, "versionStorage");
 
     /**
      * jcr:mergeFailed
      */
-    static final QName JCR_MERGEFAILED = new QName(NS_JCR_URI, "mergeFailed");
+    QName JCR_MERGEFAILED = new QName(NS_JCR_URI, "mergeFailed");
 
     /**
      * jcr:frozenNode
      */
-    static final QName JCR_FROZENNODE = new QName(NS_JCR_URI, "frozenNode");
+    QName JCR_FROZENNODE = new QName(NS_JCR_URI, "frozenNode");
 
     /**
      * jcr:frozenUuid
      */
-    static final QName JCR_FROZENUUID = new QName(NS_JCR_URI, "frozenUuid");
+    QName JCR_FROZENUUID = new QName(NS_JCR_URI, "frozenUuid");
 
     /**
      * jcr:frozenPrimaryType
      */
-    static final QName JCR_FROZENPRIMARYTYPE = new QName(NS_JCR_URI, "frozenPrimaryType");
+    QName JCR_FROZENPRIMARYTYPE = new QName(NS_JCR_URI, "frozenPrimaryType");
 
     /**
      * jcr:frozenMixinTypes
      */
-    static final QName JCR_FROZENMIXINTYPES = new QName(NS_JCR_URI, "frozenMixinTypes");
+    QName JCR_FROZENMIXINTYPES = new QName(NS_JCR_URI, "frozenMixinTypes");
 
     /**
      * jcr:predecessors
      */
-    static final QName JCR_PREDECESSORS = new QName(NS_JCR_URI, "predecessors");
+    QName JCR_PREDECESSORS = new QName(NS_JCR_URI, "predecessors");
 
     /**
      * jcr:versionLabels
      */
-    static final QName JCR_VERSIONLABELS = new QName(NS_JCR_URI, "versionLabels");
+    QName JCR_VERSIONLABELS = new QName(NS_JCR_URI, "versionLabels");
 
     /**
      * jcr:successors
      */
-    static final QName JCR_SUCCESSORS = new QName(NS_JCR_URI, "successors");
+    QName JCR_SUCCESSORS = new QName(NS_JCR_URI, "successors");
 
     /**
      * jcr:isCheckedOut
      */
-    static final QName JCR_ISCHECKEDOUT = new QName(NS_JCR_URI, "isCheckedOut");
+    QName JCR_ISCHECKEDOUT = new QName(NS_JCR_URI, "isCheckedOut");
 
     /**
      * jcr:versionHistory
      */
-    static final QName JCR_VERSIONHISTORY = new QName(NS_JCR_URI, "versionHistory");
+    QName JCR_VERSIONHISTORY = new QName(NS_JCR_URI, "versionHistory");
 
     /**
      * jcr:baseVersion
      */
-    static final QName JCR_BASEVERSION = new QName(NS_JCR_URI, "baseVersion");
+    QName JCR_BASEVERSION = new QName(NS_JCR_URI, "baseVersion");
 
     /**
      * jcr:child
      */
-    static final QName JCR_CHILD = new QName(NS_JCR_URI, "child");
+    QName JCR_CHILD = new QName(NS_JCR_URI, "child");
 
     /**
      * jcr:rootVersion
      */
-    static final QName JCR_ROOTVERSION = new QName(NS_JCR_URI, "rootVersion");
+    QName JCR_ROOTVERSION = new QName(NS_JCR_URI, "rootVersion");
 
     /**
      * jcr:versionableUuid
      */
-    static final QName JCR_VERSIONABLEUUID = new QName(NS_JCR_URI, "versionableUuid");
+    QName JCR_VERSIONABLEUUID = new QName(NS_JCR_URI, "versionableUuid");
 
     //--------------------------------------< node type item name constants >---
 
     /**
      * jcr:nodeTypeName
      */
-    static final QName JCR_NODETYPENAME = new QName(NS_JCR_URI, "nodeTypeName");
+    QName JCR_NODETYPENAME = new QName(NS_JCR_URI, "nodeTypeName");
 
     /**
      * jcr:hasOrderableChildNodes
      */
-    static final QName JCR_HASORDERABLECHILDNODES = new QName(NS_JCR_URI, "hasOrderableChildNodes");
+    QName JCR_HASORDERABLECHILDNODES = new QName(NS_JCR_URI, "hasOrderableChildNodes");
 
     /**
      * jcr:isMixin
      */
-    static final QName JCR_ISMIXIN = new QName(NS_JCR_URI, "isMixin");
+    QName JCR_ISMIXIN = new QName(NS_JCR_URI, "isMixin");
 
     /**
      * jcr:supertypes
      */
-    static final QName JCR_SUPERTYPES = new QName(NS_JCR_URI, "supertypes");
+    QName JCR_SUPERTYPES = new QName(NS_JCR_URI, "supertypes");
 
     /**
      * jcr:propertyDefinition
      */
-    static final QName JCR_PROPERTYDEFINITION = new QName(NS_JCR_URI, "propertyDefinition");
+    QName JCR_PROPERTYDEFINITION = new QName(NS_JCR_URI, "propertyDefinition");
 
     /**
      * jcr:name
      */
-    static final QName JCR_NAME = new QName(NS_JCR_URI, "name");
+    QName JCR_NAME = new QName(NS_JCR_URI, "name");
 
     /**
      * jcr:mandatory
      */
-    static final QName JCR_MANDATORY = new QName(NS_JCR_URI, "mandatory");
+    QName JCR_MANDATORY = new QName(NS_JCR_URI, "mandatory");
 
     /**
      * jcr:protected
      */
-    static final QName JCR_PROTECTED = new QName(NS_JCR_URI, "protected");
+    QName JCR_PROTECTED = new QName(NS_JCR_URI, "protected");
 
     /**
      * jcr:requiredType
      */
-    static final QName JCR_REQUIREDTYPE = new QName(NS_JCR_URI, "requiredType");
+    QName JCR_REQUIREDTYPE = new QName(NS_JCR_URI, "requiredType");
 
     /**
      * jcr:onParentVersion
      */
-    static final QName JCR_ONPARENTVERSION = new QName(NS_JCR_URI, "onParentVersion");
+    QName JCR_ONPARENTVERSION = new QName(NS_JCR_URI, "onParentVersion");
 
     /**
      * jcr:primaryItemName
      */
-    static final QName JCR_PRIMARYITEMNAME = new QName(NS_JCR_URI, "primaryItemName");
+    QName JCR_PRIMARYITEMNAME = new QName(NS_JCR_URI, "primaryItemName");
 
     /**
      * jcr:multiple
      */
-    static final QName JCR_MULTIPLE = new QName(NS_JCR_URI, "multiple");
+    QName JCR_MULTIPLE = new QName(NS_JCR_URI, "multiple");
 
     /**
      * jcr:valueConstraints
      */
-    static final QName JCR_VALUECONSTRAINTS = new QName(NS_JCR_URI, "valueConstraints");
+    QName JCR_VALUECONSTRAINTS = new QName(NS_JCR_URI, "valueConstraints");
 
     /**
      * jcr:defaultValues
      */
-    static final QName JCR_DEFAULTVALUES = new QName(NS_JCR_URI, "defaultValues");
+    QName JCR_DEFAULTVALUES = new QName(NS_JCR_URI, "defaultValues");
 
     /**
      * jcr:autoCreated
      */
-    static final QName JCR_AUTOCREATED = new QName(NS_JCR_URI, "autoCreated");
+    QName JCR_AUTOCREATED = new QName(NS_JCR_URI, "autoCreated");
 
     /**
      * jcr:childNodeDefinition
      */
-    static final QName JCR_CHILDNODEDEFINITION = new QName(NS_JCR_URI, "childNodeDefinition");
+    QName JCR_CHILDNODEDEFINITION = new QName(NS_JCR_URI, "childNodeDefinition");
 
     /**
      * jcr:sameNameSiblings
      */
-    static final QName JCR_SAMENAMESIBLINGS = new QName(NS_JCR_URI, "sameNameSiblings");
+    QName JCR_SAMENAMESIBLINGS = new QName(NS_JCR_URI, "sameNameSiblings");
 
     /**
      * jcr:defaultPrimaryType
      */
-    static final QName JCR_DEFAULTPRIMARYTYPE = new QName(NS_JCR_URI, "defaultPrimaryType");
+    QName JCR_DEFAULTPRIMARYTYPE = new QName(NS_JCR_URI, "defaultPrimaryType");
 
     /**
      * jcr:requiredPrimaryTypes
      */
-    static final QName JCR_REQUIREDPRIMARYTYPES = new QName(NS_JCR_URI, "requiredPrimaryTypes");
+    QName JCR_REQUIREDPRIMARYTYPES = new QName(NS_JCR_URI, "requiredPrimaryTypes");
 
     //-------------------------------------------< node type name constants >---
 
     /**
      * rep:root
      */
-    static final QName REP_ROOT = new QName(NS_REP_URI, "root");
+    QName REP_ROOT = new QName(NS_REP_URI, "root");
 
     /**
      * rep:system
      */
-    static final QName REP_SYSTEM = new QName(NS_REP_URI, "system");
+    QName REP_SYSTEM = new QName(NS_REP_URI, "system");
 
     /**
      * rep:versionStorage
      */
-    static final QName REP_VERSIONSTORAGE = new QName(NS_REP_URI, "versionStorage");
+    QName REP_VERSIONSTORAGE = new QName(NS_REP_URI, "versionStorage");
 
     /**
      * rep:versionStorage
      */
-    static final QName REP_NODETYPES = new QName(NS_REP_URI, "nodeTypes");
+    QName REP_NODETYPES = new QName(NS_REP_URI, "nodeTypes");
 
     /**
      * nt:unstructured
      */
-    static final QName NT_UNSTRUCTURED = new QName(NS_NT_URI, "unstructured");
+    QName NT_UNSTRUCTURED = new QName(NS_NT_URI, "unstructured");
 
     /**
      * nt:base
      */
-    static final QName NT_BASE = new QName(NS_NT_URI, "base");
+    QName NT_BASE = new QName(NS_NT_URI, "base");
 
     /**
      * nt:hierarchyNode
      */
-    static final QName NT_HIERARCHYNODE = new QName(NS_NT_URI, "hierarchyNode");
+    QName NT_HIERARCHYNODE = new QName(NS_NT_URI, "hierarchyNode");
 
     /**
      * nt:resource
      */
-    static final QName NT_RESOURCE = new QName(NS_NT_URI, "resource");
+    QName NT_RESOURCE = new QName(NS_NT_URI, "resource");
 
     /**
      * nt:query
      */
-    static final QName NT_QUERY = new QName(NS_NT_URI, "query");
+    QName NT_QUERY = new QName(NS_NT_URI, "query");
 
     /**
      * mix:referenceable
      */
-    static final QName MIX_REFERENCEABLE = new QName(NS_MIX_URI, "referenceable");
+    QName MIX_REFERENCEABLE = new QName(NS_MIX_URI, "referenceable");
 
     /**
      * mix:referenceable
      */
-    static final QName MIX_LOCKABLE = new QName(NS_MIX_URI, "lockable");
+    QName MIX_LOCKABLE = new QName(NS_MIX_URI, "lockable");
 
     /**
      * mix:versionable
      */
-    static final QName MIX_VERSIONABLE = new QName(NS_MIX_URI, "versionable");
+    QName MIX_VERSIONABLE = new QName(NS_MIX_URI, "versionable");
 
     /**
      * nt:versionHistory
      */
-    static final QName NT_VERSIONHISTORY = new QName(NS_NT_URI, "versionHistory");
+    QName NT_VERSIONHISTORY = new QName(NS_NT_URI, "versionHistory");
 
     /**
      * nt:version
      */
-    static final QName NT_VERSION = new QName(NS_NT_URI, "version");
+    QName NT_VERSION = new QName(NS_NT_URI, "version");
 
     /**
      * nt:versionLabels
      */
-    static final QName NT_VERSIONLABELS = new QName(NS_NT_URI, "versionLabels");
+    QName NT_VERSIONLABELS = new QName(NS_NT_URI, "versionLabels");
 
     /**
      * nt:versionedChild
      */
-    static final QName NT_VERSIONEDCHILD = new QName(NS_NT_URI, "versionedChild");
+    QName NT_VERSIONEDCHILD = new QName(NS_NT_URI, "versionedChild");
 
     /**
      * nt:frozenNode
      */
-    static final QName NT_FROZENNODE = new QName(NS_NT_URI, "frozenNode");
+    QName NT_FROZENNODE = new QName(NS_NT_URI, "frozenNode");
 
     /**
      * nt:nodeType
      */
-    static final QName NT_NODETYPE = new QName(NS_NT_URI, "nodeType");
+    QName NT_NODETYPE = new QName(NS_NT_URI, "nodeType");
 
     /**
      * nt:propertyDefinition
      */
-    static final QName NT_PROPERTYDEFINITION = new QName(NS_NT_URI, "propertyDefinition");
+    QName NT_PROPERTYDEFINITION = new QName(NS_NT_URI, "propertyDefinition");
 
     /**
      * nt:childNodeDefinition
      */
-    static final QName NT_CHILDNODEDEFINITION = new QName(NS_NT_URI, "childNodeDefinition");
+    QName NT_CHILDNODEDEFINITION = new QName(NS_NT_URI, "childNodeDefinition");
 
     //-------------------------------------------< security related constants >
     /**
@@ -403,6 +403,6 @@
      *
      * @see javax.jcr.Session#impersonate(javax.jcr.Credentials)
      */
-    static final String IMPERSONATOR_ATTRIBUTE =
+    String IMPERSONATOR_ATTRIBUTE =
             "org.apache.jackrabbit.core.security.impersonator";
 }

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/FileSystem.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/FileSystem.java?view=diff&r1=161971&r2=161972
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/FileSystem.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/FileSystem.java Tue
Apr 19 13:48:22 2005
@@ -33,12 +33,12 @@
     /**
      * File separator
      */
-    static final String SEPARATOR = "/";
+    String SEPARATOR = "/";
 
     /**
      * File separator character
      */
-    static final char SEPARATOR_CHAR = '/';
+    char SEPARATOR_CHAR = '/';
 
     /**
      * Initialize the file system

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/lock/PathMap.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/lock/PathMap.java?view=diff&r1=161971&r2=161972
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/lock/PathMap.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/lock/PathMap.java Tue Apr
19 13:48:22 2005
@@ -352,6 +352,6 @@
          * Invoked for every child visited on a tree traversal
          * @param child child visited
          */
-        public void childVisited(Child child);
+        void childVisited(Child child);
     }
 }

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/ItemDef.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/ItemDef.java?view=diff&r1=161971&r2=161972
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/ItemDef.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/ItemDef.java Tue
Apr 19 13:48:22 2005
@@ -27,7 +27,7 @@
     /**
      * '*' denoting residual child item definition
      */
-    static final QName ANY_NAME = new QName(Constants.NS_DEFAULT_URI, "*");
+    QName ANY_NAME = new QName(Constants.NS_DEFAULT_URI, "*");
 
     /**
      * Returns the name of this item def.

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/xml/Constants.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/xml/Constants.java?view=diff&r1=161971&r2=161972
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/xml/Constants.java
(original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/xml/Constants.java
Tue Apr 19 13:48:22 2005
@@ -22,79 +22,75 @@
 public interface Constants {
 
     /** Name of the node type definition root element. */
-    static final String NODETYPES_ELEMENT = "nodeTypes";
+    String NODETYPES_ELEMENT = "nodeTypes";
 
     /** Name of the node type definition element. */
-    static final String NODETYPE_ELEMENT = "nodeType";
+    String NODETYPE_ELEMENT = "nodeType";
 
     /** Name of the child node definition element. */
-    static final String CHILDNODEDEFINITION_ELEMENT = "childNodeDefinition";
+    String CHILDNODEDEFINITION_ELEMENT = "childNodeDefinition";
 
     /** Name of the property definition element. */
-    static final String PROPERTYDEFINITION_ELEMENT = "propertyDefinition";
+    String PROPERTYDEFINITION_ELEMENT = "propertyDefinition";
 
     /** Name of the <code>isMixin</code> attribute. */
-    static final String ISMIXIN_ATTRIBUTE = "isMixin";
+    String ISMIXIN_ATTRIBUTE = "isMixin";
 
     /** Name of the <code>hasOrderableChildNodes</code> attribute. */
-    static final String HASORDERABLECHILDNODES_ATTRIBUTE =
-        "hasOrderableChildNodes";
+    String HASORDERABLECHILDNODES_ATTRIBUTE = "hasOrderableChildNodes";
 
     /** Name of the primary item name attribute. */
-    static final String PRIMARYITEMNAME_ATTRIBUTE = "primaryItemName";
+    String PRIMARYITEMNAME_ATTRIBUTE = "primaryItemName";
 
     /** Name of the supertypes element. */
-    static final String SUPERTYPES_ELEMENT = "supertypes";
+    String SUPERTYPES_ELEMENT = "supertypes";
 
     /** Name of the supertype element. */
-    static final String SUPERTYPE_ELEMENT = "supertype";
+    String SUPERTYPE_ELEMENT = "supertype";
 
     /** Name of the <code>name</code> attribute. */
-    static final String NAME_ATTRIBUTE = "name";
+    String NAME_ATTRIBUTE = "name";
 
     /** Name of the <code>autoCreated</code> attribute. */
-    static final String AUTOCREATED_ATTRIBUTE = "autoCreated";
+    String AUTOCREATED_ATTRIBUTE = "autoCreated";
 
     /** Name of the <code>mandatory</code> attribute. */
-    static final String MANDATORY_ATTRIBUTE = "mandatory";
+    String MANDATORY_ATTRIBUTE = "mandatory";
 
     /** Name of the <code>onParentVersion</code> attribute. */
-    static final String ONPARENTVERSION_ATTRIBUTE = "onParentVersion";
+    String ONPARENTVERSION_ATTRIBUTE = "onParentVersion";
 
     /** Name of the <code>protected</code> attribute. */
-    static final String PROTECTED_ATTRIBUTE = "protected";
+    String PROTECTED_ATTRIBUTE = "protected";
 
     /** Name of the required type attribute. */
-    static final String REQUIREDTYPE_ATTRIBUTE = "requiredType";
+    String REQUIREDTYPE_ATTRIBUTE = "requiredType";
 
     /** Name of the value constraints element. */
-    static final String VALUECONSTRAINTS_ELEMENT = "valueConstraints";
+    String VALUECONSTRAINTS_ELEMENT = "valueConstraints";
 
     /** Name of the value constraint element. */
-    static final String VALUECONSTRAINT_ELEMENT = "valueConstraint";
+    String VALUECONSTRAINT_ELEMENT = "valueConstraint";
 
     /** Name of the default values element. */
-    static final String DEFAULTVALUES_ELEMENT = "defaultValues";
+    String DEFAULTVALUES_ELEMENT = "defaultValues";
 
     /** Name of the default value element. */
-    static final String DEFAULTVALUE_ELEMENT = "defaultValue";
+    String DEFAULTVALUE_ELEMENT = "defaultValue";
 
     /** Name of the <code>multiple</code> attribute. */
-    static final String MULTIPLE_ATTRIBUTE = "multiple";
+    String MULTIPLE_ATTRIBUTE = "multiple";
 
     /** Name of the required primary types element. */
-    static final String REQUIREDPRIMARYTYPES_ELEMENT =
-        "requiredPrimaryTypes";
+    String REQUIREDPRIMARYTYPES_ELEMENT = "requiredPrimaryTypes";
 
     /** Name of the required primary type element. */
-    static final String REQUIREDPRIMARYTYPE_ELEMENT =
-        "requiredPrimaryType";
+    String REQUIREDPRIMARYTYPE_ELEMENT = "requiredPrimaryType";
 
     /** Name of the default primary type attribute. */
-    static final String DEFAULTPRIMARYTYPE_ATTRIBUTE =
-        "defaultPrimaryType";
+    String DEFAULTPRIMARYTYPE_ATTRIBUTE = "defaultPrimaryType";
 
     /** Name of the <code>sameNameSiblings</code> attribute. */
-    static final String SAMENAMESIBLINGS_ATTRIBUTE = "sameNameSiblings";
+    String SAMENAMESIBLINGS_ATTRIBUTE = "sameNameSiblings";
 
 }

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/security/AccessManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/security/AccessManager.java?view=diff&r1=161971&r2=161972
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/security/AccessManager.java
(original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/security/AccessManager.java
Tue Apr 19 13:48:22 2005
@@ -32,15 +32,17 @@
     /**
      * READ permission constant
      */
-    static final int READ = 1;
+    int READ = 1;
+
     /**
      * WRITE permission constant
      */
-    static final int WRITE = 2;
+    int WRITE = 2;
+
     /**
      * REMOVE permission constant
      */
-    static final int REMOVE = 4;
+    int REMOVE = 4;
 
     /**
      * Initialize this access manager. An <code>AccessDeniedException</code>
will

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/ImportHandler.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/ImportHandler.java?view=diff&r1=161971&r2=161972
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/ImportHandler.java
(original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/ImportHandler.java
Tue Apr 19 13:48:22 2005
@@ -1,7 +1,7 @@
 /*
  * Copyright 2004-2005 The Apache Software Foundation or its licensors,
  *                     as applicable.
-  *
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/Importer.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/Importer.java?view=diff&r1=161971&r2=161972
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/Importer.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/Importer.java Tue Apr
19 13:48:22 2005
@@ -1,7 +1,7 @@
 /*
  * Copyright 2004-2005 The Apache Software Foundation or its licensors,
  *                     as applicable.
-  *
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -20,7 +20,6 @@
 import org.apache.jackrabbit.core.QName;
 
 import javax.jcr.RepositoryException;
-import javax.jcr.Workspace;
 import javax.jcr.ImportUUIDBehavior;
 import java.io.IOException;
 import java.io.Reader;
@@ -31,13 +30,13 @@
  */
 public interface Importer {
 
-    static final int IMPORT_UUID_CREATE_NEW =
+    int IMPORT_UUID_CREATE_NEW =
             ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW;
-    static final int IMPORT_UUID_COLLISION_REMOVE_EXISTING =
+    int IMPORT_UUID_COLLISION_REMOVE_EXISTING =
             ImportUUIDBehavior.IMPORT_UUID_COLLISION_REMOVE_EXISTING;
-    static final int IMPORT_UUID_COLLISION_REPLACE_EXISTING =
+    int IMPORT_UUID_COLLISION_REPLACE_EXISTING =
             ImportUUIDBehavior.IMPORT_UUID_COLLISION_REPLACE_EXISTING;
-    static final int IMPORT_UUID_COLLISION_THROW =
+    int IMPORT_UUID_COLLISION_THROW =
             ImportUUIDBehavior.IMPORT_UUID_COLLISION_THROW;
 
     /**
@@ -166,7 +165,7 @@
          * @return the length of the serialized value
          * @throws IOException if an I/O error occurs
          */
-        public long length() throws IOException;
+        long length() throws IOException;
 
         /**
          * Retrieves the serialized value.
@@ -174,7 +173,7 @@
          * @return the serialized value
          * @throws IOException if an I/O error occurs
          */
-        public String retrieve() throws IOException;
+        String retrieve() throws IOException;
 
         /**
          * Returns a <code>Reader</code> for reading the serialized value.
@@ -182,6 +181,6 @@
          * @return a <code>Reader</code> for reading the serialized value.
          * @throws IOException if an I/O error occurs
          */
-        public Reader reader() throws IOException;
+        Reader reader() throws IOException;
     }
 }

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/TargetImportHandler.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/TargetImportHandler.java?view=diff&r1=161971&r2=161972
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/TargetImportHandler.java
(original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/TargetImportHandler.java
Tue Apr 19 13:48:22 2005
@@ -83,7 +83,7 @@
          * @param length the number of characters to append
          * @throws IOException if an I/O error occurs
          */
-        public void append(char[] chars, int start, int length)
+        void append(char[] chars, int start, int length)
                 throws IOException;
 
         /**
@@ -92,7 +92,7 @@
          *
          * @throws IOException if an I/O error occurs
          */
-        public void close() throws IOException;
+        void close() throws IOException;
 
         /**
          * Dispose this value, i.e. free all bound resources. Once a value has
@@ -101,7 +101,7 @@
          *
          * @throws IOException if an I/O error occurs
          */
-        public void dispose() throws IOException;
+        void dispose() throws IOException;
     }
 
     /**



Mime
View raw message