You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2005/04/19 22:03:17 UTC

svn commit: r161959 [2/2] - in incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core: ./ fs/ lock/ nodetype/ nodetype/xml/ query/ security/ state/ state/obj/ version/ virtual/ xml/

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/InternalVersionHistory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/InternalVersionHistory.java?view=diff&r1=161958&r2=161959
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/InternalVersionHistory.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/InternalVersionHistory.java Tue Apr 19 13:03:10 2005
@@ -33,14 +33,14 @@
      *
      * @see VersionHistory#getRootVersion()
      */
-    public InternalVersion getRootVersion();
+    InternalVersion getRootVersion();
 
     /**
      * Equivalalent to {@link VersionHistory#getVersion(java.lang.String)}.
      *
      * @see VersionHistory#getVersion(java.lang.String)
      */
-    public InternalVersion getVersion(QName versionName) throws VersionException;
+    InternalVersion getVersion(QName versionName) throws VersionException;
 
     /**
      * Checks if the version with the given name exists in this version history.
@@ -49,7 +49,7 @@
      * @return <code>true</code> if the version exists;
      *         <code>false</code> otherwise.
      */
-    public boolean hasVersion(QName versionName);
+    boolean hasVersion(QName versionName);
 
     /**
      * Checks if the version for the given uuid exists in this history.
@@ -58,7 +58,7 @@
      * @return <code>true</code> if the version exists;
      *         <code>false</code> otherwise.
      */
-    public boolean hasVersion(String uuid);
+    boolean hasVersion(String uuid);
 
     /**
      * Returns the version with the given uuid or <code>null</code> if the
@@ -67,7 +67,7 @@
      * @param uuid the uuid of the version
      * @return the internal version ot <code>null</code>
      */
-    public InternalVersion getVersion(String uuid);
+    InternalVersion getVersion(String uuid);
 
     /**
      * Equivalalent to {@link VersionHistory#getVersionByLabel(java.lang.String)}
@@ -75,7 +75,7 @@
      *
      * @see VersionHistory#getVersionByLabel(java.lang.String)
      */
-    public InternalVersion getVersionByLabel(QName label);
+    InternalVersion getVersionByLabel(QName label);
 
     /**
      * Removes the indicated version from this VersionHistory. If the specified
@@ -89,7 +89,7 @@
      * @param versionName the name of the version to be removed
      * @throws RepositoryException if an error occurrs.
      */
-    public void removeVersion(QName versionName) throws RepositoryException;
+    void removeVersion(QName versionName) throws RepositoryException;
 
     /**
      * Sets the version <code>label</code> to the given <code>version</code>.
@@ -105,7 +105,7 @@
      * @return the version that was previously assigned by this label or <code>null</code>.
      * @throws VersionException
      */
-    public InternalVersion setVersionLabel(QName version, QName label, boolean move)
+    InternalVersion setVersionLabel(QName version, QName label, boolean move)
             throws VersionException;
 
     /**
@@ -114,21 +114,21 @@
      *
      * @return an iterator over {@link InternalVersion} objects.
      */
-    public Iterator getVersions();
+    Iterator getVersions();
 
     /**
      * Returns the number of versions in this version history.
      *
      * @return the number of versions, including the root version.
      */
-    public int getNumVersions();
+    int getNumVersions();
 
     /**
      * Returns the UUID of the versionable node that this history belongs to.
      *
      * @return the UUID of the versionable node.
      */
-    public String getVersionableUUID();
+    String getVersionableUUID();
 
     /**
      * Returns a string  iterator over all version labels that exist in this
@@ -136,12 +136,12 @@
      *
      * @return
      */
-    public QName[] getVersionLabels();
+    QName[] getVersionLabels();
 
     /**
      * Returns the UUID of the version labels node
      *
      * @return
      */
-    public String getVersionLabelsUUID();
+    String getVersionLabelsUUID();
 }

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/InternalVersionItem.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/InternalVersionItem.java?view=diff&r1=161958&r2=161959
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/InternalVersionItem.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/InternalVersionItem.java Tue Apr 19 13:03:10 2005
@@ -29,13 +29,13 @@
      *
      * @return
      */
-    public String getId();
+    String getId();
 
     /**
      * returns the parent version item or null
      *
      * @return
      */
-    public InternalVersionItem getParent();
+    InternalVersionItem getParent();
 
 }

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/PersistentVersionManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/PersistentVersionManager.java?view=diff&r1=161958&r2=161959
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/PersistentVersionManager.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/PersistentVersionManager.java Tue Apr 19 13:03:10 2005
@@ -38,7 +38,7 @@
      * @return the newly created version history.
      * @throws RepositoryException
      */
-    public InternalVersionHistory createVersionHistory(NodeImpl node)
+    InternalVersionHistory createVersionHistory(NodeImpl node)
             throws RepositoryException;
 
     /**
@@ -48,7 +48,7 @@
      * @return
      * @throws RepositoryException
      */
-    public InternalVersionHistory getVersionHistory(String histId)
+    InternalVersionHistory getVersionHistory(String histId)
             throws RepositoryException;
 
     /**
@@ -57,7 +57,7 @@
      * @param histId
      * @return
      */
-    public boolean hasVersionHistory(String histId);
+    boolean hasVersionHistory(String histId);
 
     /**
      * returns an iterator over the external ids of the version histories
@@ -65,7 +65,7 @@
      * @return
      * @throws RepositoryException
      */
-    public Iterator getVersionHistoryIds() throws RepositoryException;
+    Iterator getVersionHistoryIds() throws RepositoryException;
 
     /**
      * returns the number of version histories
@@ -73,7 +73,7 @@
      * @return
      * @throws RepositoryException
      */
-    public int getNumVersionHistories() throws RepositoryException;
+    int getNumVersionHistories() throws RepositoryException;
 
     /**
      * returns the internal version for the id
@@ -82,7 +82,7 @@
      * @return
      * @throws RepositoryException
      */
-    public InternalVersion getVersion(String histId, String versionId)
+    InternalVersion getVersion(String histId, String versionId)
             throws RepositoryException;
 
     /**
@@ -92,7 +92,7 @@
      * @return
      * @throws RepositoryException
      */
-    public InternalVersion getVersion(String versionId)
+    InternalVersion getVersion(String versionId)
             throws RepositoryException;
 
     /**
@@ -101,7 +101,7 @@
      * @param versionId
      * @return
      */
-    public boolean hasVersion(String versionId);
+    boolean hasVersion(String versionId);
 
     /**
      * checks, if the item with the given external id exists
@@ -109,7 +109,7 @@
      * @param id
      * @return
      */
-    public boolean hasItem(String id);
+    boolean hasItem(String id);
 
     /**
      * returns the item referred by the id
@@ -118,7 +118,7 @@
      * @return
      * @throws RepositoryException
      */
-    public InternalVersionItem getItem(String id)
+    InternalVersionItem getItem(String id)
             throws RepositoryException;
 
     /**
@@ -129,13 +129,13 @@
      * @throws RepositoryException
      * @see Node#checkin()
      */
-    public InternalVersion checkin(NodeImpl node) throws RepositoryException;
+    InternalVersion checkin(NodeImpl node) throws RepositoryException;
 
     /**
      * Return the item state manager of this version manager
      * @return item state manager
      */
-    public UpdatableItemStateManager getItemStateMgr();
+    UpdatableItemStateManager getItemStateMgr();
 
     /**
      * Returns the references that exist to this version item
@@ -143,7 +143,7 @@
      * @param item
      * @return a collection of property ids
      */
-    public List getItemReferences(InternalVersionItem item);
+    List getItemReferences(InternalVersionItem item);
 
     /**
      * Informs this version manager that the references to one of its
@@ -152,7 +152,7 @@
      * @param item the version item that is referenced
      * @param references the collection of PropertyIds that references the item
      */
-    public void setItemReferences(InternalVersionItem item, List references);
+    void setItemReferences(InternalVersionItem item, List references);
 
     /**
      * Close this persistence version manager. After having closed a persistence
@@ -160,5 +160,5 @@
      * and throw
      * @throws Exception if an error occurs
      */
-    public void close() throws Exception;
+    void close() throws Exception;
 }

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionManager.java?view=diff&r1=161958&r2=161959
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionManager.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionManager.java Tue Apr 19 13:03:10 2005
@@ -39,7 +39,7 @@
      * @param base
      * @return
      */
-    public VirtualItemStateProvider getVirtualItemStateProvider(ItemStateManager base);
+    VirtualItemStateProvider getVirtualItemStateProvider(ItemStateManager base);
 
     /**
      * Creates a new version history. This action is needed either when creating
@@ -50,7 +50,7 @@
      * @return
      * @throws RepositoryException
      */
-    public VersionHistory createVersionHistory(NodeImpl node) throws RepositoryException;
+    VersionHistory createVersionHistory(NodeImpl node) throws RepositoryException;
 
     /**
      * invokes the checkin() on the persistent version manager and remaps the
@@ -60,7 +60,7 @@
      * @return
      * @throws RepositoryException
      */
-    public Version checkin(NodeImpl node) throws RepositoryException;
+    Version checkin(NodeImpl node) throws RepositoryException;
 
     /**
      * Removes the specified version from the given version history.
@@ -68,7 +68,7 @@
      * @param versionName
      * @throws RepositoryException
      */
-    public void removeVersion(VersionHistory history, QName versionName)
+    void removeVersion(VersionHistory history, QName versionName)
             throws RepositoryException;
 
     /**
@@ -86,7 +86,7 @@
      * @return
      * @throws RepositoryException
      */
-    public Version setVersionLabel(VersionHistory history, QName version, QName label, boolean move)
+    Version setVersionLabel(VersionHistory history, QName version, QName label, boolean move)
             throws RepositoryException;
 
     //-----------------------------------------------------< internal stuff >---
@@ -97,7 +97,7 @@
      * @param id
      * @return
      */
-    public boolean hasVersionHistory(String id);
+    boolean hasVersionHistory(String id);
 
     /**
      * Returns the version history with the given id
@@ -106,7 +106,7 @@
      * @return
      * @throws RepositoryException
      */
-    public InternalVersionHistory getVersionHistory(String id) throws RepositoryException;
+    InternalVersionHistory getVersionHistory(String id) throws RepositoryException;
 
     /**
      * Returns the number of version histories
@@ -114,7 +114,7 @@
      * @return
      * @throws RepositoryException
      */
-    public int getNumVersionHistories() throws RepositoryException;
+    int getNumVersionHistories() throws RepositoryException;
 
     /**
      * Returns an iterator over all ids of {@link InternalVersionHistory}s.
@@ -122,7 +122,7 @@
      * @return
      * @throws RepositoryException
      */
-    public Iterator getVersionHistoryIds() throws RepositoryException;
+    Iterator getVersionHistoryIds() throws RepositoryException;
 
     /**
      * Checks if the version with the given id exists
@@ -148,7 +148,7 @@
      * @param id
      * @return
      */
-    public boolean hasItem(String id);
+    boolean hasItem(String id);
 
     /**
      * Returns the version item with the given id
@@ -158,7 +158,7 @@
      * @return
      * @throws RepositoryException
      */
-    public InternalVersionItem getItem(String id) throws RepositoryException;
+    InternalVersionItem getItem(String id) throws RepositoryException;
 
     /**
      * Returns the references that exist to this version item
@@ -167,7 +167,7 @@
      * @param item
      * @return a collection of property ids
      */
-    public List getItemReferences(InternalVersionItem item);
+    List getItemReferences(InternalVersionItem item);
 
     /**
      * Informs this version manager that the references to one of its
@@ -177,7 +177,7 @@
      * @param item the version item that is referenced
      * @param references the collection of PropertyIds that references the item
      */
-    public void setItemReferences(InternalVersionItem item, List references);
+    void setItemReferences(InternalVersionItem item, List references);
 
     /**
      * Close this version manager. After having closed a persistence
@@ -186,7 +186,7 @@
      *
      * @throws Exception if an error occurs
      */
-    public void close() throws Exception;
+    void close() throws Exception;
 
 
 }

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionSelector.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionSelector.java?view=diff&r1=161958&r2=161959
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionSelector.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionSelector.java Tue Apr 19 13:03:10 2005
@@ -33,5 +33,5 @@
      * @return A version or <code>null</code>.
      * @throws RepositoryException if an error occurrs.
      */
-    public Version select(VersionHistory versionHistory) throws RepositoryException;
+    Version select(VersionHistory versionHistory) throws RepositoryException;
 }

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/virtual/VirtualItemStateProvider.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/virtual/VirtualItemStateProvider.java?view=diff&r1=161958&r2=161959
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/virtual/VirtualItemStateProvider.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/virtual/VirtualItemStateProvider.java Tue Apr 19 13:03:10 2005
@@ -36,14 +36,14 @@
      * @param id
      * @return
      */
-    public boolean isVirtualRoot(ItemId id);
+    boolean isVirtualRoot(ItemId id);
 
     /**
      * Returns the id of the root node of the virtual tree.
      *
      * @return
      */
-    public NodeId getVirtualRootId();
+    NodeId getVirtualRootId();
 
     /**
      * Creats a new virtual property state
@@ -55,7 +55,7 @@
      * @return
      * @throws RepositoryException
      */
-    public VirtualPropertyState createPropertyState(VirtualNodeState parent,
+    VirtualPropertyState createPropertyState(VirtualNodeState parent,
                                                     QName name, int type,
                                                     boolean multiValued)
             throws RepositoryException;
@@ -70,7 +70,7 @@
      * @return
      * @throws RepositoryException
      */
-    public VirtualNodeState createNodeState(VirtualNodeState parent, QName name,
+    VirtualNodeState createNodeState(VirtualNodeState parent, QName name,
                                             String uuid, QName nodeTypeName)
             throws RepositoryException;
 
@@ -81,7 +81,7 @@
      * @param refs
      * @return <code>true</code> if the reference target is one of its items.
      */
-    public boolean setNodeReferences(NodeReferences refs);
+    boolean setNodeReferences(NodeReferences refs);
 
 
 }

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=161958&r2=161959
==============================================================================
--- 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:03:10 2005
@@ -31,19 +31,19 @@
  */
 public interface Importer {
 
-    public static final int IMPORT_UUID_CREATE_NEW =
+    static final int IMPORT_UUID_CREATE_NEW =
             ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW;
-    public static final int IMPORT_UUID_COLLISION_REMOVE_EXISTING =
+    static final int IMPORT_UUID_COLLISION_REMOVE_EXISTING =
             ImportUUIDBehavior.IMPORT_UUID_COLLISION_REMOVE_EXISTING;
-    public static final int IMPORT_UUID_COLLISION_REPLACE_EXISTING =
+    static final int IMPORT_UUID_COLLISION_REPLACE_EXISTING =
             ImportUUIDBehavior.IMPORT_UUID_COLLISION_REPLACE_EXISTING;
-    public static final int IMPORT_UUID_COLLISION_THROW =
+    static final int IMPORT_UUID_COLLISION_THROW =
             ImportUUIDBehavior.IMPORT_UUID_COLLISION_THROW;
 
     /**
      * @throws RepositoryException
      */
-    public void start() throws RepositoryException;
+    void start() throws RepositoryException;
 
     /**
      * @param nodeInfo
@@ -51,22 +51,22 @@
      * @param nsContext prefix mappings of current context
      * @throws RepositoryException
      */
-    public void startNode(NodeInfo nodeInfo, List propInfos,
+    void startNode(NodeInfo nodeInfo, List propInfos,
                           NamespaceResolver nsContext) throws RepositoryException;
 
     /**
      * @param nodeInfo
      * @throws RepositoryException
      */
-    public void endNode(NodeInfo nodeInfo) throws RepositoryException;
+    void endNode(NodeInfo nodeInfo) throws RepositoryException;
 
     /**
      * @throws RepositoryException
      */
-    public void end() throws RepositoryException;
+    void end() throws RepositoryException;
 
     //--------------------------------------------------------< inner classes >
-    public static class NodeInfo {
+    static class NodeInfo {
         private QName name;
         private QName nodeTypeName;
         private QName[] mixinNames;
@@ -116,7 +116,7 @@
         }
     }
 
-    public static class PropInfo {
+    static class PropInfo {
         private QName name;
         private int type;
         private TextValue[] values;
@@ -159,7 +159,7 @@
      * <code>TextValue</code> represents a serialized property value read
      * from a System or Document View XML document.
      */
-    public interface TextValue {
+    interface TextValue {
         /**
          * Returns the length of the serialized value.
          *