You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by md...@apache.org on 2011/09/02 18:58:52 UTC
svn commit: r1164631 [1/2] - in /jackrabbit/sandbox/jackrabbit-mk:
jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/
jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/
jackrabbit-spi-commons/src/main/java/org/apa...
Author: mduerig
Date: Fri Sep 2 16:58:50 2011
New Revision: 1164631
URL: http://svn.apache.org/viewvc?rev=1164631&view=rev
Log:
Microkernel based Jackrabbit prototype (WIP)
clean up
Modified:
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/GenericRepositoryFactory.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/FilterIterator.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/flat/SizedIterator.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/lock/
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/namespace/AbstractNamespaceResolver.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/namespace/NamespaceListener.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql2/
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Batch.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/ChildInfo.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Event.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/EventBundle.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/EventFilter.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/IdFactory.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/ItemId.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/ItemInfo.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/ItemInfoCache.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/LockInfo.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Name.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/NameFactory.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/NodeInfo.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Path.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PathFactory.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PrivilegeDefinition.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PropertyId.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PropertyInfo.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QItemDefinition.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QNodeDefinition.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QNodeTypeDefinition.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QPropertyDefinition.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QValue.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QValueConstraint.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QValueFactory.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QueryInfo.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QueryResultRow.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/RepositoryServiceFactory.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/SessionInfo.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/XASessionInfo.java
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Batch.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Batch.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Batch.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Batch.java Fri Sep 2 16:58:50 2011
@@ -99,7 +99,7 @@ public interface Batch {
* @see javax.jcr.Session#importXML(String, java.io.InputStream, int)
* @see javax.jcr.query.Query#storeAsNode(String)
*/
- public void addNode(NodeId parentId, Name nodeName, Name nodetypeName, String uuid) throws RepositoryException;
+ void addNode(NodeId parentId, Name nodeName, Name nodetypeName, String uuid) throws RepositoryException;
/**
* Add a new property to the persistent layer.
@@ -130,7 +130,9 @@ public interface Batch {
* @see javax.jcr.Session#importXML(String, java.io.InputStream, int)
* @see javax.jcr.query.Query#storeAsNode(String)
*/
- public void addProperty(NodeId parentId, Name propertyName, QValue value) throws ValueFormatException, VersionException, LockException, ConstraintViolationException, PathNotFoundException, ItemExistsException, AccessDeniedException, UnsupportedRepositoryOperationException, RepositoryException;
+ void addProperty(NodeId parentId, Name propertyName, QValue value) throws ValueFormatException, VersionException,
+ LockException, ConstraintViolationException, PathNotFoundException, ItemExistsException, AccessDeniedException,
+ UnsupportedRepositoryOperationException, RepositoryException;
/**
* Add a new multi-valued property to the persistent layer.
@@ -155,7 +157,9 @@ public interface Batch {
* @see javax.jcr.Node#setProperty(String, String[], int)
* @see javax.jcr.Session#importXML(String, java.io.InputStream, int)
*/
- public void addProperty(NodeId parentId, Name propertyName, QValue[] values) throws ValueFormatException, VersionException, LockException, ConstraintViolationException, PathNotFoundException, ItemExistsException, AccessDeniedException, UnsupportedRepositoryOperationException, RepositoryException;
+ void addProperty(NodeId parentId, Name propertyName, QValue[] values) throws ValueFormatException, VersionException,
+ LockException, ConstraintViolationException, PathNotFoundException, ItemExistsException, AccessDeniedException,
+ UnsupportedRepositoryOperationException, RepositoryException;
/**
* Modify the value of an existing property. Note that in contrast to
@@ -179,7 +183,7 @@ public interface Batch {
* @see javax.jcr.Property#setValue(boolean)
* @see javax.jcr.Property#setValue(javax.jcr.Node)
*/
- public void setValue(PropertyId propertyId, QValue value) throws RepositoryException;
+ void setValue(PropertyId propertyId, QValue value) throws RepositoryException;
/**
* Modify the value of an existing, multi-valued property. Note that in
@@ -198,7 +202,7 @@ public interface Batch {
* @see javax.jcr.Property#setValue(javax.jcr.Value[])
* @see javax.jcr.Property#setValue(String[])
*/
- public void setValue(PropertyId propertyId, QValue[] values) throws RepositoryException;
+ void setValue(PropertyId propertyId, QValue[] values) throws RepositoryException;
/**
* Remove an existing item.
@@ -212,7 +216,7 @@ public interface Batch {
* @throws javax.jcr.RepositoryException
* @see javax.jcr.Item#remove()
*/
- public void remove(ItemId itemId) throws RepositoryException;
+ void remove(ItemId itemId) throws RepositoryException;
/**
* Modify the order of the child nodes identified by the given
@@ -231,7 +235,7 @@ public interface Batch {
* @throws javax.jcr.RepositoryException
* @see javax.jcr.Node#orderBefore(String, String)
*/
- public void reorderNodes(NodeId parentId, NodeId srcNodeId, NodeId beforeNodeId) throws RepositoryException;
+ void reorderNodes(NodeId parentId, NodeId srcNodeId, NodeId beforeNodeId) throws RepositoryException;
/**
* Modify the set of mixin node types present on the node identified by the
@@ -250,7 +254,7 @@ public interface Batch {
* @see javax.jcr.Node#addMixin(String)
* @see javax.jcr.Node#removeMixin(String)
*/
- public void setMixins(NodeId nodeId, Name[] mixinNodeTypeNames) throws RepositoryException;
+ void setMixins(NodeId nodeId, Name[] mixinNodeTypeNames) throws RepositoryException;
/**
* Change the primary type of the node identified by the given <code>nodeId</code>.
@@ -260,7 +264,7 @@ public interface Batch {
* @throws RepositoryException
* @see javax.jcr.Node#setPrimaryType(String)
*/
- public void setPrimaryType(NodeId nodeId, Name primaryNodeTypeName) throws RepositoryException;
+ void setPrimaryType(NodeId nodeId, Name primaryNodeTypeName) throws RepositoryException;
/**
* Move the node identified by the given <code>srcNodeId</code> to the
@@ -280,5 +284,5 @@ public interface Batch {
* @throws javax.jcr.RepositoryException
* @see javax.jcr.Session#move(String, String)
*/
- public void move(NodeId srcNodeId, NodeId destParentNodeId, Name destName) throws RepositoryException;
+ void move(NodeId srcNodeId, NodeId destParentNodeId, Name destName) throws RepositoryException;
}
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/ChildInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/ChildInfo.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/ChildInfo.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/ChildInfo.java Fri Sep 2 16:58:50 2011
@@ -26,7 +26,7 @@ public interface ChildInfo {
*
* @return The name of the child <code>Node</code>.
*/
- public Name getName();
+ Name getName();
/**
* Returns the uniqueID of the child <code>Node</code> or <code>null</code>
@@ -36,7 +36,7 @@ public interface ChildInfo {
* @see ItemId ItemId for a description of the uniqueID defined by the SPI
* item identifiers.
*/
- public String getUniqueID();
+ String getUniqueID();
/**
* Returns the index of the child <code>Node</code>. Note, that the index
@@ -46,5 +46,5 @@ public interface ChildInfo {
*
* @return Returns the index of the child <code>Node</code>.
*/
- public int getIndex();
+ int getIndex();
}
\ No newline at end of file
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Event.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Event.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Event.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Event.java Fri Sep 2 16:58:50 2011
@@ -28,27 +28,27 @@ public interface Event {
/**
* An event of this type is generated when a node is added.
*/
- public static final int NODE_ADDED = javax.jcr.observation.Event.NODE_ADDED;
+ int NODE_ADDED = javax.jcr.observation.Event.NODE_ADDED;
/**
* An event of this type is generated when a node is removed.
*/
- public static final int NODE_REMOVED = javax.jcr.observation.Event.NODE_REMOVED;
+ int NODE_REMOVED = javax.jcr.observation.Event.NODE_REMOVED;
/**
* An event of this type is generated when a property is added.
*/
- public static final int PROPERTY_ADDED = javax.jcr.observation.Event.PROPERTY_ADDED;
+ int PROPERTY_ADDED = javax.jcr.observation.Event.PROPERTY_ADDED;
/**
* An event of this type is generated when a property is removed.
*/
- public static final int PROPERTY_REMOVED = javax.jcr.observation.Event.PROPERTY_REMOVED;
+ int PROPERTY_REMOVED = javax.jcr.observation.Event.PROPERTY_REMOVED;
/**
* An event of this type is generated when a property is changed.
*/
- public static final int PROPERTY_CHANGED = javax.jcr.observation.Event.PROPERTY_CHANGED;
+ int PROPERTY_CHANGED = javax.jcr.observation.Event.PROPERTY_CHANGED;
/**
@@ -56,7 +56,7 @@ public interface Event {
*
* @since JCR 2.0
*/
- public static final int NODE_MOVED = javax.jcr.observation.Event.NODE_MOVED;
+ int NODE_MOVED = javax.jcr.observation.Event.NODE_MOVED;
/**
* If event bundling is supported, this event is used to indicate a
@@ -64,14 +64,13 @@ public interface Event {
*
* @since JCR 2.0
*/
- public static final int PERSIST = javax.jcr.observation.Event.PERSIST;
+ int PERSIST = javax.jcr.observation.Event.PERSIST;
/**
* Constant for observation listener interested in all types of events.
*/
- public static final int ALL_TYPES = Event.NODE_ADDED | Event.NODE_REMOVED |
- Event.PROPERTY_ADDED | Event.PROPERTY_CHANGED | Event.PROPERTY_REMOVED |
- Event.NODE_MOVED | Event.PERSIST;
+ int ALL_TYPES = NODE_ADDED | NODE_REMOVED | PROPERTY_ADDED | PROPERTY_CHANGED | PROPERTY_REMOVED | NODE_MOVED
+ | PERSIST;
/**
* Returns the type of this event: a constant defined by this interface.
@@ -88,37 +87,37 @@ public interface Event {
*
* @return the type of this event.
*/
- public int getType();
+ int getType();
/**
* @return the path of the affected item. E.g. the added/removed node or the
* property that was added/removed/changed.
*/
- public Path getPath();
+ Path getPath();
/**
* @return the id of the affected item.
*/
- public ItemId getItemId();
+ ItemId getItemId();
/**
* @return the id of the parent node of the affected item.
*/
- public NodeId getParentId();
+ NodeId getParentId();
/**
* @return the name of the primary node type of the 'associated' node of
* this event.
* @see javax.jcr.observation.ObservationManager#addEventListener
*/
- public Name getPrimaryNodeTypeName();
+ Name getPrimaryNodeTypeName();
/**
* @return the names of the mixin types of the 'associated' node of this
* event.
* @see javax.jcr.observation.ObservationManager#addEventListener
*/
- public Name[] getMixinTypeNames();
+ Name[] getMixinTypeNames();
/**
* Returns the user ID connected with this event. This is the string
@@ -126,7 +125,7 @@ public interface Event {
*
* @return a <code>String</code>.
*/
- public String getUserID();
+ String getUserID();
/**
* Returns the information map associated with this event.
@@ -136,7 +135,7 @@ public interface Event {
* @see javax.jcr.observation.Event#getInfo()
* @since JCR 2.0
*/
- public Map<Name, QValue> getInfo() throws RepositoryException;
+ Map<Name, QValue> getInfo() throws RepositoryException;
/**
* Returns the user data.
@@ -145,7 +144,7 @@ public interface Event {
* @see javax.jcr.observation.Event#getUserData()
* @since JCR 2.0
*/
- public String getUserData();
+ String getUserData();
/**
* Returns the date when the change was persisted that caused this event.
@@ -155,5 +154,5 @@ public interface Event {
* @see javax.jcr.observation.Event#getDate()
* @since JCR 2.0
*/
- public long getDate() throws RepositoryException;
+ long getDate() throws RepositoryException;
}
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/EventBundle.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/EventBundle.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/EventBundle.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/EventBundle.java Fri Sep 2 16:58:50 2011
@@ -31,7 +31,7 @@ public interface EventBundle extends Ite
*
* @return the {@link Event events} of this bundle.
*/
- public Iterator<Event> getEvents();
+ Iterator<Event> getEvents();
/**
* Returns <code>true</code> if this event bundle is associated with a
@@ -42,5 +42,5 @@ public interface EventBundle extends Ite
* change, <code>false</code> if this event bundle contains external
* changes.
*/
- public boolean isLocal();
+ boolean isLocal();
}
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/EventFilter.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/EventFilter.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/EventFilter.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/EventFilter.java Fri Sep 2 16:58:50 2011
@@ -40,5 +40,5 @@ public interface EventFilter extends Ser
* @return <code>true</code> if the event is accepted by the filter;
* <code>false</code> otherwise.
*/
- public boolean accept(Event event, boolean isLocal);
+ boolean accept(Event event, boolean isLocal);
}
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/IdFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/IdFactory.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/IdFactory.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/IdFactory.java Fri Sep 2 16:58:50 2011
@@ -36,7 +36,7 @@ public interface IdFactory {
* @param propertyName
* @return a new <code>PropertyId</code>.
*/
- public PropertyId createPropertyId(NodeId parentId, Name propertyName);
+ PropertyId createPropertyId(NodeId parentId, Name propertyName);
/**
* Creates a new <code>NodeId</code> from the given parent id and
@@ -46,7 +46,7 @@ public interface IdFactory {
* @param path
* @return a new <code>NodeId</code>.
*/
- public NodeId createNodeId(NodeId parentId, Path path);
+ NodeId createNodeId(NodeId parentId, Path path);
/**
* Creates a new <code>NodeId</code> from the given unique id (which identifies
@@ -58,7 +58,7 @@ public interface IdFactory {
* @see ItemId ItemId for a description of the uniqueID defined by the SPI
* item identifiers.
*/
- public NodeId createNodeId(String uniqueID, Path path);
+ NodeId createNodeId(String uniqueID, Path path);
/**
* Creates a new <code>NodeId</code> from the given unique id.
@@ -68,7 +68,7 @@ public interface IdFactory {
* @see ItemId ItemId for a description of the uniqueID defined by the SPI
* item identifiers.
*/
- public NodeId createNodeId(String uniqueID);
+ NodeId createNodeId(String uniqueID);
/**
* Returns the JCR string representation of the given <code>nodeId</code>.
@@ -76,7 +76,7 @@ public interface IdFactory {
* @return a JCR node identifier string.
* @see #fromJcrIdentifier(String)
*/
- public String toJcrIdentifier(NodeId nodeId);
+ String toJcrIdentifier(NodeId nodeId);
/**
* Create a new <code>NodeId</code> from the given JCR string representation.
@@ -85,5 +85,5 @@ public interface IdFactory {
* @return a new <code>NodeId</code>.
* @see #toJcrIdentifier(NodeId)
*/
- public NodeId fromJcrIdentifier(String jcrIdentifier);
+ NodeId fromJcrIdentifier(String jcrIdentifier);
}
\ No newline at end of file
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/ItemId.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/ItemId.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/ItemId.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/ItemId.java Fri Sep 2 16:58:50 2011
@@ -54,18 +54,18 @@ public interface ItemId {
* @return <code>true</code> if this <code>ItemId</code> identifies a node;
* otherwise <code>false</code>.
*/
- public boolean denotesNode();
+ boolean denotesNode();
/**
* @return the uniqueID part of this item id or <code>null</code> if the
* identified item nor any of its ancestors can be identified with a
* uniqueID.
*/
- public String getUniqueID();
+ String getUniqueID();
/**
* @return the path part of this item id. Returns <code>null</code>
* if this item can be identified solely with a uniqueID.
*/
- public Path getPath();
+ Path getPath();
}
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/ItemInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/ItemInfo.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/ItemInfo.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/ItemInfo.java Fri Sep 2 16:58:50 2011
@@ -25,16 +25,15 @@ public interface ItemInfo {
/**
* @return identifier for the item that is based on this info object. the id
* can either be an absolute path or a uniqueID (+ relative path).
- * @see RepositoryService#getNodeInfo(SessionInfo, NodeId)
*/
- public ItemId getId();
+ ItemId getId();
/**
* Returns true if this <code>ItemInfo</code> denotes a node, false otherwise.
*
* @return true if this <code>ItemInfo</code> denotes a node, false otherwise.
*/
- public boolean denotesNode();
+ boolean denotesNode();
/**
* Returns the <code>Path</code> of the item represented by this
@@ -43,5 +42,5 @@ public interface ItemInfo {
* @return the <code>Path</code> of the item represented by this
* item info.
*/
- public Path getPath();
+ Path getPath();
}
\ No newline at end of file
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/ItemInfoCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/ItemInfoCache.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/ItemInfoCache.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/ItemInfoCache.java Fri Sep 2 16:58:50 2011
@@ -25,7 +25,7 @@ package org.apache.jackrabbit.spi;
* An <code>ItemInfoCache</code> is supplied per session from the {@link RepositoryService}. It is used
* to cache <code>ItemInfo</code>s read from the <code>RepositoryService</code>.
*
- * @see RepositoryService#getItemInfos(SessionInfo, NodeId)
+ * @see RepositoryService#getItemInfos(SessionInfo, ItemId)
*/
public interface ItemInfoCache {
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/LockInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/LockInfo.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/LockInfo.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/LockInfo.java Fri Sep 2 16:58:50 2011
@@ -32,7 +32,7 @@ public interface LockInfo {
* @return lock token or <code>null</code>
* @see javax.jcr.lock.Lock#getLockToken()
*/
- public String getLockToken();
+ String getLockToken();
/**
* Returns the user ID of the user who owns this lock or some user defined
@@ -41,7 +41,7 @@ public interface LockInfo {
* @return user ID of the user who owns this lock.
* @see javax.jcr.lock.Lock#getLockOwner()
*/
- public String getOwner();
+ String getOwner();
/**
* Returns true if the Lock is deep. False otherwise.
@@ -49,7 +49,7 @@ public interface LockInfo {
* @return true if the Lock is deep. False otherwise.
* @see javax.jcr.lock.Lock#isDeep()
*/
- public boolean isDeep();
+ boolean isDeep();
/**
* Returns true if the Lock is session scoped. False otherwise.
@@ -57,7 +57,7 @@ public interface LockInfo {
* @return true if the Lock is session scoped. False otherwise.
* @see javax.jcr.lock.Lock#isSessionScoped()
*/
- public boolean isSessionScoped();
+ boolean isSessionScoped();
/**
* Returns the seconds remaining until the lock times out or
@@ -67,7 +67,7 @@ public interface LockInfo {
* @see javax.jcr.lock.Lock#getSecondsRemaining()
* @since JCR 2.0
*/
- public long getSecondsRemaining();
+ long getSecondsRemaining();
/**
* Returns <code>true</code> if the <code>SessionInfo</code> used to
@@ -79,12 +79,12 @@ public interface LockInfo {
* @see javax.jcr.lock.Lock#isLockOwningSession()
* @since JCR 2.0
*/
- public boolean isLockOwner();
+ boolean isLockOwner();
/**
* Returns the <code>NodeId</code> of the lock-holding Node.
*
* @return the <code>NodeId</code> of the lock-holding Node.
*/
- public NodeId getNodeId();
+ NodeId getNodeId();
}
\ No newline at end of file
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Name.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Name.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Name.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Name.java Fri Sep 2 16:58:50 2011
@@ -35,51 +35,51 @@ import java.io.Serializable;
public interface Name extends Comparable, Cloneable, Serializable {
// default namespace (empty uri)
- public static final String NS_EMPTY_PREFIX = "";
- public static final String NS_DEFAULT_URI = "";
+ String NS_EMPTY_PREFIX = "";
+ String NS_DEFAULT_URI = "";
// reserved namespace for repository internal node types
- public static final String NS_REP_PREFIX = "rep";
- public 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
- public static final String NS_JCR_PREFIX = "jcr";
- public 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
- public static final String NS_NT_PREFIX = "nt";
- public 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
- public static final String NS_MIX_PREFIX = "mix";
- public 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
- public static final String NS_SV_PREFIX = "sv";
- public 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
- public static final String NS_XML_PREFIX = "xml";
- public static final String NS_XML_URI = "http://www.w3.org/XML/1998/namespace";
- public static final String NS_XMLNS_PREFIX = "xmlns";
- public 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/";
/**
* Empty array of <code>Name</code>
*/
- public static final Name[] EMPTY_ARRAY = new Name[0];
+ Name[] EMPTY_ARRAY = new Name[0];
/**
* Returns the local part of this <code>Name</code> object.
*
* @return local name
*/
- public String getLocalName();
+ String getLocalName();
/**
* Returns the namespace URI of this <code>Name</code> object.
*
* @return namespace URI
*/
- public String getNamespaceURI();
+ String getNamespaceURI();
}
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/NameFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/NameFactory.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/NameFactory.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/NameFactory.java Fri Sep 2 16:58:50 2011
@@ -30,7 +30,7 @@ public interface NameFactory {
* @throws IllegalArgumentException if <code>namespaceURI</code> or
* <code>localName</code> is invalid.
*/
- public Name create(String namespaceURI, String localName) throws IllegalArgumentException;
+ Name create(String namespaceURI, String localName) throws IllegalArgumentException;
/**
* Returns a <code>Name</code> holding the value of the specified
@@ -45,5 +45,5 @@ public interface NameFactory {
* @throws IllegalArgumentException if the specified string can not be parsed
* as a <code>Name</code>.
*/
- public Name create(String nameString) throws IllegalArgumentException;
+ Name create(String nameString) throws IllegalArgumentException;
}
\ No newline at end of file
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/NodeInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/NodeInfo.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/NodeInfo.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/NodeInfo.java Fri Sep 2 16:58:50 2011
@@ -24,7 +24,7 @@ import java.util.Iterator;
* Note however, that the list of child nodes does not form part of a
* <code>NodeInfo</code>. It is retrieved by calling
* {@link RepositoryService#getChildInfos(SessionInfo, NodeId)}. In case of
- * {@link RepositoryService#getItemInfos(SessionInfo, NodeId) batch read} the
+ * {@link RepositoryService#getItemInfos(SessionInfo, ItemId) batch read} the
* child nodes might be part of the returned <code>Iterator</code>.
*/
public interface NodeInfo extends ItemInfo {
@@ -35,21 +35,21 @@ public interface NodeInfo extends ItemIn
*
* @return identifier for the item that is based on this info object. the id
* can either be an absolute path or a uniqueID (+ relative path).
- * @see RepositoryService#getNodeInfo(SessionInfo, NodeId)
*/
- public NodeId getId();
+ @Override
+ NodeId getId();
/**
* Index of the node.
*
* @return the index.
*/
- public int getIndex();
+ int getIndex();
/**
* @return <code>Name</code> representing the name of the primary nodetype.
*/
- public Name getNodetype();
+ Name getNodetype();
/**
* @return Array of <code>Name</code>s representing the names of mixin nodetypes.
@@ -58,7 +58,7 @@ public interface NodeInfo extends ItemIn
* type hierarchy. If there are no mixin node types assigned an empty
* array will be returned.
*/
- public Name[] getMixins();
+ Name[] getMixins();
/**
* Return the {@link PropertyId Id}s of the properties that are referencing the
@@ -70,13 +70,13 @@ public interface NodeInfo extends ItemIn
* @see PropertyInfo#getId()
* @deprecated Use {@link RepositoryService#getReferences(SessionInfo, NodeId, Name, boolean)} instead.
*/
- public PropertyId[] getReferences();
+ PropertyId[] getReferences();
/**
* @return {@link PropertyId Id}s of children properties
* @see PropertyInfo#getId()
*/
- public Iterator<PropertyId> getPropertyIds();
+ Iterator<PropertyId> getPropertyIds();
/**
* Return all <code>ChildInfo</code>s of the node represent by
@@ -94,5 +94,5 @@ public interface NodeInfo extends ItemIn
* case {@link RepositoryService#getChildInfos(SessionInfo, NodeId)} will
* be used to load the <code>ChildInfo</code>s.
*/
- public Iterator<ChildInfo> getChildInfos();
+ Iterator<ChildInfo> getChildInfos();
}
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Path.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Path.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Path.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Path.java Fri Sep 2 16:58:50 2011
@@ -107,23 +107,23 @@ public interface Path extends Serializab
/**
* Constant representing an undefined index value
*/
- public static final int INDEX_UNDEFINED = 0;
+ int INDEX_UNDEFINED = 0;
/**
* Constant representing the default (initial) index value.
*/
- public static final int INDEX_DEFAULT = 1;
+ int INDEX_DEFAULT = 1;
/**
* Constant defining the depth of the root path
*/
- public static final int ROOT_DEPTH = 0;
+ int ROOT_DEPTH = 0;
/**
* Delimiter used in order to concatenate the Path.Element objects
* upon {@link Path#getString()}.
*/
- public static final char DELIMITER = '\t';
+ char DELIMITER = '\t';
/**
* Returns the name of the last path element, or <code>null</code>
@@ -215,7 +215,7 @@ public interface Path extends Serializab
*
* @return true if this path is absolute; false otherwise.
*/
- public boolean isAbsolute();
+ boolean isAbsolute();
/**
* Tests whether this path is canonical, i.e. whether it is absolute and
@@ -224,7 +224,7 @@ public interface Path extends Serializab
* @return true if this path is canonical; false otherwise.
* @see #isAbsolute()
*/
- public boolean isCanonical();
+ boolean isCanonical();
/**
* Tests whether this path is normalized, i.e. whether it does not
@@ -238,7 +238,7 @@ public interface Path extends Serializab
* @return true if this path is normalized; false otherwise.
* @see #getNormalizedPath()
*/
- public boolean isNormalized();
+ boolean isNormalized();
/**
* Returns the normalized path representation of this path.
@@ -250,7 +250,7 @@ public interface Path extends Serializab
* @throws RepositoryException if the path cannot be normalized.
* @see #isNormalized()
*/
- public Path getNormalizedPath() throws RepositoryException;
+ Path getNormalizedPath() throws RepositoryException;
/**
* Returns the canonical path representation of this path.
@@ -262,7 +262,7 @@ public interface Path extends Serializab
* @throws RepositoryException if this path can not be canonicalized
* (e.g. if it is relative).
*/
- public Path getCanonicalPath() throws RepositoryException;
+ Path getCanonicalPath() throws RepositoryException;
/**
* Resolves the given path element against this path. If the given
@@ -295,7 +295,7 @@ public interface Path extends Serializab
* @throws RepositoryException if either <code>this</code> or
* <code>other</code> path is not absolute.
*/
- public Path computeRelativePath(Path other) throws RepositoryException;
+ Path computeRelativePath(Path other) throws RepositoryException;
/**
* Normalizes this path and returns the ancestor path of the specified
@@ -326,7 +326,7 @@ public interface Path extends Serializab
* @throws RepositoryException If the implementation is not able to determine
* the ancestor of the specified degree for some other reason.
*/
- public Path getAncestor(int degree) throws IllegalArgumentException, PathNotFoundException, RepositoryException;
+ Path getAncestor(int degree) throws IllegalArgumentException, PathNotFoundException, RepositoryException;
/**
* Returns the number of ancestors of this path. This is the equivalent
@@ -340,7 +340,7 @@ public interface Path extends Serializab
* @see #getLength()
* @see #isCanonical()
*/
- public int getAncestorCount();
+ int getAncestorCount();
/**
* Returns the length of this path, i.e. the number of its elements.
@@ -356,7 +356,7 @@ public interface Path extends Serializab
* @see #getDepth()
* @see #getAncestorCount()
*/
- public int getLength();
+ int getLength();
/**
* Returns the depth of this path. The depth reflects the absolute or
@@ -372,7 +372,7 @@ public interface Path extends Serializab
* @see #getLength()
* @see #getAncestorCount()
*/
- public int getDepth();
+ int getDepth();
/**
* Determines if the the <code>other</code> path would be equal to <code>this</code>
@@ -384,7 +384,7 @@ public interface Path extends Serializab
* or if not both paths are either absolute or relative.
* @throws RepositoryException if any of the path cannot be normalized.
*/
- public boolean isEquivalentTo(Path other) throws IllegalArgumentException, RepositoryException;
+ boolean isEquivalentTo(Path other) throws IllegalArgumentException, RepositoryException;
/**
* Determines if <i>this</i> path is an ancestor of the specified path,
@@ -400,7 +400,7 @@ public interface Path extends Serializab
* @throws RepositoryException if any of the path cannot be normalized.
* @see #getDepth()
*/
- public boolean isAncestorOf(Path other) throws IllegalArgumentException, RepositoryException;
+ boolean isAncestorOf(Path other) throws IllegalArgumentException, RepositoryException;
/**
* Determines if <i>this</i> path is a descendant of the specified path,
@@ -416,7 +416,7 @@ public interface Path extends Serializab
* @throws RepositoryException if any of the path cannot be normalized.
* @see #isAncestorOf(Path)
*/
- public boolean isDescendantOf(Path other) throws IllegalArgumentException, RepositoryException;
+ boolean isDescendantOf(Path other) throws IllegalArgumentException, RepositoryException;
/**
* Returns a new <code>Path</code> consisting of those Path.Element objects
@@ -436,21 +436,21 @@ public interface Path extends Serializab
* is greater or equal than <code>to</code> or if any of both params is
* out of the possible range.
*/
- public Path subPath(int from, int to) throws IllegalArgumentException;
+ Path subPath(int from, int to) throws IllegalArgumentException;
/**
* Returns the elements of this path.
*
* @return the elements of this path.
*/
- public Element[] getElements();
+ Element[] getElements();
/**
* Returns the name element (i.e. the last element) of this path.
*
* @return the name element of this path
*/
- public Element getNameElement();
+ Element getNameElement();
/**
* Returns a path that consists of only the last element of this path.
@@ -478,7 +478,7 @@ public interface Path extends Serializab
* @see Path.Element#getString()
* @return Returns the String representation of this Path.
*/
- public String getString();
+ String getString();
//----------------------------------------------------< inner interface >---
/**
@@ -497,21 +497,21 @@ public interface Path extends Serializab
* two <code>Element</code> objects having equals <code>Name</code>s and the
* same normalized index must be equal.
*/
- public interface Element extends Serializable {
+ interface Element extends Serializable {
/**
* Returns the name of this path element.
*
* @return The name of this path element.
*/
- public Name getName();
+ Name getName();
/**
* Returns the index of the element as it has been assigned upon creation.
*
* @return index of the element as it has been assigned upon creation.
*/
- public int getIndex();
+ int getIndex();
/**
* Returns the normalized index of this path element, i.e. the index
@@ -519,7 +519,7 @@ public interface Path extends Serializab
*
* @return the normalized index.
*/
- public int getNormalizedIndex();
+ int getNormalizedIndex();
/**
* Returns the identifier of an identifier element, or
@@ -536,7 +536,7 @@ public interface Path extends Serializab
* @return <code>true</code> if this element denotes the <i>root</i>
* element; otherwise <code>false</code>
*/
- public boolean denotesRoot();
+ boolean denotesRoot();
/**
* Returns <code>true</code> if this element denotes the <i>parent</i>
@@ -545,7 +545,7 @@ public interface Path extends Serializab
* @return <code>true</code> if this element denotes the <i>parent</i>
* element; otherwise <code>false</code>
*/
- public boolean denotesParent();
+ boolean denotesParent();
/**
* Returns <code>true</code> if this element denotes the <i>current</i>
@@ -554,7 +554,7 @@ public interface Path extends Serializab
* @return <code>true</code> if this element denotes the <i>current</i>
* element; otherwise <code>false</code>
*/
- public boolean denotesCurrent();
+ boolean denotesCurrent();
/**
* Returns <code>true</code> if this element represents a regular name
@@ -563,7 +563,7 @@ public interface Path extends Serializab
* @return <code>true</code> if this element represents a regular name;
* otherwise <code>false</code>
*/
- public boolean denotesName();
+ boolean denotesName();
/**
* Returns <code>true</code> if this element represents an identifier element.
@@ -571,7 +571,7 @@ public interface Path extends Serializab
* @return <code>true</code> if this element represents an identifier element.
* @since JCR 2.0
*/
- public boolean denotesIdentifier();
+ boolean denotesIdentifier();
/**
* Return the String presentation of a {@link Path.Element}. It must be
@@ -581,7 +581,7 @@ public interface Path extends Serializab
*
* @return String representation of a {@link Path.Element}.
*/
- public String getString();
+ String getString();
}
}
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PathFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PathFactory.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PathFactory.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PathFactory.java Fri Sep 2 16:58:50 2011
@@ -37,7 +37,7 @@ public interface PathFactory {
* @throws RepositoryException If the <code>normalized</code> is
* <code>true</code> and the resulting path cannot be normalized.
*/
- public Path create(Path parent, Path relPath, boolean normalize) throws IllegalArgumentException, RepositoryException;
+ Path create(Path parent, Path relPath, boolean normalize) throws IllegalArgumentException, RepositoryException;
/**
* Creates a new <code>Path</code> out of the given <code>parent</code> path
@@ -53,7 +53,7 @@ public interface PathFactory {
* @throws RepositoryException If the <code>normalized</code> is
* <code>true</code> and the resulting path cannot be normalized.
*/
- public Path create(Path parent, Name name, boolean normalize) throws RepositoryException;
+ Path create(Path parent, Name name, boolean normalize) throws RepositoryException;
/**
* Creates a new <code>Path</code> out of the given <code>parent<code> path
@@ -70,7 +70,7 @@ public interface PathFactory {
* @throws RepositoryException If the <code>normalized</code> is
* <code>true</code> and the resulting path cannot be normalized.
*/
- public Path create(Path parent, Name name, int index, boolean normalize) throws IllegalArgumentException, RepositoryException;
+ Path create(Path parent, Name name, int index, boolean normalize) throws IllegalArgumentException, RepositoryException;
/**
* Creates a relative path based on a {@link Name}.
@@ -79,7 +79,7 @@ public interface PathFactory {
* @return the relative path created from <code>name</code>.
* @throws IllegalArgumentException if the name is <code>null</code>.
*/
- public Path create(Name name) throws IllegalArgumentException;
+ Path create(Name name) throws IllegalArgumentException;
/**
* Creates a relative path based on a {@link Name} and a normalized index.
@@ -92,7 +92,7 @@ public interface PathFactory {
* @throws IllegalArgumentException if <code>index</code> is lower
* than {@link Path#INDEX_UNDEFINED} or if the name is not valid.
*/
- public Path create(Name name, int index) throws IllegalArgumentException;
+ Path create(Name name, int index) throws IllegalArgumentException;
/**
* Creates a path from the given element.
@@ -111,7 +111,7 @@ public interface PathFactory {
* @throws IllegalArgumentException If the given elements are <code>null</code>
* or have a length of 0 or would otherwise constitute an invalid path.
*/
- public Path create(Path.Element[] elements) throws IllegalArgumentException;
+ Path create(Path.Element[] elements) throws IllegalArgumentException;
/**
* Returns a <code>Path</code> holding the value of the specified
@@ -126,7 +126,7 @@ public interface PathFactory {
* @see Path#getString()
* @see Path#DELIMITER
*/
- public Path create(String pathString) throws IllegalArgumentException;
+ Path create(String pathString) throws IllegalArgumentException;
/**
* Creates a path element from the given <code>name</code>.
@@ -140,7 +140,7 @@ public interface PathFactory {
* @return a path element
* @throws IllegalArgumentException if the name is <code>null</code>
*/
- public Path.Element createElement(Name name) throws IllegalArgumentException;
+ Path.Element createElement(Name name) throws IllegalArgumentException;
/**
* Same as {@link #createElement(Name)} except that an explicit index can be
@@ -159,7 +159,7 @@ public interface PathFactory {
* if the given index is lower than {@link Path#INDEX_UNDEFINED} or if name
* denoting a special path element.
*/
- public Path.Element createElement(Name name, int index) throws IllegalArgumentException;
+ Path.Element createElement(Name name, int index) throws IllegalArgumentException;
/**
* Creates a path element from the given <code>identifier</code>.
@@ -169,33 +169,33 @@ public interface PathFactory {
* @throws IllegalArgumentException If the <code>identifier</code> is <code>null</code>.
* @since JCR 2.0
*/
- public Path.Element createElement(String identifier) throws IllegalArgumentException;
+ Path.Element createElement(String identifier) throws IllegalArgumentException;
/**
* Return the current element.
*
* @return the current element.
*/
- public Path.Element getCurrentElement();
+ Path.Element getCurrentElement();
/**
* Return the parent element.
*
* @return the parent element.
*/
- public Path.Element getParentElement();
+ Path.Element getParentElement();
/**
* Return the root element.
*
* @return the root element.
*/
- public Path.Element getRootElement();
+ Path.Element getRootElement();
/**
* Return the <code>Path</code> of the root node.
*
* @return the <code>Path</code> of the root node.
*/
- public Path getRootPath();
+ Path getRootPath();
}
\ No newline at end of file
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PrivilegeDefinition.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PrivilegeDefinition.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PrivilegeDefinition.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PrivilegeDefinition.java Fri Sep 2 16:58:50 2011
@@ -25,7 +25,7 @@ public interface PrivilegeDefinition {
Name getName();
- public boolean isAbstract();
+ boolean isAbstract();
- public Set<Name> getDeclaredAggregateNames();
+ Set<Name> getDeclaredAggregateNames();
}
\ No newline at end of file
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PropertyId.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PropertyId.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PropertyId.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PropertyId.java Fri Sep 2 16:58:50 2011
@@ -26,12 +26,12 @@ public interface PropertyId extends Item
*
* @return The {@link NodeId parentId} of this <code>PropertyId</code>.
*/
- public NodeId getParentId();
+ NodeId getParentId();
/**
* Returns the {@link Name} of the property identified by this id.
*
* @return The name of the property that is identified by this <code>PropertyId</code>.
*/
- public Name getName();
+ Name getName();
}
\ No newline at end of file
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PropertyInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PropertyInfo.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PropertyInfo.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PropertyInfo.java Fri Sep 2 16:58:50 2011
@@ -26,9 +26,9 @@ public interface PropertyInfo extends It
/**
* @return identifier for the item that is based on this info object. the id
* can either be an absolute path or a uniqueID (+ relative path).
- * @see RepositoryService#getNodeInfo(SessionInfo, NodeId)
*/
- public PropertyId getId();
+ @Override
+ PropertyId getId();
/**
* @return The {@link javax.jcr.PropertyType type} of the <code>Property</code>
@@ -37,17 +37,17 @@ public interface PropertyInfo extends It
* value of a <code>Property</code> always has a defined type.
* @see javax.jcr.PropertyType
*/
- public int getType();
+ int getType();
/**
* @return true if the <code>Property</code> based on this info object is
* multivalue.
* @see javax.jcr.nodetype.PropertyDefinition#isMultiple()
*/
- public boolean isMultiValued();
+ boolean isMultiValued();
/**
* @return The values present on this <code>PropertyInfo</code>.
*/
- public QValue[] getValues();
+ QValue[] getValues();
}
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QItemDefinition.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QItemDefinition.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QItemDefinition.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QItemDefinition.java Fri Sep 2 16:58:50 2011
@@ -30,49 +30,49 @@ public interface QItemDefinition {
/**
* Empty array of <code>QItemDefinition</code>.
*/
- public static final QItemDefinition[] EMPTY_ARRAY = new QItemDefinition[0];
+ QItemDefinition[] EMPTY_ARRAY = new QItemDefinition[0];
/**
* Gets the name of the child item.
*
* @return the name of the child item.
*/
- public Name getName();
+ Name getName();
/**
* Gets the name of the declaring node type.
*
* @return the name of the declaring node type.
*/
- public Name getDeclaringNodeType();
+ Name getDeclaringNodeType();
/**
* Determines whether the item is 'autoCreated'.
*
* @return the 'autoCreated' flag.
*/
- public boolean isAutoCreated();
+ boolean isAutoCreated();
/**
* Gets the 'onParentVersion' attribute of the item.
*
* @return the 'onParentVersion' attribute.
*/
- public int getOnParentVersion();
+ int getOnParentVersion();
/**
* Determines whether the item is 'protected'.
*
* @return the 'protected' flag.
*/
- public boolean isProtected();
+ boolean isProtected();
/**
* Determines whether the item is 'mandatory'.
*
* @return the 'mandatory' flag.
*/
- public boolean isMandatory();
+ boolean isMandatory();
/**
* Determines whether this item definition defines a residual set of
@@ -81,7 +81,7 @@ public interface QItemDefinition {
* @return <code>true</code> if this definition defines a residual set;
* <code>false</code> otherwise.
*/
- public boolean definesResidual();
+ boolean definesResidual();
/**
* Determines whether this item definition defines a node.
@@ -89,5 +89,5 @@ public interface QItemDefinition {
* @return <code>true</code> if this is a node definition;
* <code>false</code> otherwise (i.e. it is a property definition).
*/
- public boolean definesNode();
+ boolean definesNode();
}
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QNodeDefinition.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QNodeDefinition.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QNodeDefinition.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QNodeDefinition.java Fri Sep 2 16:58:50 2011
@@ -30,26 +30,26 @@ public interface QNodeDefinition extends
/**
* Empty array of <code>QNodeDefinition</code>.
*/
- public static final QNodeDefinition[] EMPTY_ARRAY = new QNodeDefinition[0];
+ QNodeDefinition[] EMPTY_ARRAY = new QNodeDefinition[0];
/**
* Returns the name of the default primary type.
*
* @return the name of the default primary type.
*/
- public Name getDefaultPrimaryType();
+ Name getDefaultPrimaryType();
/**
* Returns the array of names of the required primary types.
*
* @return the array of names of the required primary types.
*/
- public Name[] getRequiredPrimaryTypes();
+ Name[] getRequiredPrimaryTypes();
/**
* Reports whether this node can have same-name siblings.
*
* @return the 'allowsSameNameSiblings' flag.
*/
- public boolean allowsSameNameSiblings();
+ boolean allowsSameNameSiblings();
}
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QNodeTypeDefinition.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QNodeTypeDefinition.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QNodeTypeDefinition.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QNodeTypeDefinition.java Fri Sep 2 16:58:50 2011
@@ -33,7 +33,7 @@ public interface QNodeTypeDefinition {
*
* @return the name of the node type or <code>null</code> if not set.
*/
- public Name getName();
+ Name getName();
/**
* Returns an array containing the names of the supertypes. If no
@@ -45,7 +45,7 @@ public interface QNodeTypeDefinition {
*
* @return an array of supertype names
*/
- public Name[] getSupertypes();
+ Name[] getSupertypes();
/**
* Returns an array containing the names of additional mixin types
@@ -56,14 +56,14 @@ public interface QNodeTypeDefinition {
* @return an array of mixin type names, or <code>null</code>
* when there are no known constraints.
*/
- public Name[] getSupportedMixinTypes();
+ Name[] getSupportedMixinTypes();
/**
* Returns the value of the mixin flag.
*
* @return true if this is a mixin node type; false otherwise.
*/
- public boolean isMixin();
+ boolean isMixin();
/**
* Returns <code>true</code> if the definition is abstract; <code>false</code> otherwise.
@@ -71,7 +71,7 @@ public interface QNodeTypeDefinition {
* @return <code>true</code> if the definition is abstract; <code>false</code> otherwise.
* @since JCR 2.0
*/
- public boolean isAbstract();
+ boolean isAbstract();
/**
* Returns <code>true</code> if the definition is queryable; <code>false</code> otherwise.
@@ -79,14 +79,14 @@ public interface QNodeTypeDefinition {
* @return <code>true</code> if the definition is queryable; <code>false</code> otherwise.
* @since JCR 2.0
*/
- public boolean isQueryable();
+ boolean isQueryable();
/**
* Returns the value of the orderableChildNodes flag.
*
* @return true if nodes of this node type can have orderable child nodes; false otherwise.
*/
- public boolean hasOrderableChildNodes();
+ boolean hasOrderableChildNodes();
/**
* Returns the name of the primary item (one of the child items of the
@@ -94,21 +94,21 @@ public interface QNodeTypeDefinition {
*
* @return the name of the primary item or <code>null</code> if not set.
*/
- public Name getPrimaryItemName();
+ Name getPrimaryItemName();
/**
* Returns an array containing the property definitions.
*
* @return an array containing the property definitions.
*/
- public QPropertyDefinition[] getPropertyDefs();
+ QPropertyDefinition[] getPropertyDefs();
/**
* Returns an array containing the child node definitions.
*
* @return an array containing the child node definitions.
*/
- public QNodeDefinition[] getChildNodeDefs();
+ QNodeDefinition[] getChildNodeDefs();
/**
* Returns a collection of node type <code>Name</code>s that are being
@@ -122,5 +122,5 @@ public interface QNodeTypeDefinition {
*
* @return a collection of node type <code>Name</code>s
*/
- public Collection<Name> getDependencies();
+ Collection<Name> getDependencies();
}
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QPropertyDefinition.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QPropertyDefinition.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QPropertyDefinition.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QPropertyDefinition.java Fri Sep 2 16:58:50 2011
@@ -31,21 +31,21 @@ public interface QPropertyDefinition ext
/**
* Empty array of <code>QPropertyDefinition</code>.
*/
- public static final QPropertyDefinition[] EMPTY_ARRAY = new QPropertyDefinition[0];
+ QPropertyDefinition[] EMPTY_ARRAY = new QPropertyDefinition[0];
/**
* Returns the required type.
*
* @return the required type.
*/
- public int getRequiredType();
+ int getRequiredType();
/**
* Returns the array of value constraints.
*
* @return the array of value constraints.
*/
- public QValueConstraint[] getValueConstraints();
+ QValueConstraint[] getValueConstraints();
/**
* Returns the array of default values or <code>null</code> if no default
@@ -53,14 +53,14 @@ public interface QPropertyDefinition ext
*
* @return the array of default values or <code>null</code>
*/
- public QValue[] getDefaultValues();
+ QValue[] getDefaultValues();
/**
* Reports whether this property can have multiple values.
*
* @return the 'multiple' flag.
*/
- public boolean isMultiple();
+ boolean isMultiple();
/**
* Returns the available query operators.
@@ -68,7 +68,7 @@ public interface QPropertyDefinition ext
* @return the available query operators.
* @since JCR 2.0
*/
- public String[] getAvailableQueryOperators();
+ String[] getAvailableQueryOperators();
/**
* Reports whether this property definition is full text searchable.
@@ -76,7 +76,7 @@ public interface QPropertyDefinition ext
* @return <code>true</code> if this property definition is full text searchable.
* @since JCR 2.0
*/
- public boolean isFullTextSearchable();
+ boolean isFullTextSearchable();
/**
* Reports whether this property definition is query-orderable.
@@ -84,5 +84,5 @@ public interface QPropertyDefinition ext
* @return <code>true</code> if this property definition is query-orderable.
* @since JCR 2.0
*/
- public boolean isQueryOrderable();
+ boolean isQueryOrderable();
}
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QValue.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QValue.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QValue.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QValue.java Fri Sep 2 16:58:50 2011
@@ -34,7 +34,7 @@ import javax.jcr.Binary;
*/
public interface QValue {
- public static final QValue[] EMPTY_ARRAY = new QValue[0];
+ QValue[] EMPTY_ARRAY = new QValue[0];
/**
* Returns the <code>PropertyType</code> of this <code>QValue</code> object.
@@ -56,7 +56,7 @@ public interface QValue {
*
* @return the <code>PropertyType</code> of this <code>QValue</code> object.
*/
- public int getType();
+ int getType();
/**
* Returns the length of the internal value or -1 if the implementation
@@ -69,7 +69,7 @@ public interface QValue {
* @return length of this <code>QValue</code> object.
* @throws RepositoryException
*/
- public long getLength() throws RepositoryException;
+ long getLength() throws RepositoryException;
/**
* Returns a <code>String</code> representation of this <code>QValue</code>
@@ -79,7 +79,7 @@ public interface QValue {
* object.
* @throws RepositoryException
*/
- public String getString() throws RepositoryException;
+ String getString() throws RepositoryException;
/**
* Returns an <code>InputStream</code> representation of this <code>QValue</code>
@@ -88,7 +88,7 @@ public interface QValue {
* @return A stream representation of this value.
* @throws RepositoryException
*/
- public InputStream getStream() throws RepositoryException;
+ InputStream getStream() throws RepositoryException;
/**
* Returns a <code>Binary</code> representation of this <code>QValue</code>
@@ -97,7 +97,7 @@ public interface QValue {
* @return A <code>Binary</code> representation of this value.
* @throws RepositoryException
*/
- public Binary getBinary() throws RepositoryException;
+ Binary getBinary() throws RepositoryException;
/**
* Returns a <code>Calendar</code> representation of this value.
@@ -105,7 +105,7 @@ public interface QValue {
* @return A <code>Calendar</code> representation of this value.
* @throws RepositoryException if an error occurs.
*/
- public Calendar getCalendar() throws RepositoryException;
+ Calendar getCalendar() throws RepositoryException;
/**
* Returns a <code>BigDecimal</code> representation of this value.
@@ -113,7 +113,7 @@ public interface QValue {
* @return A <code>BigDecimal</code> representation of this value.
* @throws RepositoryException if an error occurs.
*/
- public BigDecimal getDecimal() throws RepositoryException;
+ BigDecimal getDecimal() throws RepositoryException;
/**
* Returns a <code>double</code> representation of this value.
@@ -121,7 +121,7 @@ public interface QValue {
* @return A <code>double</code> representation of this value.
* @throws RepositoryException if an error occurs.
*/
- public double getDouble() throws RepositoryException;
+ double getDouble() throws RepositoryException;
/**
* Returns a <code>long</code> representation of this value.
@@ -129,7 +129,7 @@ public interface QValue {
* @return A <code>long</code> representation of this value.
* @throws RepositoryException if an error occurs.
*/
- public long getLong() throws RepositoryException;
+ long getLong() throws RepositoryException;
/**
* Returns a <code>boolean</code> representation of this value.
@@ -137,7 +137,7 @@ public interface QValue {
* @return A <code>boolean</code> representation of this value.
* @throws RepositoryException if an error occurs.
*/
- public boolean getBoolean() throws RepositoryException;
+ boolean getBoolean() throws RepositoryException;
/**
@@ -146,7 +146,7 @@ public interface QValue {
* @return A <code>Name</code> representation of this value.
* @throws RepositoryException if an error occurs.
*/
- public Name getName() throws RepositoryException;
+ Name getName() throws RepositoryException;
/**
* Returns a <code>Path</code> representation of this value.
@@ -154,7 +154,7 @@ public interface QValue {
* @return A <code>Path</code> representation of this value.
* @throws RepositoryException if an error occurs.
*/
- public Path getPath() throws RepositoryException;
+ Path getPath() throws RepositoryException;
/**
* Returns an <code>URI</code> representation of this value.
@@ -162,10 +162,10 @@ public interface QValue {
* @return A <code>URI</code> representation of this value.
* @throws RepositoryException if an error occurs.
*/
- public URI getURI() throws RepositoryException;
+ URI getURI() throws RepositoryException;
/**
* Frees temporarily allocated resources such as temporary file, buffer, etc.
*/
- public void discard();
+ void discard();
}
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QValueConstraint.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QValueConstraint.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QValueConstraint.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QValueConstraint.java Fri Sep 2 16:58:50 2011
@@ -31,7 +31,7 @@ public interface QValueConstraint {
/**
* Empty array of <code>QValueConstraint</code>.
*/
- public static final QValueConstraint[] EMPTY_ARRAY = new QValueConstraint[0];
+ QValueConstraint[] EMPTY_ARRAY = new QValueConstraint[0];
/**
* Check if the specified value matches this constraint.
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QValueFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QValueFactory.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QValueFactory.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QValueFactory.java Fri Sep 2 16:58:50 2011
@@ -45,7 +45,7 @@ public interface QValueFactory {
* @throws RepositoryException If another error occurs.
* @see QValue#getType()
*/
- public QValue create(String value, int type) throws ValueFormatException, RepositoryException;
+ QValue create(String value, int type) throws ValueFormatException, RepositoryException;
/**
* Create a new <code>QValue</code> with type {@link javax.jcr.PropertyType#DATE}.
@@ -54,7 +54,7 @@ public interface QValueFactory {
* of the new <code>QValue</code>.
* @return a new <code>QValue</code>.
*/
- public QValue create(Calendar value) throws RepositoryException;
+ QValue create(Calendar value) throws RepositoryException;
/**
* Create a new <code>QValue</code> with type {@link javax.jcr.PropertyType#DOUBLE}.
@@ -63,7 +63,7 @@ public interface QValueFactory {
* of the new <code>QValue</code>.
* @return a new <code>QValue</code>.
*/
- public QValue create(double value) throws RepositoryException;
+ QValue create(double value) throws RepositoryException;
/**
* Create a new <code>QValue</code> with type {@link javax.jcr.PropertyType#LONG}.
@@ -72,7 +72,7 @@ public interface QValueFactory {
* of the new <code>QValue</code>.
* @return a new <code>QValue</code>.
*/
- public QValue create(long value) throws RepositoryException;
+ QValue create(long value) throws RepositoryException;
/**
* Create a new <code>QValue</code> with type {@link javax.jcr.PropertyType#BOOLEAN}.
@@ -81,7 +81,7 @@ public interface QValueFactory {
* of the new <code>QValue</code>.
* @return a new <code>QValue</code>.
*/
- public QValue create(boolean value) throws RepositoryException;
+ QValue create(boolean value) throws RepositoryException;
/**
* Create a new <code>QValue</code> with type {@link javax.jcr.PropertyType#NAME}.
@@ -89,7 +89,7 @@ public interface QValueFactory {
* @param value A non-null <code>Name</code>.
* @return a new <code>QValue</code>.
*/
- public QValue create(Name value) throws RepositoryException;
+ QValue create(Name value) throws RepositoryException;
/**
* Create a new <code>QValue</code> with type {@link javax.jcr.PropertyType#PATH}.
@@ -97,7 +97,7 @@ public interface QValueFactory {
* @param value A non-null <code>Path</code>.
* @return a new <code>QValue</code>.
*/
- public QValue create(Path value) throws RepositoryException;
+ QValue create(Path value) throws RepositoryException;
/**
* Create a new <code>QValue</code> with type {@link javax.jcr.PropertyType#DECIMAL}.
@@ -105,7 +105,7 @@ public interface QValueFactory {
* @param value A non-null <code>BigDecimal</code>.
* @return a new <code>QValue</code>.
*/
- public QValue create(BigDecimal value) throws RepositoryException;
+ QValue create(BigDecimal value) throws RepositoryException;
/**
* Create a new <code>QValue</code> with type {@link javax.jcr.PropertyType#URI}.
@@ -113,7 +113,7 @@ public interface QValueFactory {
* @param value A non-null <code>URI</code>.
* @return a new <code>QValue</code>.
*/
- public QValue create(URI value) throws RepositoryException;
+ QValue create(URI value) throws RepositoryException;
/**
* Create a new <code>QValue</code> with type {@link javax.jcr.PropertyType#BINARY}.
@@ -121,7 +121,7 @@ public interface QValueFactory {
* @param value
* @return a new <code>QValue</code>.
*/
- public QValue create(byte[] value) throws RepositoryException;
+ QValue create(byte[] value) throws RepositoryException;
/**
* Creates a QValue that contains the given binary stream.
@@ -133,7 +133,7 @@ public interface QValueFactory {
* @throws RepositoryException if the value could not be created
* @throws IOException if the stream can not be consumed
*/
- public QValue create(InputStream value) throws RepositoryException, IOException;
+ QValue create(InputStream value) throws RepositoryException, IOException;
/**
* Create a new <code>QValue</code> with type {@link javax.jcr.PropertyType#BINARY}.
@@ -142,7 +142,7 @@ public interface QValueFactory {
* @return a new binary <code>QValue</code>.
* @throws IOException
*/
- public QValue create(File value) throws RepositoryException, IOException;
+ QValue create(File value) throws RepositoryException, IOException;
/**
* Given the <code>QPropertyDefinition</code> of an <em>autocreated</em>
@@ -153,5 +153,5 @@ public interface QValueFactory {
* @return computed value
* @throws RepositoryException
*/
- public QValue[] computeAutoValues(QPropertyDefinition propertyDefinition) throws RepositoryException;
+ QValue[] computeAutoValues(QPropertyDefinition propertyDefinition) throws RepositoryException;
}
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QueryInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QueryInfo.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QueryInfo.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QueryInfo.java Fri Sep 2 16:58:50 2011
@@ -36,19 +36,19 @@ public interface QueryInfo {
* @return an iterator over the {@link QueryResultRow}s.
* @see javax.jcr.query.QueryResult#getRows()
*/
- public RangeIterator getRows();
+ RangeIterator getRows();
/**
* @return an array of <code>String</code>s representing the column names of
* the query result.
* @see javax.jcr.query.QueryResult#getColumnNames()
*/
- public String[] getColumnNames();
+ String[] getColumnNames();
/**
* @return an array of <code>Name</code>s representing the selector names of
* the query result.
* @see javax.jcr.query.QueryResult#getSelectorNames()
*/
- public Name[] getSelectorNames();
+ Name[] getSelectorNames();
}
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QueryResultRow.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QueryResultRow.java?rev=1164631&r1=1164630&r2=1164631&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QueryResultRow.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QueryResultRow.java Fri Sep 2 16:58:50 2011
@@ -24,7 +24,7 @@ package org.apache.jackrabbit.spi;
public interface QueryResultRow {
/**
- * Returns {@link NodeId} of node for a given <code>selectorname</code> this
+ * Returns {@link NodeId} of node for a given <code>selector name</code> this
* result row represents.
*
* @param selectorName the name of a selector or <code>null</code> for the
@@ -35,7 +35,7 @@ public interface QueryResultRow {
* @see javax.jcr.query.Row#getNode()
* @see javax.jcr.query.Row#getNode(String)
*/
- public NodeId getNodeId(Name selectorName);
+ NodeId getNodeId(Name selectorName);
/**
* Returns score for the given <code>selectorName</code> of this result row.
@@ -44,7 +44,7 @@ public interface QueryResultRow {
* default selector.
* @return score for the given selector in this result row.
*/
- public double getScore(Name selectorName);
+ double getScore(Name selectorName);
/**
* Returns an array of <code>QValue</code>s.
@@ -54,5 +54,5 @@ public interface QueryResultRow {
* @see javax.jcr.query.Row#getValue(String)
* @see javax.jcr.query.Row#getValues()
*/
- public QValue[] getValues();
+ QValue[] getValues();
}