You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2010/02/24 16:38:54 UTC
svn commit: r915830 - in
/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons:
identifier/ logging/ namespace/ nodetype/
Author: angela
Date: Wed Feb 24 15:38:54 2010
New Revision: 915830
URL: http://svn.apache.org/viewvc?rev=915830&view=rev
Log:
- add missing @Override annotation
Modified:
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/identifier/AbstractIdFactory.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/identifier/IdFactoryImpl.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/logging/SpiLoggerFactory.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/namespace/NamespaceMapping.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/ItemDefinitionImpl.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/NodeTypeDefDiff.java
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/identifier/AbstractIdFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/identifier/AbstractIdFactory.java?rev=915830&r1=915829&r2=915830&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/identifier/AbstractIdFactory.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/identifier/AbstractIdFactory.java Wed Feb 24 15:38:54 2010
@@ -169,6 +169,7 @@
* @param obj
* @return
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -192,6 +193,7 @@
* @return hash code
* @see Object#hashCode()
*/
+ @Override
public int hashCode() {
// since the ItemIdImpl is immutable, store the computed hash code value
if (hashCode == 0) {
@@ -208,6 +210,7 @@
*
* @return
*/
+ @Override
public String toString() {
StringBuffer b = new StringBuffer();
if (uniqueID != null) {
@@ -237,10 +240,12 @@
super(parentId.getUniqueID(), (parentId.getPath() != null) ? factory.create(parentId.getPath(), path, true) : path);
}
+ @Override
public boolean denotesNode() {
return true;
}
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -264,6 +269,7 @@
this.parentId = parentId;
}
+ @Override
public boolean denotesNode() {
return false;
}
@@ -276,6 +282,7 @@
return getPath().getNameElement().getName();
}
+ @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
@@ -286,4 +293,4 @@
return false;
}
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/identifier/IdFactoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/identifier/IdFactoryImpl.java?rev=915830&r1=915829&r2=915830&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/identifier/IdFactoryImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/identifier/IdFactoryImpl.java Wed Feb 24 15:38:54 2010
@@ -37,6 +37,10 @@
return IdFactoryImpl.INSTANCE;
}
+ /**
+ * @see org.apache.jackrabbit.spi.commons.identifier.AbstractIdFactory#getPathFactory()
+ */
+ @Override
protected PathFactory getPathFactory() {
return PathFactoryImpl.getInstance();
}
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/logging/SpiLoggerFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/logging/SpiLoggerFactory.java?rev=915830&r1=915829&r2=915830&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/logging/SpiLoggerFactory.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/logging/SpiLoggerFactory.java Wed Feb 24 15:38:54 2010
@@ -265,8 +265,7 @@
}
}
- // -----------------------------------------------------< private >---
-
+ //------------------------------------------------------------< private >---
/**
* Helper class which wraps SPI entities returned from calls to {@link RepositoryService}
* into log wrappers if the {@link LogWriterProvider} can provide a {@link LogWriter}.
@@ -279,6 +278,7 @@
this.logWriterProvider = logWriterProvider;
}
+ @Override
public NameFactory getNameFactory() throws RepositoryException {
NameFactory result = super.getNameFactory();
return result == null
@@ -286,6 +286,7 @@
: create(result, logWriterProvider);
}
+ @Override
public PathFactory getPathFactory() throws RepositoryException {
PathFactory result = super.getPathFactory();
return result == null
@@ -293,6 +294,7 @@
: create(result, logWriterProvider);
}
+ @Override
public IdFactory getIdFactory() throws RepositoryException {
IdFactory result = super.getIdFactory();
return result == null
@@ -300,6 +302,7 @@
: create(result, logWriterProvider);
}
+ @Override
public QValueFactory getQValueFactory() throws RepositoryException {
QValueFactory result = super.getQValueFactory();
return result == null
@@ -307,6 +310,7 @@
: create(result, logWriterProvider);
}
+ @Override
public SessionInfo obtain(final Credentials credentials, final String workspaceName)
throws RepositoryException {
@@ -316,6 +320,7 @@
: create(result, logWriterProvider);
}
+ @Override
public SessionInfo obtain(final SessionInfo sessionInfo, final String workspaceName)
throws RepositoryException {
@@ -325,6 +330,7 @@
: create(result, logWriterProvider);
}
+ @Override
public SessionInfo impersonate(final SessionInfo sessionInfo, final Credentials credentials)
throws RepositoryException {
@@ -334,6 +340,7 @@
: create(result, logWriterProvider);
}
+ @Override
public Batch createBatch(final SessionInfo sessionInfo, final ItemId itemId)
throws RepositoryException {
@@ -342,6 +349,5 @@
? null
: create(result, logWriterProvider);
}
-
}
}
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/namespace/NamespaceMapping.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/namespace/NamespaceMapping.java?rev=915830&r1=915829&r2=915830&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/namespace/NamespaceMapping.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/namespace/NamespaceMapping.java Wed Feb 24 15:38:54 2010
@@ -50,6 +50,7 @@
}
+ //--------------------------------------------------< NamespaceResolver >---
/**
* {@inheritDoc}
*/
@@ -76,6 +77,7 @@
}
}
+ //-------------------------------------------------------------< public >---
/**
* Returns true if prefix is already mapped to some URI. Returns false otherwise.
* @param prefix prefix to check
@@ -129,9 +131,11 @@
return new HashMap<String, String>(URIToPrefix);
}
+ //-------------------------------------------------------------< Object >---
/**
* {@inheritDoc}
*/
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
@@ -145,10 +149,11 @@
}
/**
- * Override toString()
+ * Override {@link Object#toString()}
*
* @return String
*/
+ @Override
public String toString() {
String s = "";
for (Map.Entry<String, String> entry: prefixToURI.entrySet()) {
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/ItemDefinitionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/ItemDefinitionImpl.java?rev=915830&r1=915829&r2=915830&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/ItemDefinitionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/ItemDefinitionImpl.java Wed Feb 24 15:38:54 2010
@@ -149,9 +149,11 @@
return itemDef.isProtected();
}
+ //-------------------------------------------------------------< Object >---
/**
* {@inheritDoc}
*/
+ @Override
public boolean equals(Object o) {
if (this == o) {
return true;
@@ -165,7 +167,8 @@
/**
* {@inheritDoc}
*/
+ @Override
public int hashCode() {
return itemDef.hashCode();
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/NodeTypeDefDiff.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/NodeTypeDefDiff.java?rev=915830&r1=915829&r2=915830&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/NodeTypeDefDiff.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/NodeTypeDefDiff.java Wed Feb 24 15:38:54 2010
@@ -347,6 +347,7 @@
return maxType;
}
+ @Override
public String toString() {
String result = getClass().getName() + "[\n\tnodeTypeName="
+ oldDef.getName();
@@ -475,6 +476,7 @@
&& !oldDef.equals(newDef);
}
+ @Override
public String toString() {
String typeString = modificationTypeToString(getType());
@@ -512,6 +514,7 @@
return (QPropertyDefinition) newDef;
}
+ @Override
protected void init() {
super.init();
/**
@@ -588,6 +591,7 @@
return (QNodeDefinition) newDef;
}
+ @Override
protected void init() {
super.init();
/**