You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2013/08/08 14:56:09 UTC
svn commit: r1511760 - in
/santuario/xml-security-java/trunk/src/main/java/org/apache:
jcp/xml/dsig/internal/dom/ xml/security/ xml/security/algorithms/
xml/security/algorithms/implementations/ xml/security/c14n/helper/
xml/security/c14n/implementations/
Author: coheigea
Date: Thu Aug 8 12:56:09 2013
New Revision: 1511760
URL: http://svn.apache.org/r1511760
Log:
More PMD updates
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XmlWriter.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/MessageDigestAlgorithm.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/helper/AttrCompare.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/UtfHelpper.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XmlWriter.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XmlWriter.java?rev=1511760&r1=1511759&r2=1511760&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XmlWriter.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XmlWriter.java Thu Aug 8 12:56:09 2013
@@ -41,7 +41,7 @@ public interface XmlWriter {
*
* @param <CLZ>
*/
- static abstract class ToMarshal<CLZ extends XMLStructure> {
+ static abstract class ToMarshal<CLZ extends XMLStructure> { //NOPMD
public final Class<CLZ> clazzToMatch;
public ToMarshal(Class<CLZ> clazzToMatch) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java?rev=1511760&r1=1511759&r2=1511760&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java Thu Aug 8 12:56:09 2013
@@ -284,7 +284,7 @@ public class Init {
String description =
resolverElem[i].getAttributeNS(null, "DESCRIPTION");
- if ((description != null) && (description.length() > 0)) {
+ if (description != null && description.length() > 0) {
if (log.isDebugEnabled()) {
log.debug("Register Resolver: " + javaClass + ": "
+ description);
@@ -317,7 +317,7 @@ public class Init {
String description =
resolverElem[i].getAttributeNS(null, "DESCRIPTION");
- if ((description != null) && (description.length() > 0)) {
+ if (description != null && description.length() > 0) {
if (log.isDebugEnabled()) {
log.debug("Register Resolver: " + javaClass + ": "
+ description);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/MessageDigestAlgorithm.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/MessageDigestAlgorithm.java?rev=1511760&r1=1511759&r2=1511760&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/MessageDigestAlgorithm.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/MessageDigestAlgorithm.java Thu Aug 8 12:56:09 2013
@@ -117,7 +117,7 @@ public class MessageDigestAlgorithm exte
*
* @return the actual {@link java.security.MessageDigest} algorithm object
*/
- public java.security.MessageDigest getAlgorithm() {
+ public MessageDigest getAlgorithm() {
return algorithm;
}
@@ -130,7 +130,7 @@ public class MessageDigestAlgorithm exte
* @return the result of the {@link java.security.MessageDigest#isEqual} method
*/
public static boolean isEqual(byte[] digesta, byte[] digestb) {
- return java.security.MessageDigest.isEqual(digesta, digestb);
+ return MessageDigest.isEqual(digesta, digestb);
}
/**
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java?rev=1511760&r1=1511759&r2=1511760&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java Thu Aug 8 12:56:09 2013
@@ -43,7 +43,7 @@ public abstract class SignatureBaseRSA e
public abstract String engineGetURI();
/** Field algorithm */
- private java.security.Signature signatureAlgorithm = null;
+ private Signature signatureAlgorithm = null;
/**
* Constructor SignatureRSA
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java?rev=1511760&r1=1511759&r2=1511760&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java Thu Aug 8 12:56:09 2013
@@ -44,7 +44,7 @@ public class SignatureDSA extends Signat
public static final String URI = Constants.SignatureSpecNS + "dsa-sha1";
/** Field algorithm */
- private java.security.Signature signatureAlgorithm = null;
+ private Signature signatureAlgorithm = null;
/**
* Method engineGetURI
@@ -269,23 +269,23 @@ public class SignatureDSA extends Signat
byte rLength = asn1Bytes[3];
int i;
- for (i = rLength; (i > 0) && (asn1Bytes[(4 + rLength) - i] == 0); i--);
+ for (i = rLength; i > 0 && asn1Bytes[4 + rLength - i] == 0; i--);
byte sLength = asn1Bytes[5 + rLength];
int j;
for (j = sLength;
- (j > 0) && (asn1Bytes[(6 + rLength + sLength) - j] == 0); j--);
+ j > 0 && asn1Bytes[6 + rLength + sLength - j] == 0; j--);
- if ((asn1Bytes[0] != 48) || (asn1Bytes[1] != asn1Bytes.length - 2)
- || (asn1Bytes[2] != 2) || (i > 20)
- || (asn1Bytes[4 + rLength] != 2) || (j > 20)) {
+ if (asn1Bytes[0] != 48 || asn1Bytes[1] != asn1Bytes.length - 2
+ || asn1Bytes[2] != 2 || i > 20
+ || asn1Bytes[4 + rLength] != 2 || j > 20) {
throw new IOException("Invalid ASN.1 format of DSA signature");
}
byte xmldsigBytes[] = new byte[40];
- System.arraycopy(asn1Bytes, (4 + rLength) - i, xmldsigBytes, 20 - i, i);
- System.arraycopy(asn1Bytes, (6 + rLength + sLength) - j, xmldsigBytes,
+ System.arraycopy(asn1Bytes, 4 + rLength - i, xmldsigBytes, 20 - i, i);
+ System.arraycopy(asn1Bytes, 6 + rLength + sLength - j, xmldsigBytes,
40 - j, j);
return xmldsigBytes;
@@ -311,7 +311,7 @@ public class SignatureDSA extends Signat
int i;
- for (i = 20; (i > 0) && (xmldsigBytes[20 - i] == 0); i--);
+ for (i = 20; i > 0 && xmldsigBytes[20 - i] == 0; i--);
int j = i;
@@ -321,7 +321,7 @@ public class SignatureDSA extends Signat
int k;
- for (k = 20; (k > 0) && (xmldsigBytes[40 - k] == 0); k--);
+ for (k = 20; k > 0 && xmldsigBytes[40 - k] == 0; k--);
int l = k;
@@ -336,12 +336,12 @@ public class SignatureDSA extends Signat
asn1Bytes[2] = 2;
asn1Bytes[3] = (byte) j;
- System.arraycopy(xmldsigBytes, 20 - i, asn1Bytes, (4 + j) - i, i);
+ System.arraycopy(xmldsigBytes, 20 - i, asn1Bytes, 4 + j - i, i);
asn1Bytes[4 + j] = 2;
asn1Bytes[5 + j] = (byte) l;
- System.arraycopy(xmldsigBytes, 40 - k, asn1Bytes, (6 + j + l) - k, k);
+ System.arraycopy(xmldsigBytes, 40 - k, asn1Bytes, 6 + j + l - k, k);
return asn1Bytes;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java?rev=1511760&r1=1511759&r2=1511760&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java Thu Aug 8 12:56:09 2013
@@ -50,7 +50,7 @@ public abstract class SignatureECDSA ext
public abstract String engineGetURI();
/** Field algorithm */
- private java.security.Signature signatureAlgorithm = null;
+ private Signature signatureAlgorithm = null;
/**
* Converts an ASN.1 ECDSA value to a XML Signature ECDSA Value.
@@ -82,13 +82,13 @@ public abstract class SignatureECDSA ext
byte rLength = asn1Bytes[offset + 1];
int i;
- for (i = rLength; (i > 0) && (asn1Bytes[(offset + 2 + rLength) - i] == 0); i--);
+ for (i = rLength; i > 0 && asn1Bytes[offset + 2 + rLength - i] == 0; i--);
byte sLength = asn1Bytes[offset + 2 + rLength + 1];
int j;
for (j = sLength;
- (j > 0) && (asn1Bytes[(offset + 2 + rLength + 2 + sLength) - j] == 0); j--);
+ j > 0 && asn1Bytes[offset + 2 + rLength + 2 + sLength - j] == 0; j--);
int rawLen = Math.max(i, j);
@@ -100,9 +100,9 @@ public abstract class SignatureECDSA ext
}
byte xmldsigBytes[] = new byte[2*rawLen];
- System.arraycopy(asn1Bytes, (offset + 2 + rLength) - i, xmldsigBytes, rawLen - i, i);
- System.arraycopy(asn1Bytes, (offset + 2 + rLength + 2 + sLength) - j, xmldsigBytes,
- 2*rawLen - j, j);
+ System.arraycopy(asn1Bytes, offset + 2 + rLength - i, xmldsigBytes, rawLen - i, i);
+ System.arraycopy(asn1Bytes, offset + 2 + rLength + 2 + sLength - j, xmldsigBytes,
+ 2 * rawLen - j, j);
return xmldsigBytes;
}
@@ -126,7 +126,7 @@ public abstract class SignatureECDSA ext
int i;
- for (i = rawLen; (i > 0) && (xmldsigBytes[rawLen - i] == 0); i--);
+ for (i = rawLen; i > 0 && xmldsigBytes[rawLen - i] == 0; i--);
int j = i;
@@ -136,7 +136,7 @@ public abstract class SignatureECDSA ext
int k;
- for (k = rawLen; (k > 0) && (xmldsigBytes[2*rawLen - k] == 0); k--);
+ for (k = rawLen; k > 0 && xmldsigBytes[2*rawLen - k] == 0; k--);
int l = k;
@@ -163,14 +163,14 @@ public abstract class SignatureECDSA ext
asn1Bytes[offset++] = 2;
asn1Bytes[offset++] = (byte) j;
- System.arraycopy(xmldsigBytes, rawLen - i, asn1Bytes, (offset + j) - i, i);
+ System.arraycopy(xmldsigBytes, rawLen - i, asn1Bytes, offset + j - i, i);
offset += j;
asn1Bytes[offset++] = 2;
asn1Bytes[offset++] = (byte) l;
- System.arraycopy(xmldsigBytes, 2*rawLen - k, asn1Bytes, (offset + l) - k, k);
+ System.arraycopy(xmldsigBytes, 2*rawLen - k, asn1Bytes, offset + l - k, k);
return asn1Bytes;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/helper/AttrCompare.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/helper/AttrCompare.java?rev=1511760&r1=1511759&r2=1511760&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/helper/AttrCompare.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/helper/AttrCompare.java Thu Aug 8 12:56:09 2013
@@ -113,6 +113,6 @@ public class AttrCompare implements Comp
return a;
}
- return (attr0.getLocalName()).compareTo(attr1.getLocalName());
+ return attr0.getLocalName().compareTo(attr1.getLocalName());
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java?rev=1511760&r1=1511759&r2=1511760&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java Thu Aug 8 12:56:09 2013
@@ -87,7 +87,7 @@ public abstract class Canonicalizer11 ex
lastlevel = 0;
return;
}
- lastlevel = (levels.get(newSize - 1)).level;
+ lastlevel = levels.get(newSize - 1).level;
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java?rev=1511760&r1=1511759&r2=1511760&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java Thu Aug 8 12:56:09 2013
@@ -81,7 +81,7 @@ public abstract class Canonicalizer20010
lastlevel = 0;
return;
}
- lastlevel = (levels.get(newSize - 1)).level;
+ lastlevel = levels.get(newSize - 1).level;
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java?rev=1511760&r1=1511759&r2=1511760&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java Thu Aug 8 12:56:09 2013
@@ -423,7 +423,7 @@ public abstract class CanonicalizerBase
break;
case Node.COMMENT_NODE :
- if (this.includeComments && (isVisibleDO(currentNode, ns.getLevel()) == 1)) {
+ if (this.includeComments && isVisibleDO(currentNode, ns.getLevel()) == 1) {
outputCommentToWriter((Comment) currentNode, writer, documentLevel);
}
break;
@@ -439,8 +439,8 @@ public abstract class CanonicalizerBase
if (isVisible(currentNode)) {
outputTextToWriter(currentNode.getNodeValue(), writer);
for (Node nextSibling = currentNode.getNextSibling();
- (nextSibling != null) && ((nextSibling.getNodeType() == Node.TEXT_NODE)
- || (nextSibling.getNodeType() == Node.CDATA_SECTION_NODE));
+ nextSibling != null && (nextSibling.getNodeType() == Node.TEXT_NODE
+ || nextSibling.getNodeType() == Node.CDATA_SECTION_NODE);
nextSibling = nextSibling.getNextSibling()) {
outputTextToWriter(nextSibling.getNodeValue(), writer);
currentNode = nextSibling;
@@ -459,7 +459,7 @@ public abstract class CanonicalizerBase
sibling = currentNode.getNextSibling();
break;
}
- currentNodeIsVisible = (i == 1);
+ currentNodeIsVisible = i == 1;
if (currentNodeIsVisible) {
ns.outputNodePush();
writer.write('<');
@@ -536,13 +536,13 @@ public abstract class CanonicalizerBase
if (nodeFilter != null) {
Iterator<NodeFilter> it = nodeFilter.iterator();
while (it.hasNext()) {
- int i = (it.next()).isNodeIncludeDO(currentNode, level);
+ int i = it.next().isNodeIncludeDO(currentNode, level);
if (i != 1) {
return i;
}
}
}
- if ((this.xpathNodeSet != null) && !this.xpathNodeSet.contains(currentNode)) {
+ if (this.xpathNodeSet != null && !this.xpathNodeSet.contains(currentNode)) {
return 0;
}
return 1;
@@ -552,13 +552,13 @@ public abstract class CanonicalizerBase
if (nodeFilter != null) {
Iterator<NodeFilter> it = nodeFilter.iterator();
while (it.hasNext()) {
- int i = (it.next()).isNodeInclude(currentNode);
+ int i = it.next().isNodeInclude(currentNode);
if (i != 1) {
return i;
}
}
}
- if ((this.xpathNodeSet != null) && !this.xpathNodeSet.contains(currentNode)) {
+ if (this.xpathNodeSet != null && !this.xpathNodeSet.contains(currentNode)) {
return 0;
}
return 1;
@@ -573,7 +573,7 @@ public abstract class CanonicalizerBase
}
}
}
- if ((this.xpathNodeSet != null) && !this.xpathNodeSet.contains(currentNode)) {
+ if (this.xpathNodeSet != null && !this.xpathNodeSet.contains(currentNode)) {
return false;
}
return true;
@@ -636,7 +636,7 @@ public abstract class CanonicalizerBase
}
parents.clear();
Attr nsprefix;
- if (((nsprefix = ns.getMappingWithoutRendered(XMLNS)) != null)
+ if ((nsprefix = ns.getMappingWithoutRendered(XMLNS)) != null
&& "".equals(nsprefix.getValue())) {
ns.addMappingAndRender(XMLNS, "", nullNode);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java?rev=1511760&r1=1511759&r2=1511760&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java Thu Aug 8 12:56:09 2013
@@ -70,7 +70,7 @@ public class NameSpaceSymbTable {
while (it.hasNext()) {
NameSpaceSymbEntry n = it.next();
//put them rendered?
- if ((!n.rendered) && (n.n != null)) {
+ if (!n.rendered && n.n != null) {
n = (NameSpaceSymbEntry) n.clone();
needsClone();
symb.put(n.prefix, n);
@@ -119,7 +119,7 @@ public class NameSpaceSymbTable {
if (size == 0) {
cloned = false;
} else {
- cloned = (level.get(size - 1) != symb);
+ cloned = level.get(size - 1) != symb;
}
} else {
cloned = false;
@@ -187,7 +187,7 @@ public class NameSpaceSymbTable {
**/
public boolean addMapping(String prefix, String uri, Attr n) {
NameSpaceSymbEntry ob = symb.get(prefix);
- if ((ob != null) && uri.equals(ob.uri)) {
+ if (ob != null && uri.equals(ob.uri)) {
//If we have it previously defined. Don't keep working.
return false;
}
@@ -199,7 +199,7 @@ public class NameSpaceSymbTable {
//We have a previous definition store it for the pop.
//Check if a previous definition(not the inmidiatly one) has been rendered.
ne.lastrendered = ob.lastrendered;
- if ((ob.lastrendered != null) && (ob.lastrendered.equals(uri))) {
+ if (ob.lastrendered != null && ob.lastrendered.equals(uri)) {
//Yes it is. Mark as rendered.
ne.rendered = true;
}
@@ -218,7 +218,7 @@ public class NameSpaceSymbTable {
public Node addMappingAndRender(String prefix, String uri, Attr n) {
NameSpaceSymbEntry ob = symb.get(prefix);
- if ((ob != null) && uri.equals(ob.uri)) {
+ if (ob != null && uri.equals(ob.uri)) {
if (!ob.rendered) {
ob = (NameSpaceSymbEntry) ob.clone();
needsClone();
@@ -234,7 +234,7 @@ public class NameSpaceSymbTable {
ne.lastrendered = uri;
needsClone();
symb.put(prefix, ne);
- if ((ob != null) && (ob.lastrendered != null) && (ob.lastrendered.equals(uri))) {
+ if (ob != null && ob.lastrendered != null && ob.lastrendered.equals(uri)) {
ne.rendered = true;
return null;
}
@@ -325,7 +325,7 @@ class SymbMap implements Cloneable {
Object oldKey = keys[index];
keys[index] = key;
entries[index] = value;
- if ((oldKey == null || !oldKey.equals(key)) && (--free == 0)) {
+ if ((oldKey == null || !oldKey.equals(key)) && --free == 0) {
free = entries.length;
int newCapacity = free << 2;
rehash(newCapacity);
@@ -335,7 +335,7 @@ class SymbMap implements Cloneable {
List<NameSpaceSymbEntry> entrySet() {
List<NameSpaceSymbEntry> a = new ArrayList<NameSpaceSymbEntry>();
for (int i = 0;i < entries.length;i++) {
- if ((entries[i] != null) && !("".equals(entries[i].uri))) {
+ if (entries[i] != null && !"".equals(entries[i].uri)) {
a.add(entries[i]);
}
}
@@ -349,14 +349,14 @@ class SymbMap implements Cloneable {
int index = (obj.hashCode() & 0x7fffffff) % length;
Object cur = set[index];
- if (cur == null || (cur.equals(obj))) {
+ if (cur == null || cur.equals(obj)) {
return index;
}
length--;
do {
index = index == length ? 0 : ++index;
cur = set[index];
- } while (cur != null && (!cur.equals(obj)));
+ } while (cur != null && !cur.equals(obj));
return index;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/UtfHelpper.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/UtfHelpper.java?rev=1511760&r1=1511759&r2=1511760&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/UtfHelpper.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/UtfHelpper.java Thu Aug 8 12:56:09 2013
@@ -47,7 +47,7 @@ public final class UtfHelpper {
out.write(c);
return;
}
- if ((c >= 0xD800 && c <= 0xDBFF) || (c >= 0xDC00 && c <= 0xDFFF)) {
+ if (c >= 0xD800 && c <= 0xDBFF || c >= 0xDC00 && c <= 0xDFFF) {
//No Surrogates in sun java
out.write(0x3f);
return;
@@ -59,7 +59,7 @@ public final class UtfHelpper {
ch = (char)(c>>>12);
write = 0xE0;
if (ch > 0) {
- write |= (ch & 0x0F);
+ write |= ch & 0x0F;
}
out.write(write);
write = 0x80;
@@ -70,7 +70,7 @@ public final class UtfHelpper {
}
ch = (char)(c>>>6);
if (ch > 0) {
- write |= (ch & bias);
+ write |= ch & bias;
}
out.write(write);
out.write(0x80 | ((c) & 0x3F));
@@ -90,7 +90,7 @@ public final class UtfHelpper {
out.write(c);
continue;
}
- if ((c >= 0xD800 && c <= 0xDBFF) || (c >= 0xDC00 && c <= 0xDFFF)) {
+ if (c >= 0xD800 && c <= 0xDBFF || c >= 0xDC00 && c <= 0xDFFF) {
//No Surrogates in sun java
out.write(0x3f);
continue;
@@ -102,7 +102,7 @@ public final class UtfHelpper {
ch = (char)(c>>>12);
write = 0xE0;
if (ch > 0) {
- write |= (ch & 0x0F);
+ write |= ch & 0x0F;
}
out.write(write);
write = 0x80;
@@ -113,7 +113,7 @@ public final class UtfHelpper {
}
ch = (char)(c>>>6);
if (ch > 0) {
- write |= (ch & bias);
+ write |= ch & bias;
}
out.write(write);
out.write(0x80 | ((c) & 0x3F));
@@ -135,7 +135,7 @@ public final class UtfHelpper {
result[out++] = (byte)c;
continue;
}
- if ((c >= 0xD800 && c <= 0xDBFF) || (c >= 0xDC00 && c <= 0xDFFF)) {
+ if (c >= 0xD800 && c <= 0xDBFF || c >= 0xDC00 && c <= 0xDFFF) {
//No Surrogates in sun java
result[out++] = 0x3f;
continue;
@@ -153,7 +153,7 @@ public final class UtfHelpper {
ch = (char)(c>>>12);
write = (byte)0xE0;
if (ch > 0) {
- write |= (ch & 0x0F);
+ write |= ch & 0x0F;
}
result[out++] = write;
write = (byte)0x80;
@@ -164,7 +164,7 @@ public final class UtfHelpper {
}
ch = (char)(c>>>6);
if (ch > 0) {
- write |= (ch & bias);
+ write |= ch & bias;
}
result[out++] = write;
result[out++] = (byte)(0x80 | ((c) & 0x3F));