commons-imaging git commit: IMAGING-214: avoid code execution unless/until it is needed

[dbrosius]

Repository: commons-imaging
Updated Branches:
  refs/heads/master 51880b788 -> 0a61492fd


IMAGING-214: avoid code execution unless/until it is needed


Project: http://git-wip-us.apache.org/repos/asf/commons-imaging/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-imaging/commit/0a61492f
Tree: http://git-wip-us.apache.org/repos/asf/commons-imaging/tree/0a61492f
Diff: http://git-wip-us.apache.org/repos/asf/commons-imaging/diff/0a61492f

Branch: refs/heads/master
Commit: 0a61492fda0e82b0c01602e689f238051f9106ee
Parents: 51880b7
Author: Dave Brosius 
Authored: Mon Jan 1 19:31:22 2018 -0500
Committer: Dave Brosius 
Committed: Mon Jan 1 19:31:22 2018 -0500

--
 .../apache/commons/imaging/formats/bmp/BmpImageParser.java  | 3 +--
 .../apache/commons/imaging/formats/ico/IcoImageParser.java  | 2 +-
 .../apache/commons/imaging/formats/png/PngImageParser.java  | 3 +--
 .../apache/commons/imaging/formats/pnm/PnmImageParser.java  | 4 ++--
 .../commons/imaging/formats/tiff/TiffImageParser.java   | 9 +
 5 files changed, 10 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/0a61492f/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
--
diff --git 
a/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java 
b/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
index 1bb1b51..1fdff5d 100644
--- a/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
@@ -394,11 +394,10 @@ public class BmpImageParser extends ImageParser {
 + ((colorTable == null) ? "null" : 
Integer.toString(colorTable.length)));
 }
 
-final int pixelCount = bhi.width * bhi.height;
-
 int imageLineLength = (((bhi.bitsPerPixel) * bhi.width) + 7) / 8;
 
 if (verbose) {
+final int pixelCount = bhi.width * bhi.height;
 // this.debugNumber("Total BitsPerPixel",
 // (ExtraBitsPerPixel + bhi.BitsPerPixel), 4);
 // this.debugNumber("Total Bit Per Line",

http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/0a61492f/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
--
diff --git 
a/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java 
b/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
index 24d1066..238f6d3 100644
--- a/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
@@ -647,8 +647,8 @@ public class IcoImageParser extends ImageParser {
 final PaletteFactory paletteFactory = new PaletteFactory();
 final SimplePalette palette = 
paletteFactory.makeExactRgbPaletteSimple(src, 256);
 final int bitCount;
-final boolean hasTransparency = paletteFactory.hasTransparency(src);
 if (palette == null) {
+final boolean hasTransparency = 
paletteFactory.hasTransparency(src);
 if (hasTransparency) {
 bitCount = 32;
 } else {

http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/0a61492f/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
--
diff --git 
a/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java 
b/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
index a1a9ab4..3f703b8 100644
--- a/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
@@ -444,8 +444,6 @@ public class PngImageParser extends ImageParser {
 physicalHeightInch = (float) (height / 
(pngChunkpHYs.pixelsPerUnitYAxis * metersPerInch));
 }
 
-final String formatDetails = "Png";
-
 boolean usesPalette = false;
 
 final List PLTEs = filterChunks(chunks, ChunkType.PLTE);
@@ -468,6 +466,7 @@ public class PngImageParser extends ImageParser {
 throw new ImageReadException("Png: Unknown ColorType: " + 
pngChunkIHDR.pngColorType);
 }
 
+final String formatDetails = "Png";
 final ImageInfo.CompressionAlgorithm compressionAlgorithm = 
ImageInfo.CompressionAlgorithm.PNG_FILTER;
 
 return new PngImageInfo(formatDetails, bitsPerPixel, comments,

http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/0a61492f/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java

commons-imaging git commit: IMAGING-213: presize collections where possible

[dbrosius]

Repository: commons-imaging
Updated Branches:
  refs/heads/master 7862d6028 -> 51880b788


IMAGING-213: presize collections where possible


Project: http://git-wip-us.apache.org/repos/asf/commons-imaging/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-imaging/commit/51880b78
Tree: http://git-wip-us.apache.org/repos/asf/commons-imaging/tree/51880b78
Diff: http://git-wip-us.apache.org/repos/asf/commons-imaging/diff/51880b78

Branch: refs/heads/master
Commit: 51880b788df7130a1b6871559709b852379fbd8f
Parents: 7862d60
Author: Dave Brosius 
Authored: Mon Jan 1 19:09:33 2018 -0500
Committer: Dave Brosius 
Committed: Mon Jan 1 19:09:33 2018 -0500

--
 .../apache/commons/imaging/formats/ico/IcoImageParser.java| 2 +-
 .../apache/commons/imaging/formats/jpeg/JpegImageParser.java  | 2 +-
 .../apache/commons/imaging/formats/png/PngImageParser.java| 7 ---
 .../apache/commons/imaging/formats/tiff/TiffDirectory.java| 2 +-
 .../apache/commons/imaging/formats/tiff/TiffImageParser.java  | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/51880b78/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
--
diff --git 
a/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java 
b/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
index 0b91778..24d1066 100644
--- a/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
@@ -587,10 +587,10 @@ public class IcoImageParser extends ImageParser {
 @Override
 public List getAllBufferedImages(final ByteSource 
byteSource)
 throws ImageReadException, IOException {
-final List result = new ArrayList<>();
 final ImageContents contents = readImage(byteSource);
 
 final FileHeader fileHeader = contents.fileHeader;
+final List result = new 
ArrayList<>(fileHeader.iconCount);
 for (int i = 0; i < fileHeader.iconCount; i++) {
 final IconData iconData = contents.iconDatas[i];
 

http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/51880b78/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
--
diff --git 
a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java 
b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
index c49a739..d409f02 100644
--- a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
@@ -790,9 +790,9 @@ public class JpegImageParser extends ImageParser {
 physicalHeightInch = (float) (height / (yDensity * unitsPerInch));
 }
 
-final List comments = new ArrayList<>();
 final List commentSegments = readSegments(byteSource,
 new int[] { JpegConstants.COM_MARKER}, false);
+final List comments = new ArrayList<>(commentSegments.size());
 for (final Segment commentSegment : commentSegments) {
 final ComSegment comSegment = (ComSegment) commentSegment;
 String comment = "";

http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/51880b78/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
--
diff --git 
a/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java 
b/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
index a9ab830..a1a9ab4 100644
--- a/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
@@ -111,7 +111,7 @@ public class PngImageParser extends ImageParser {
 public List getChunkTypes(final InputStream is)
 throws ImageReadException, IOException {
 final List chunks = readChunks(is, null, false);
-final List chunkTypes = new ArrayList<>();
+final List chunkTypes = new ArrayList<>(chunks.size());
 for (final PngChunk chunk : chunks) {
 chunkTypes.add(getChunkTypeName(chunk.chunkType));
 }
@@ -392,8 +392,9 @@ public class PngImageParser extends ImageParser {
 final List zTXts = filterChunks(chunks, ChunkType.zTXt);
 final List iTXts = filterChunks(chunks, ChunkType.iTXt);
 
-final List comments = new ArrayList<>();
-final List textChunks = new ArrayList<>();
+int chunkCount = tEXts.size() + zTXts.size() + iTXts.size();
+final List 

commons-imaging git commit: IMAGING-212: use StandardCharsets to avoid reflection and UnsupportedEncodingExceptions

[dbrosius]

Repository: commons-imaging
Updated Branches:
  refs/heads/master 4701b9628 -> 7862d6028


IMAGING-212: use StandardCharsets to avoid reflection and 
UnsupportedEncodingExceptions


Project: http://git-wip-us.apache.org/repos/asf/commons-imaging/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-imaging/commit/7862d602
Tree: http://git-wip-us.apache.org/repos/asf/commons-imaging/tree/7862d602
Diff: http://git-wip-us.apache.org/repos/asf/commons-imaging/diff/7862d602

Branch: refs/heads/master
Commit: 7862d6028dafff8cd2b117b1cae0525ca655ba20
Parents: 4701b96
Author: Dave Brosius 
Authored: Mon Jan 1 15:51:43 2018 -0500
Committer: Dave Brosius 
Committed: Mon Jan 1 15:51:43 2018 -0500

--
 .../imaging/formats/gif/GifImageParser.java | 28 ++---
 .../commons/imaging/formats/icns/IcnsType.java  | 15 ++-
 .../imaging/formats/jpeg/JpegImageParser.java   |  7 +---
 .../imaging/formats/jpeg/iptc/IptcParser.java   |  7 ++--
 .../formats/jpeg/segments/App14Segment.java |  9 +
 .../imaging/formats/jpeg/xmp/JpegXmpParser.java | 10 ++---
 .../formats/jpeg/xmp/JpegXmpRewriter.java   |  3 +-
 .../commons/imaging/formats/png/ChunkType.java  |  9 +
 .../commons/imaging/formats/png/PngWriter.java  | 37 --
 .../formats/png/chunks/PngChunkIccp.java|  3 +-
 .../formats/png/chunks/PngChunkItxt.java| 11 +++---
 .../formats/png/chunks/PngChunkScal.java|  5 ++-
 .../formats/png/chunks/PngChunkText.java|  5 ++-
 .../formats/png/chunks/PngChunkZtxt.java|  5 ++-
 .../commons/imaging/formats/pnm/PamWriter.java  | 13 ---
 .../commons/imaging/formats/pnm/PbmWriter.java  |  7 ++--
 .../commons/imaging/formats/pnm/PgmWriter.java  |  9 +++--
 .../commons/imaging/formats/pnm/PpmWriter.java  | 13 ---
 .../imaging/formats/psd/ImageResourceBlock.java |  6 +--
 .../imaging/formats/psd/PsdImageParser.java | 12 ++
 .../imaging/formats/tiff/TiffImageParser.java   | 11 ++
 .../formats/tiff/fieldtypes/FieldTypeAscii.java | 41 +---
 .../formats/tiff/taginfos/TagInfoAscii.java | 20 --
 .../formats/tiff/taginfos/TagInfoGpsText.java   | 18 +++--
 .../formats/tiff/taginfos/TagInfoXpString.java  | 32 ++-
 .../formats/tiff/write/TiffImageWriterBase.java |  3 +-
 .../imaging/formats/xbm/XbmImageParser.java | 21 +-
 .../imaging/formats/xpm/XpmImageParser.java | 21 +-
 .../org/apache/commons/imaging/icc/IccTag.java  |  5 ++-
 .../commons/imaging/icc/IccTagDataTypes.java|  7 ++--
 30 files changed, 161 insertions(+), 232 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-imaging/blob/7862d602/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
--
diff --git 
a/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java 
b/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
index f3d4e67..32c603d 100644
--- a/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
@@ -33,8 +33,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
 import java.nio.ByteOrder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -290,7 +290,7 @@ public class GifImageParser extends ImageParser {
 if (formatCompliance != null) {
 formatCompliance.addComment(
 "Unknown Application Extension ("
-+ new String(label, "US-ASCII") + ")",
++ new String(label, 
StandardCharsets.US_ASCII) + ")",
 completeCode);
 }
 
@@ -508,7 +508,7 @@ public class GifImageParser extends ImageParser {
 for (final GifBlock block : blocks) {
 if (block.blockCode == code) {
 final byte[] bytes = ((GenericGifBlock) 
block).appendSubBlocks();
-result.add(new String(bytes, "US-ASCII"));
+result.add(new String(bytes, StandardCharsets.US_ASCII));
 }
 }
 
@@ -870,7 +870,7 @@ public class GifImageParser extends ImageParser {
 bos.write(XMP_APPLICATION_ID_AND_AUTH_CODE.length); // 0x0B
 bos.write(XMP_APPLICATION_ID_AND_AUTH_CODE);
 
-final byte[] xmpXmlBytes = xmpXml.getBytes("utf-8");
+final byte[] xmpXmlBytes = xmpXml.getBytes(StandardCharsets.UTF_8);
 bos.write(xmpXmlBytes);
 
  

svn commit: r1819412 - /commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanMap.java

[dbrosius]

Author: dbrosius
Date: Thu Dec 28 09:52:09 2017
New Revision: 1819412

URL: http://svn.apache.org/viewvc?rev=1819412=rev
Log:
remove unnecessary field masking from local variables

Modified:

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanMap.java

Modified: 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanMap.java
URL: 
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanMap.java?rev=1819412=1819411=1819412=diff
==
--- 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanMap.java
 (original)
+++ 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanMap.java
 Thu Dec 28 09:52:09 2017
@@ -69,7 +69,7 @@ public class BeanMap extends AbstractMap
 
 /**
  * This HashMap has been made unmodifiable to prevent issues when
- * loaded in a shared ClassLoader enviroment.
+ * loaded in a shared ClassLoader environment.
  *
  * @see "http://issues.apache.org/jira/browse/BEANUTILS-112;
  * @deprecated Use {@link BeanMap#getTypeTransformer(Class)} method
@@ -127,9 +127,9 @@ public class BeanMap extends AbstractMap
 };
 
 private static Map<Class, Transformer> 
createTypeTransformers() {
-final Map<Class, Transformer> defaultTransformers =
+final Map<Class, Transformer> defTransformers =
 new HashMap<>();
-defaultTransformers.put(
+defTransformers.put(
 Boolean.TYPE,
 new Transformer() {
 @Override
@@ -138,7 +138,7 @@ public class BeanMap extends AbstractMap
 }
 }
 );
-defaultTransformers.put(
+defTransformers.put(
 Character.TYPE,
 new Transformer() {
 @Override
@@ -147,7 +147,7 @@ public class BeanMap extends AbstractMap
 }
 }
 );
-defaultTransformers.put(
+defTransformers.put(
 Byte.TYPE,
 new Transformer() {
 @Override
@@ -156,7 +156,7 @@ public class BeanMap extends AbstractMap
 }
 }
 );
-defaultTransformers.put(
+defTransformers.put(
 Short.TYPE,
 new Transformer() {
 @Override
@@ -165,7 +165,7 @@ public class BeanMap extends AbstractMap
 }
 }
 );
-defaultTransformers.put(
+defTransformers.put(
 Integer.TYPE,
 new Transformer() {
 @Override
@@ -174,7 +174,7 @@ public class BeanMap extends AbstractMap
 }
 }
 );
-defaultTransformers.put(
+defTransformers.put(
 Long.TYPE,
 new Transformer() {
 @Override
@@ -183,7 +183,7 @@ public class BeanMap extends AbstractMap
 }
 }
 );
-defaultTransformers.put(
+defTransformers.put(
 Float.TYPE,
 new Transformer() {
 @Override
@@ -192,7 +192,7 @@ public class BeanMap extends AbstractMap
 }
 }
 );
-defaultTransformers.put(
+defTransformers.put(
 Double.TYPE,
 new Transformer() {
 @Override
@@ -201,7 +201,7 @@ public class BeanMap extends AbstractMap
 }
 }
 );
-return defaultTransformers;
+return defTransformers;
 }
 
 
@@ -763,7 +763,7 @@ public class BeanMap extends AbstractMap
 /**
  * Map entry used by {@link BeanMap}.
  */
-protected static class Entry extends AbstractMapEntry {
+protected static class Entry extends AbstractMapEntry<Object, Object> {
 private final BeanMap owner;
 
 /**
@@ -815,9 +815,9 @@ public class BeanMap extends AbstractMap
 throws IllegalAccessException, ClassCastException {
 try {
 if ( value != null ) {
-final Class[] types = 
method.getParameterTypes();
-if ( types != null && types.length > 0 ) {
-final Class paramType = types[0];
+final Class[] parmTypes = 
method.getParameterTypes();
+if ( parmTypes != null && parmTypes.length > 0 ) {
+final Class paramType = parmTypes[0];
 if ( ! paramType.isAssignableFrom( value.getClass() ) ) {
 value = convertType( paramType, value );
 }
@@ -878,9 +878,8 @@ public class BeanMap extends AbstractMap
 throws InstantiationException, IllegalAccessException, 
IllegalArgumentException, InvocationTargetException {
 
 // try call constructor
-   

svn commit: r1819380 - /commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/MethodUtils.java

[dbrosius]

Author: dbrosius
Date: Wed Dec 27 23:25:40 2017
New Revision: 1819380

URL: http://svn.apache.org/viewvc?rev=1819380=rev
Log:
delay execution of code unless/until needed

Modified:

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/MethodUtils.java

Modified: 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/MethodUtils.java
URL: 
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/MethodUtils.java?rev=1819380=1819379=1819380=diff
==
--- 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/MethodUtils.java
 (original)
+++ 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/MethodUtils.java
 Wed Dec 27 23:25:40 2017
@@ -787,11 +787,11 @@ public class MethodUtils {
 if (clazz == null) {
 clazz = method.getDeclaringClass();
 } else {
-sameClass = clazz.equals(method.getDeclaringClass());
 if (!method.getDeclaringClass().isAssignableFrom(clazz)) {
 throw new IllegalArgumentException(clazz.getName() +
 " is not assignable from " + 
method.getDeclaringClass().getName());
 }
+sameClass = clazz.equals(method.getDeclaringClass());
 }
 
 // If the class is public, we are done

svn commit: r1819251 - in /commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils: ./ converters/

[dbrosius]

Author: dbrosius
Date: Mon Dec 25 17:16:22 2017
New Revision: 1819251

URL: http://svn.apache.org/viewvc?rev=1819251=rev
Log:
better generics handling

Modified:

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/JDBCDynaClass.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ResultSetDynaClass.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractArrayConverter.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/DoubleArrayConverter.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/FloatArrayConverter.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/IntegerArrayConverter.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/LongArrayConverter.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ShortArrayConverter.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/StringArrayConverter.java

Modified: 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/JDBCDynaClass.java
URL: 
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/JDBCDynaClass.java?rev=1819251=1819250=1819251=diff
==
--- 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/JDBCDynaClass.java
 (original)
+++ 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/JDBCDynaClass.java
 Mon Dec 25 17:16:22 2017
@@ -25,6 +25,7 @@ import java.sql.SQLException;
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -236,7 +237,7 @@ abstract class JDBCDynaClass implements
 protected void introspect(final ResultSet resultSet) throws SQLException {
 
 // Accumulate an ordered list of DynaProperties
-final ArrayList list = new ArrayList();
+final List list = new ArrayList();
 final ResultSetMetaData metadata = resultSet.getMetaData();
 final int n = metadata.getColumnCount();
 for (int i = 1; i <= n; i++) { // JDBC is one-relative!

Modified: 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ResultSetDynaClass.java
URL: 
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ResultSetDynaClass.java?rev=1819251=1819250=1819251=diff
==
--- 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ResultSetDynaClass.java
 (original)
+++ 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ResultSetDynaClass.java
 Mon Dec 25 17:16:22 2017
@@ -62,7 +62,7 @@ import java.util.Iterator;
  * use the following code to create standalone copies of the information in
  * a result set:
  * 
- *   ArrayList results = new ArrayList(); // To hold copied list
+ *   List results = new ArrayList(); // To hold copied list
  *   ResultSetDynaClass rsdc = ...;
  *   DynaProperty[] properties = rsdc.getDynaProperties();
  *   BasicDynaClass bdc =

Modified: 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractArrayConverter.java
URL: 
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractArrayConverter.java?rev=1819251=1819250=1819251=diff
==
--- 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractArrayConverter.java
 (original)
+++ 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractArrayConverter.java
 Mon Dec 25 17:16:22 2017
@@ -158,7 +158,7 @@ public abstract class AbstractArrayConve
  * @throws NullPointerException if svalue
  *  is null
  */
-protected List parseElements(String svalue) {
+protected List parseElements(String svalue) {
 
 // Validate the passed argument
 if (svalue == null) {
@@ -185,7 +185,7 @@ public abstract class AbstractArrayConve
 st.wordChars('-', '-');
 
 // Split comma-delimited tokens into a List
-final ArrayList list = new ArrayList();
+final List list = 

svn commit: r1819245 - in /commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils: ./ converters/ locale/converters/

[dbrosius]

Author: dbrosius
Date: Mon Dec 25 12:29:26 2017
New Revision: 1819245

URL: http://svn.apache.org/viewvc?rev=1819245=rev
Log:
don't use boxed primitive constructors

Modified:

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BasicDynaBean.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/LazyDynaBean.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CharacterConverter.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/NumberConverter.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverter.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverter.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverter.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverter.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverter.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverter.java

Modified: 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BasicDynaBean.java
URL: 
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BasicDynaBean.java?rev=1819245=1819244=1819245=diff
==
--- 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BasicDynaBean.java
 (original)
+++ 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BasicDynaBean.java
 Mon Dec 25 12:29:26 2017
@@ -157,19 +157,19 @@ public class BasicDynaBean implements Dy
 if (type == Boolean.TYPE) {
 return (Boolean.FALSE);
 } else if (type == Byte.TYPE) {
-return (new Byte((byte) 0));
+return (Byte.valueOf((byte) 0));
 } else if (type == Character.TYPE) {
-return (new Character((char) 0));
+return (Character.valueOf((char) 0));
 } else if (type == Double.TYPE) {
-return (new Double(0.0));
+return (Double.valueOf(0.0));
 } else if (type == Float.TYPE) {
-return (new Float((float) 0.0));
+return (Float.valueOf((float) 0.0));
 } else if (type == Integer.TYPE) {
-return (new Integer(0));
+return (Integer.valueOf(0));
 } else if (type == Long.TYPE) {
-return (new Long(0));
+return (Long.valueOf(0));
 } else if (type == Short.TYPE) {
-return (new Short((short) 0));
+return (Short.valueOf((short) 0));
 } else {
 return (null);
 }

Modified: 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java
URL: 
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java?rev=1819245=1819244=1819245=diff
==
--- 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java
 (original)
+++ 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java
 Mon Dec 25 12:29:26 2017
@@ -141,7 +141,7 @@ public class BeanMap extends AbstractMap
 Character.TYPE,
 new Transformer() {
 public Object transform( final Object input ) {
-return new Character( input.toString().charAt( 0 ) );
+return Character.valueOf( input.toString().charAt( 0 ) );
 }
 }
 );

Modified: 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java
URL: 
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java?rev=1819245=1819244=1819245=diff
==
--- 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java
 (original)
+++ 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java
 Mon Dec 25 12:29:26 2017
@@ -128,8 +128,8 @@ import org.apache.commons.logging.LogFac
 
 public class ConvertUtilsBean {
 
-private static final Integer ZERO = new Integer(0

svn commit: r1819244 - in /commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils: BeanUtilsBean.java ConvertUtilsBean.java PropertyUtilsBean.java locale/LocaleConvertUtilsBean.java

[dbrosius]

Author: dbrosius
Date: Mon Dec 25 11:59:20 2017
New Revision: 1819244

URL: http://svn.apache.org/viewvc?rev=1819244=rev
Log:
fix logging contexts

Modified:

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanUtilsBean.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java

Modified: 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanUtilsBean.java
URL: 
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanUtilsBean.java?rev=1819244=1819243=1819244=diff
==
--- 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanUtilsBean.java
 (original)
+++ 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanUtilsBean.java
 Mon Dec 25 11:59:20 2017
@@ -92,7 +92,7 @@ public class BeanUtilsBean {
 /**
  * Logging for this instance
  */
-private final Log log = LogFactory.getLog(BeanUtils.class);
+private final Log log = LogFactory.getLog(BeanUtilsBean.class);
 
 /** Used to perform conversions between object types when setting 
properties */
 private final ConvertUtilsBean convertUtilsBean;

Modified: 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java
URL: 
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java?rev=1819244=1819243=1819244=diff
==
--- 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java
 (original)
+++ 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java
 Mon Dec 25 11:59:20 2017
@@ -153,7 +153,7 @@ public class ConvertUtilsBean {
 /**
  * The Log instance for this class.
  */
-private final Log log = LogFactory.getLog(ConvertUtils.class);
+private final Log log = LogFactory.getLog(ConvertUtilsBean.class);
 
 // --- Constructors
 

Modified: 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java
URL: 
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java?rev=1819244=1819243=1819244=diff
==
--- 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java
 (original)
+++ 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java
 Mon Dec 25 11:59:20 2017
@@ -120,7 +120,7 @@ public class PropertyUtilsBean {
 private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
 
 /** Log instance */
-private final Log log = LogFactory.getLog(PropertyUtils.class);
+private final Log log = LogFactory.getLog(PropertyUtilsBean.class);
 
 /** The list with BeanIntrospector objects. */
 private final List introspectors;

Modified: 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java
URL: 
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java?rev=1819244=1819243=1819244=diff
==
--- 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java
 (original)
+++ 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java
 Mon Dec 25 11:59:20 2017
@@ -103,7 +103,7 @@ public class LocaleConvertUtilsBean {
 private boolean applyLocalized = false;
 
 /** The Log instance for this class. */
-private final Log log = LogFactory.getLog(LocaleConvertUtils.class);
+private final Log log = LogFactory.getLog(LocaleConvertUtilsBean.class);
 
 /** Every entry of the mapConverters is:
  *  key = locale

svn commit: r1819243 - in /commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils: BeanMap.java PropertyUtilsBean.java WrapDynaClass.java

[dbrosius]

Author: dbrosius
Date: Mon Dec 25 11:55:51 2017
New Revision: 1819243

URL: http://svn.apache.org/viewvc?rev=1819243=rev
Log:
use enhanced for loops where possible

Modified:

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java

Modified: 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java
URL: 
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java?rev=1819243=1819242=1819243=diff
==
--- 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java
 (original)
+++ 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java
 Mon Dec 25 11:55:51 2017
@@ -294,9 +294,7 @@ public class BeanMap extends AbstractMap
 // copy only properties that are readable and writable.  If its
 // not readable, we can't get the value from the old map.  If
 // its not writable, we can't write a value into the new map.
-final Iterator readableKeys = readMethods.keySet().iterator();
-while(readableKeys.hasNext()) {
-final Object key = readableKeys.next();
+for (Object key : readMethods.keySet()) {
 if(getWriteMethod(key) != null) {
 newMap.put(key, get(key));
 }
@@ -319,9 +317,7 @@ public class BeanMap extends AbstractMap
  * @param map  the BeanMap whose properties to put
  */
 public void putAllWriteable(final BeanMap map) {
-final Iterator readableKeys = map.readMethods.keySet().iterator();
-while (readableKeys.hasNext()) {
-final Object key = readableKeys.next();
+for (Object key : map.readMethods.keySet()) {
 if (getWriteMethod(key) != null) {
 this.put(key, map.get(key));
 }

Modified: 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java
URL: 
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java?rev=1819243=1819242=1819243=diff
==
--- 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java
 (original)
+++ 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java
 Mon Dec 25 11:55:51 2017
@@ -297,9 +297,7 @@ public class PropertyUtilsBean {
 }
 }
 } else if (orig instanceof Map) {
-final Iterator entries = ((Map) 
orig).entrySet().iterator();
-while (entries.hasNext()) {
-final Map.Entry entry = (Entry) entries.next();
+for (Map.Entry entry : ((Map) orig).entrySet()) {
 final String name = (String)entry.getKey();
 if (isWriteable(dest, name)) {
 try {

Modified: 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java
URL: 
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java?rev=1819243=1819242=1819243=diff
==
--- 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java
 (original)
+++ 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java
 Mon Dec 25 11:55:51 2017
@@ -476,11 +476,10 @@ public class WrapDynaClass implements Dy
 properties[i]);
 }
 int j = regulars.length;
-final Iterator names = mappeds.keySet().iterator();
-while (names.hasNext()) {
-final String name = (String) names.next();
+for (Map.Entry entry : mappeds.entrySet()) {
+final String name = (String) entry.getKey();
 final PropertyDescriptor descriptor =
-(PropertyDescriptor) mappeds.get(name);
+(PropertyDescriptor) entry.getValue();
 properties[j] =
 new DynaProperty(descriptor.getName(),
 Map.class);

commons-scxml git commit: call static methods from static contexts

[dbrosius]

Repository: commons-scxml
Updated Branches:
  refs/heads/master 526c83a5f -> 9fb7a6368


call static methods from static contexts


Project: http://git-wip-us.apache.org/repos/asf/commons-scxml/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-scxml/commit/9fb7a636
Tree: http://git-wip-us.apache.org/repos/asf/commons-scxml/tree/9fb7a636
Diff: http://git-wip-us.apache.org/repos/asf/commons-scxml/diff/9fb7a636

Branch: refs/heads/master
Commit: 9fb7a6368684ce4f07db72c4310fc380388f120a
Parents: 526c83a
Author: Dave Brosius 
Authored: Sun Dec 24 17:06:44 2017 -0500
Committer: Dave Brosius 
Committed: Sun Dec 24 17:06:44 2017 -0500

--
 src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-scxml/blob/9fb7a636/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
--
diff --git a/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java 
b/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
index 8446b0e..4b3c8dd 100644
--- a/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
+++ b/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
@@ -2100,8 +2100,8 @@ public final class SCXMLReader {
 }
 }
 else if (children.getLength() == 1 && (cdata || 
child.getNodeType() == Node.TEXT_NODE )) {
-String text = 
configuration.contentParser.trimContent(child.getNodeValue());
-if (configuration.contentParser.hasJsonSignature(text)) {
+String text = ContentParser.trimContent(child.getNodeValue());
+if (ContentParser.hasJsonSignature(text)) {
 try {
 valueContainer.setParsedValue(new 
JsonValue(configuration.contentParser.parseJson(text), cdata));
 } catch (IOException e) {
@@ -2109,7 +2109,7 @@ public final class SCXMLReader {
 }
 }
 else {
-valueContainer.setParsedValue(new 
TextValue(configuration.contentParser.spaceNormalizeContent(text),
+valueContainer.setParsedValue(new 
TextValue(ContentParser.spaceNormalizeContent(text),
 cdata));
 }
 } else if (children.getLength() == 1) {

commons-scxml git commit: remove collecting of attributes as they are not used

[dbrosius]

Repository: commons-scxml
Updated Branches:
  refs/heads/master a721a26fa -> 526c83a5f


remove collecting of attributes as they are not used


Project: http://git-wip-us.apache.org/repos/asf/commons-scxml/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-scxml/commit/526c83a5
Tree: http://git-wip-us.apache.org/repos/asf/commons-scxml/tree/526c83a5
Diff: http://git-wip-us.apache.org/repos/asf/commons-scxml/diff/526c83a5

Branch: refs/heads/master
Commit: 526c83a5f9bf794afb6e0336630b86cef26d84bf
Parents: a721a26
Author: Dave Brosius 
Authored: Sun Dec 24 16:59:06 2017 -0500
Committer: Dave Brosius 
Committed: Sun Dec 24 16:59:06 2017 -0500

--
 src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-scxml/blob/526c83a5/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
--
diff --git a/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java 
b/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
index cbe9aea..8446b0e 100644
--- a/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
+++ b/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
@@ -2016,12 +2016,10 @@ public final class SCXMLReader {
 actionWrapper.getNamespaces().putAll(namespaces);
 }
 
-Map attributes = new HashMap<>();
 for (int i = 0; i < reader.getAttributeCount(); i++) {
 String name = reader.getAttributeLocalName(i);
 String qname = createQualifiedName(reader.getAttributePrefix(i), 
name);
 String value = reader.getAttributeValue(i);
-attributes.put(qname, value);
 String setter = "set" + name.substring(0, 1).toUpperCase() + 
name.substring(1);
 Method method;
 try {

commons-scxml git commit: break out of search loop after correct custom action is found

[dbrosius]

Repository: commons-scxml
Updated Branches:
  refs/heads/master 99d942b55 -> a721a26fa


break out of search loop after correct custom action is found


Project: http://git-wip-us.apache.org/repos/asf/commons-scxml/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-scxml/commit/a721a26f
Tree: http://git-wip-us.apache.org/repos/asf/commons-scxml/tree/a721a26f
Diff: http://git-wip-us.apache.org/repos/asf/commons-scxml/diff/a721a26f

Branch: refs/heads/master
Commit: a721a26fad811ba618ff4fbf6371a43f851fb21e
Parents: 99d942b
Author: Dave Brosius 
Authored: Sun Dec 24 15:49:39 2017 -0500
Committer: Dave Brosius 
Committed: Sun Dec 24 15:49:39 2017 -0500

--
 src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/commons-scxml/blob/a721a26f/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
--
diff --git a/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java 
b/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
index eeac7f2..cbe9aea 100644
--- a/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
+++ b/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
@@ -1511,6 +1511,7 @@ public final class SCXMLReader {
 for (CustomAction ca : 
configuration.customActions) {
 if (ca.getNamespaceURI().equals(nsURI) && 
ca.getLocalName().equals(name)) {
 customAction = ca;
+break;
 }
 }
 }

svn commit: r1819186 - in /commons/proper/beanutils/trunk: ./ src/main/java/org/apache/commons/beanutils/ src/main/java/org/apache/commons/beanutils/locale/ src/test/java/org/apache/commons/beanutils/

[dbrosius]

Author: dbrosius
Date: Sat Dec 23 22:22:43 2017
New Revision: 1819186

URL: http://svn.apache.org/viewvc?rev=1819186=rev
Log:
BEANUTILS-500: upgrade to commons-collections4

Modified:
commons/proper/beanutils/trunk/pom.xml

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanComparator.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanPredicate.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosure.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicate.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanToPropertyValueTransformer.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanUtils.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtils.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/WeakFastHashMap.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtils.java

commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java

commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanMapTestCase.java

commons/proper/beanutils/trunk/src/test/java/org/apache/commons/beanutils/BeanPredicateTestCase.java

Modified: commons/proper/beanutils/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/pom.xml?rev=1819186=1819185=1819186=diff
==
--- commons/proper/beanutils/trunk/pom.xml (original)
+++ commons/proper/beanutils/trunk/pom.xml Sat Dec 23 22:22:43 2017
@@ -319,9 +319,9 @@
   1.2
 
 
-  commons-collections
-  commons-collections
-  3.2.2
+  org.apache.commons
+  commons-collections4
+  4.1
 
 
   commons-collections
@@ -339,9 +339,6 @@
 
   
   
-
-
-
 
   org.apache.maven.plugins
   maven-surefire-plugin

Modified: 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanComparator.java
URL: 
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanComparator.java?rev=1819186=1819185=1819186=diff
==
--- 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanComparator.java
 (original)
+++ 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanComparator.java
 Sat Dec 23 22:22:43 2017
@@ -21,7 +21,7 @@ import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Comparator;
 
-import org.apache.commons.collections.comparators.ComparableComparator;
+import org.apache.commons.collections4.comparators.ComparableComparator;
 
 /**
  * 
@@ -84,7 +84,7 @@ public class BeanComparator implement
  * If the property passed in is null then the actual objects will be 
compared
  */
 public BeanComparator( final String property ) {
-this( property, ComparableComparator.getInstance() );
+this( property, ComparableComparator.INSTANCE );
 }
 
 /**
@@ -108,7 +108,7 @@ public class BeanComparator implement
 if (comparator != null) {
 this.comparator = comparator;
 } else {
-this.comparator = ComparableComparator.getInstance();
+this.comparator = ComparableComparator.INSTANCE;
 }
 }
 

Modified: 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java
URL: 
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java?rev=1819186=1819185=1819186=diff
==
--- 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java
 (original)
+++ 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java
 Sat Dec 23 22:22:43 2017
@@ -33,8 +33,8 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.keyvalue.AbstractMapEntry;
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.collections4.keyvalue.AbstractMapEntry;
 
 /**
  * An implementation of Map for JavaBeans which uses introspection to

Modified: 
commons/proper/beanutils

svn commit: r1811486 - /commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerificationResult.java

[dbrosius]

Author: dbrosius
Date: Sun Oct  8 12:49:43 2017
New Revision: 1811486

URL: http://svn.apache.org/viewvc?rev=1811486=rev
Log:
fix javadoc typo: patch by Michael Ernst <mer...@cs.washington.edu>

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerificationResult.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerificationResult.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerificationResult.java?rev=1811486=1811485=1811486=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerificationResult.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerificationResult.java
 Sun Oct  8 12:49:43 2017
@@ -70,7 +70,7 @@ public class VerificationResult {
 
 
 /**
- * Returns one one the {@link #VERIFIED_OK}, {@link #VERIFIED_NOTYET},
+ * Returns one of the {@link #VERIFIED_OK}, {@link #VERIFIED_NOTYET},
  * {@link #VERIFIED_REJECTED} constants.
  */
 public int getStatus() {

svn commit: r1804943 - /commons/proper/discovery/trunk/src/main/java/org/apache/commons/discovery/log/SimpleLog.java

[dbrosius]

Author: dbrosius
Date: Sun Aug 13 19:33:21 2017
New Revision: 1804943

URL: http://svn.apache.org/viewvc?rev=1804943=rev
Log:
use StringBuilder over StringBuffer

Modified:

commons/proper/discovery/trunk/src/main/java/org/apache/commons/discovery/log/SimpleLog.java

Modified: 
commons/proper/discovery/trunk/src/main/java/org/apache/commons/discovery/log/SimpleLog.java
URL: 
http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/main/java/org/apache/commons/discovery/log/SimpleLog.java?rev=1804943=1804942=1804943=diff
==
--- 
commons/proper/discovery/trunk/src/main/java/org/apache/commons/discovery/log/SimpleLog.java
 (original)
+++ 
commons/proper/discovery/trunk/src/main/java/org/apache/commons/discovery/log/SimpleLog.java
 Sun Aug 13 19:33:21 2017
@@ -197,8 +197,8 @@ public class SimpleLog implements Log {
  * @param t The error cause, if any
  */
 protected void log(int type, Object message, Throwable t) {
-// use a string buffer for better performance
-StringBuffer buf = new StringBuffer();
+// use a string builder for better performance
+StringBuilder buf = new StringBuilder();
 
 // append date-time if so configured
 if(showDateTime) {

svn commit: r1773000 - /commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEDYNAMIC.java

[dbrosius]

Author: dbrosius
Date: Wed Dec  7 01:38:05 2016
New Revision: 1773000

URL: http://svn.apache.org/viewvc?rev=1773000=rev
Log:
Jira Issue #284 Handle InvokeDynamic.getReferenceType() sanely

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEDYNAMIC.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEDYNAMIC.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEDYNAMIC.java?rev=1773000=1772999=1773000=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEDYNAMIC.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEDYNAMIC.java
 Wed Dec  7 01:38:05 2016
@@ -127,4 +127,18 @@ public class INVOKEDYNAMIC extends Invok
 final ConstantInvokeDynamic cid = (ConstantInvokeDynamic) 
cp.getConstant(super.getIndex(), Const.CONSTANT_InvokeDynamic);
 return ((ConstantNameAndType) 
cp.getConstant(cid.getNameAndTypeIndex())).getName(cp);
 }
+
+
+/**
+ * Since InvokeDynamic doesn't refer to a reference type, just return 
java.lang.Object, 
+ * as that is the only type we can say for sure the reference will be.
+ * 
+ * @param cpg
+ *the ConstantPoolGen used to create the instruction
+ * @return an ObjectType for java.lang.Object
+ */
+@Override
+public ReferenceType getReferenceType(final ConstantPoolGen cpg) {
+return new ObjectType(Object.class.getName());
+}
 }

svn commit: r1767112 - /commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/MemorySensitiveClassPathRepository.java

[dbrosius]

Author: dbrosius
Date: Sat Oct 29 16:24:05 2016
New Revision: 1767112

URL: http://svn.apache.org/viewvc?rev=1767112=rev
Log:
follow BCEL's field naming pattern

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/MemorySensitiveClassPathRepository.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/MemorySensitiveClassPathRepository.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/MemorySensitiveClassPathRepository.java?rev=1767112=1767111=1767112=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/MemorySensitiveClassPathRepository.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/MemorySensitiveClassPathRepository.java
 Sat Oct 29 16:24:05 2016
@@ -35,11 +35,11 @@ import org.apache.bcel.classfile.JavaCla
  */
 public class MemorySensitiveClassPathRepository implements Repository {
 
-private ClassPath path = null;
-private final Map<String, SoftReference> loadedClasses = new 
HashMap<>(); // CLASSNAME X JAVACLASS
+private ClassPath _path = null;
+private final Map<String, SoftReference> _loadedClasses = new 
HashMap<>(); // CLASSNAME X JAVACLASS
 
 public MemorySensitiveClassPathRepository(final ClassPath path) {
-this.path = path;
+this._path = path;
 }
 
 /**
@@ -47,7 +47,7 @@ public class MemorySensitiveClassPathRep
  */
 @Override
 public void storeClass(final JavaClass clazz) {
-loadedClasses.put(clazz.getClassName(), new SoftReference<>(clazz));
+_loadedClasses.put(clazz.getClassName(), new SoftReference<>(clazz));
 clazz.setRepository(this);
 }
 
@@ -56,7 +56,7 @@ public class MemorySensitiveClassPathRep
  */
 @Override
 public void removeClass(final JavaClass clazz) {
-loadedClasses.remove(clazz.getClassName());
+_loadedClasses.remove(clazz.getClassName());
 }
 
 /**
@@ -64,7 +64,7 @@ public class MemorySensitiveClassPathRep
  */
 @Override
 public JavaClass findClass(final String className) {
-final SoftReference ref = loadedClasses.get(className);
+final SoftReference ref = _loadedClasses.get(className);
 if (ref == null) {
 return null;
 }
@@ -92,7 +92,7 @@ public class MemorySensitiveClassPathRep
 return clazz;
 }
 try {
-return loadClass(path.getInputStream(className), className);
+return loadClass(_path.getInputStream(className), className);
 } catch (final IOException e) {
 throw new ClassNotFoundException("Exception while looking for 
class " + className + ": " + e, e);
 }
@@ -158,7 +158,7 @@ public class MemorySensitiveClassPathRep
  */
 @Override
 public ClassPath getClassPath() {
-return path;
+return _path;
 }
 
 /**
@@ -166,6 +166,6 @@ public class MemorySensitiveClassPathRep
  */
 @Override
 public void clear() {
-loadedClasses.clear();
+_loadedClasses.clear();
 }
 }

svn commit: r1762198 - /commons/proper/el/trunk/src/java/org/apache/commons/el/FunctionInvocation.java

[dbrosius]

Author: dbrosius
Date: Sun Sep 25 12:43:05 2016
New Revision: 1762198

URL: http://svn.apache.org/viewvc?rev=1762198=rev
Log:
throw proper exception, instead of NPE when the target can't be found

Modified:

commons/proper/el/trunk/src/java/org/apache/commons/el/FunctionInvocation.java

Modified: 
commons/proper/el/trunk/src/java/org/apache/commons/el/FunctionInvocation.java
URL: 
http://svn.apache.org/viewvc/commons/proper/el/trunk/src/java/org/apache/commons/el/FunctionInvocation.java?rev=1762198=1762197=1762198=diff
==
--- 
commons/proper/el/trunk/src/java/org/apache/commons/el/FunctionInvocation.java 
(original)
+++ 
commons/proper/el/trunk/src/java/org/apache/commons/el/FunctionInvocation.java 
Sun Sep 25 12:43:05 2016
@@ -104,8 +104,8 @@ public class FunctionInvocation
 String message = MessageUtil.getMessageWithArgs(
 Constants.UNKNOWN_FUNCTION, functionName);
 log.error(message);
-throw new ELException(message);
 }
+throw new ELException(message);
 }  
 
 // ensure that the number of arguments matches the number of parameters

svn commit: r1751107 - /commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java

[dbrosius]

Author: dbrosius
Date: Sun Jul  3 02:41:18 2016
New Revision: 1751107

URL: http://svn.apache.org/viewvc?rev=1751107=rev
Log:
Gracefully handle ecj's odd generation of LocalVariableTypeTable types, 
prefixed by \!, or \!+ or \!*

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java?rev=1751107=1751106=1751107=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java 
(original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java 
Sun Jul  3 02:41:18 2016
@@ -1083,6 +1083,10 @@ public abstract class Utility {
 return Const.T_BOOLEAN;
 case 'S':
 return Const.T_SHORT;
+case '!':
+case '+':
+case '*':
+return typeOfSignature(signature.substring(1));
 default:
 throw new ClassFormatException("Invalid method signature: 
" + signature);
 }

svn commit: r1749184 - /commons/proper/bcel/trunk/pom.xml

[dbrosius]

Author: dbrosius
Date: Sun Jun 19 16:10:00 2016
New Revision: 1749184

URL: http://svn.apache.org/viewvc?rev=1749184=rev
Log:
add source jar plugin

Modified:
commons/proper/bcel/trunk/pom.xml

Modified: commons/proper/bcel/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/pom.xml?rev=1749184=1749183=1749184=diff
==
--- commons/proper/bcel/trunk/pom.xml [UTF-8] (original)
+++ commons/proper/bcel/trunk/pom.xml [UTF-8] Sun Jun 19 16:10:00 2016
@@ -225,6 +225,18 @@
 
   
   
+   org.apache.maven.plugins
+   maven-source-plugin
+   
+ 
+   attach-sources
+   
+ jar
+   
+ 
+   
+  
+  
 maven-surefire-plugin
 
   

svn commit: r1748636 - /commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AccessFlags.java

[dbrosius]

Author: dbrosius
Date: Wed Jun 15 20:45:17 2016
New Revision: 1748636

URL: http://svn.apache.org/viewvc?rev=1748636=rev
Log:
add missing isVarArgs to AccessFlags

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AccessFlags.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AccessFlags.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AccessFlags.java?rev=1748636=1748635=1748636=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AccessFlags.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AccessFlags.java
 Wed Jun 15 20:45:17 2016
@@ -20,8 +20,7 @@ package org.apache.bcel.classfile;
 import org.apache.bcel.Const;
 
 /**
- * Super class for all objects that have modifiers like private, final, ...
- * I.e. classes, fields, and methods.
+ * Super class for all objects that have modifiers like private, final, ... 
I.e. classes, fields, and methods.
  *
  * @version $Id$
  */
@@ -33,52 +32,52 @@ public abstract class AccessFlags {
 @java.lang.Deprecated
 protected int access_flags; // TODO not used externally at present
 
-
 public AccessFlags() {
 }
 
-
 /**
- * @param a inital access flags
+ * @param a
+ *inital access flags
  */
 public AccessFlags(final int a) {
 access_flags = a;
 }
 
-
-/** 
+/**
  * @return Access flags of the object aka. "modifiers".
  */
 public final int getAccessFlags() {
 return access_flags;
 }
 
-
-/** 
+/**
  * @return Access flags of the object aka. "modifiers".
  */
 public final int getModifiers() {
 return access_flags;
 }
 
-
-/** Set access flags aka "modifiers".
- * @param access_flags Access flags of the object. 
+/**
+ * Set access flags aka "modifiers".
+ *
+ * @param access_flags
+ *Access flags of the object.
  */
-public final void setAccessFlags( final int access_flags ) {
+public final void setAccessFlags(final int access_flags) {
 this.access_flags = access_flags;
 }
 
-
-/** Set access flags aka "modifiers".
- * @param access_flags Access flags of the object. 
+/**
+ * Set access flags aka "modifiers".
+ *
+ * @param access_flags
+ *Access flags of the object.
  */
-public final void setModifiers( final int access_flags ) {
+public final void setModifiers(final int access_flags) {
 setAccessFlags(access_flags);
 }
 
-
-private void setFlag( final int flag, final boolean set ) {
+private void setFlag(final int flag, final boolean set) {
 if ((access_flags & flag) != 0) { // Flag is set already
 if (!set) {
 access_flags ^= flag;
@@ -90,153 +89,131 @@ public abstract class AccessFlags {
 }
 }
 
-
-public final void isPublic( final boolean flag ) {
+public final void isPublic(final boolean flag) {
 setFlag(Const.ACC_PUBLIC, flag);
 }
 
-
 public final boolean isPublic() {
 return (access_flags & Const.ACC_PUBLIC) != 0;
 }
 
-
-public final void isPrivate( final boolean flag ) {
+public final void isPrivate(final boolean flag) {
 setFlag(Const.ACC_PRIVATE, flag);
 }
 
-
 public final boolean isPrivate() {
 return (access_flags & Const.ACC_PRIVATE) != 0;
 }
 
-
-public final void isProtected( final boolean flag ) {
+public final void isProtected(final boolean flag) {
 setFlag(Const.ACC_PROTECTED, flag);
 }
 
-
 public final boolean isProtected() {
 return (access_flags & Const.ACC_PROTECTED) != 0;
 }
 
-
-public final void isStatic( final boolean flag ) {
+public final void isStatic(final boolean flag) {
 setFlag(Const.ACC_STATIC, flag);
 }
 
-
 public final boolean isStatic() {
 return (access_flags & Const.ACC_STATIC) != 0;
 }
 
-
-public final void isFinal( final boolean flag ) {
+public final void isFinal(final boolean flag) {
 setFlag(Const.ACC_FINAL, flag);
 }
 
-
 public final boolean isFinal() {
 return (access_flags & Const.ACC_FINAL) != 0;
 }
 
-
-public final void isSynchronized( final boolean flag ) {
+public final void isSynchronized(final boolean flag) {
 setFlag(Const.ACC_SYNCHRONIZED, flag);
 }
 
-
 public final boolean isSynchronized() {
 return (access_flags & Const.ACC_SYNCHRONIZED) != 0;
 }
 
-
-public final void isVolatile( final boolean flag ) {
+public final void isVolatile(final boolean flag) {
 setFlag(Const.ACC_VOLATILE, flag);
 }
 
-
 publ

svn commit: r1747124 - /commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InvokeInstruction.java

[dbrosius]

Author: dbrosius
Date: Tue Jun  7 02:43:06 2016
New Revision: 1747124

URL: http://svn.apache.org/viewvc?rev=1747124=rev
Log:
revert erroneous override of getClassName in InvokeInstruction, introduced in 
r1702349

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InvokeInstruction.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InvokeInstruction.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InvokeInstruction.java?rev=1747124=1747123=1747124=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InvokeInstruction.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InvokeInstruction.java
 Tue Jun  7 02:43:06 2016
@@ -120,22 +120,4 @@ public abstract class InvokeInstruction
 return Type.getArgumentTypes(getSignature(cpg));
 }
 
-/**
- * This overrides the deprecated version as we know here that the 
referenced class
- * cannot be an array unless something has gone badly wrong.
- * @return name of the referenced class/interface
- * @throws IllegalArgumentException if the referenced class is an array 
(this should not happen)
- */
-@Override
-public String getClassName( final ConstantPoolGen cpg ) {
-ConstantPool cp = cpg.getConstantPool();
-ConstantCP cmr = (ConstantCP) cp.getConstant(super.getIndex());
-String className = cp.getConstantString(cmr.getClassIndex(), 
Const.CONSTANT_Class);
-if (className.startsWith("[")) {
-throw new IllegalArgumentException("Cannot be used on an array 
type");
-}
-return className.replace('/', '.');
-}
-
-
 }

[math] Revert "no need for Double allocation just to get hashCode"

[dbrosius]

Repository: commons-math
Updated Branches:
  refs/heads/master 803e1a6f4 -> ffc1caada


Revert "no need for Double allocation just to get hashCode"

a java 8 method

This reverts commit 803e1a6f4bfcc0ce77cd9b63cf70d264aa8a90ad.


Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/ffc1caad
Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/ffc1caad
Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/ffc1caad

Branch: refs/heads/master
Commit: ffc1caada54272e273ca26c17e54f2f91245884f
Parents: 803e1a6
Author: Dave Brosius 
Authored: Mon May 30 13:25:18 2016 -0400
Committer: Dave Brosius 
Committed: Mon May 30 13:25:18 2016 -0400

--
 src/main/java/org/apache/commons/math4/util/MathUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/commons-math/blob/ffc1caad/src/main/java/org/apache/commons/math4/util/MathUtils.java
--
diff --git a/src/main/java/org/apache/commons/math4/util/MathUtils.java 
b/src/main/java/org/apache/commons/math4/util/MathUtils.java
index fc3e3fe..7f10455 100644
--- a/src/main/java/org/apache/commons/math4/util/MathUtils.java
+++ b/src/main/java/org/apache/commons/math4/util/MathUtils.java
@@ -61,7 +61,7 @@ public final class MathUtils {
  * @return the hash code
  */
 public static int hash(double value) {
-return Double.hashCode(value);
+return new Double(value).hashCode();
 }
 
 /**

[math] no need for Double allocation just to get hashCode

[dbrosius]

Repository: commons-math
Updated Branches:
  refs/heads/master 292b6ab08 -> 803e1a6f4


no need for Double allocation just to get hashCode


Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/803e1a6f
Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/803e1a6f
Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/803e1a6f

Branch: refs/heads/master
Commit: 803e1a6f4bfcc0ce77cd9b63cf70d264aa8a90ad
Parents: 292b6ab
Author: Dave Brosius 
Authored: Sun May 29 17:45:02 2016 -0400
Committer: Dave Brosius 
Committed: Sun May 29 17:45:02 2016 -0400

--
 src/main/java/org/apache/commons/math4/util/MathUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/commons-math/blob/803e1a6f/src/main/java/org/apache/commons/math4/util/MathUtils.java
--
diff --git a/src/main/java/org/apache/commons/math4/util/MathUtils.java 
b/src/main/java/org/apache/commons/math4/util/MathUtils.java
index 7f10455..fc3e3fe 100644
--- a/src/main/java/org/apache/commons/math4/util/MathUtils.java
+++ b/src/main/java/org/apache/commons/math4/util/MathUtils.java
@@ -61,7 +61,7 @@ public final class MathUtils {
  * @return the hash code
  */
 public static int hash(double value) {
-return new Double(value).hashCode();
+return Double.hashCode(value);
 }
 
 /**

[math] use StringBuilder correctly

[dbrosius]

Repository: commons-math
Updated Branches:
  refs/heads/master 7c12a85bf -> 292b6ab08


use StringBuilder correctly


Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/292b6ab0
Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/292b6ab0
Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/292b6ab0

Branch: refs/heads/master
Commit: 292b6ab0811f5b21db8cc15929e41a2175d142c4
Parents: 7c12a85
Author: Dave Brosius 
Authored: Sun May 29 17:36:04 2016 -0400
Committer: Dave Brosius 
Committed: Sun May 29 17:36:04 2016 -0400

--
 .../math4/stat/descriptive/MultivariateSummaryStatistics.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-math/blob/292b6ab0/src/main/java/org/apache/commons/math4/stat/descriptive/MultivariateSummaryStatistics.java
--
diff --git 
a/src/main/java/org/apache/commons/math4/stat/descriptive/MultivariateSummaryStatistics.java
 
b/src/main/java/org/apache/commons/math4/stat/descriptive/MultivariateSummaryStatistics.java
index eb1642c..39083d0 100644
--- 
a/src/main/java/org/apache/commons/math4/stat/descriptive/MultivariateSummaryStatistics.java
+++ 
b/src/main/java/org/apache/commons/math4/stat/descriptive/MultivariateSummaryStatistics.java
@@ -319,8 +319,8 @@ public class MultivariateSummaryStatistics
 final String separator = ", ";
 final String suffix = System.getProperty("line.separator");
 StringBuilder outBuffer = new StringBuilder();
-outBuffer.append("MultivariateSummaryStatistics:" + suffix);
-outBuffer.append("n: " + getN() + suffix);
+outBuffer.append("MultivariateSummaryStatistics:").append(suffix);
+outBuffer.append("n: ").append(getN()).append(suffix);
 append(outBuffer, getMin(), "min: ", separator, suffix);
 append(outBuffer, getMax(), "max: ", separator, suffix);
 append(outBuffer, getMean(), "mean: ", separator, suffix);
@@ -328,7 +328,7 @@ public class MultivariateSummaryStatistics
 append(outBuffer, getSumSq(), "sum of squares: ", separator, suffix);
 append(outBuffer, getSumLog(), "sum of logarithms: ", separator, 
suffix);
 append(outBuffer, getStandardDeviation(), "standard deviation: ", 
separator, suffix);
-outBuffer.append("covariance: " + getCovariance().toString() + suffix);
+outBuffer.append("covariance: 
").append(getCovariance()).append(suffix);
 return outBuffer.toString();
 }
 

[math] remove useless local initialization before assignment

[dbrosius]

Repository: commons-math
Updated Branches:
  refs/heads/master 02dd98a04 -> 7c12a85bf


remove useless local initialization before assignment


Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/7c12a85b
Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/7c12a85b
Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/7c12a85b

Branch: refs/heads/master
Commit: 7c12a85bf8f8566d692557d526556fa3ef81824a
Parents: 02dd98a
Author: Dave Brosius 
Authored: Sun May 29 17:32:40 2016 -0400
Committer: Dave Brosius 
Committed: Sun May 29 17:32:40 2016 -0400

--
 .../commons/math4/distribution/AbstractIntegerDistribution.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-math/blob/7c12a85b/src/main/java/org/apache/commons/math4/distribution/AbstractIntegerDistribution.java
--
diff --git 
a/src/main/java/org/apache/commons/math4/distribution/AbstractIntegerDistribution.java
 
b/src/main/java/org/apache/commons/math4/distribution/AbstractIntegerDistribution.java
index 95d6f07..4c42c01 100644
--- 
a/src/main/java/org/apache/commons/math4/distribution/AbstractIntegerDistribution.java
+++ 
b/src/main/java/org/apache/commons/math4/distribution/AbstractIntegerDistribution.java
@@ -209,8 +209,7 @@ public abstract class AbstractIntegerDistribution 
implements IntegerDistribution
  */
 private double checkedCumulativeProbability(int argument)
 throws MathInternalError {
-double result = Double.NaN;
-result = cumulativeProbability(argument);
+double result = cumulativeProbability(argument);
 if (Double.isNaN(result)) {
 throw new MathInternalError(LocalizedFormats
 .DISCRETE_CUMULATIVE_PROBABILITY_RETURNED_NAN, argument);

[math] avoid allocating distribution bounds if there are no successes

[dbrosius]

Repository: commons-math
Updated Branches:
  refs/heads/master 91b2f4294 -> 02dd98a04


avoid allocating distribution bounds if there are no successes


Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/02dd98a0
Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/02dd98a0
Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/02dd98a0

Branch: refs/heads/master
Commit: 02dd98a04570a1beba88566281efcabc8ff6f73d
Parents: 91b2f42
Author: Dave Brosius 
Authored: Sun May 29 17:27:37 2016 -0400
Committer: Dave Brosius 
Committed: Sun May 29 17:27:37 2016 -0400

--
 .../math4/stat/interval/ClopperPearsonInterval.java | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-math/blob/02dd98a0/src/main/java/org/apache/commons/math4/stat/interval/ClopperPearsonInterval.java
--
diff --git 
a/src/main/java/org/apache/commons/math4/stat/interval/ClopperPearsonInterval.java
 
b/src/main/java/org/apache/commons/math4/stat/interval/ClopperPearsonInterval.java
index bf5d6ad..ed0904c 100644
--- 
a/src/main/java/org/apache/commons/math4/stat/interval/ClopperPearsonInterval.java
+++ 
b/src/main/java/org/apache/commons/math4/stat/interval/ClopperPearsonInterval.java
@@ -35,19 +35,19 @@ public class ClopperPearsonInterval implements 
BinomialConfidenceInterval {
 IntervalUtils.checkParameters(numberOfTrials, numberOfSuccesses, 
confidenceLevel);
 double lowerBound = 0;
 double upperBound = 0;
-final double alpha = (1.0 - confidenceLevel) / 2.0;
-
-final FDistribution distributionLowerBound = new FDistribution(2 * 
(numberOfTrials - numberOfSuccesses + 1),
-   2 * 
numberOfSuccesses);
+ 
 if (numberOfSuccesses > 0) {
+final double alpha = (1.0 - confidenceLevel) / 2.0;
+
+final FDistribution distributionLowerBound = new FDistribution(2 * 
(numberOfTrials - numberOfSuccesses + 1),
+   2 * 
numberOfSuccesses);
 final double fValueLowerBound = 
distributionLowerBound.inverseCumulativeProbability(1 - alpha);
 lowerBound = numberOfSuccesses /
  (numberOfSuccesses + (numberOfTrials - 
numberOfSuccesses + 1) * fValueLowerBound);
-}
 
-final FDistribution distributionUpperBound = new FDistribution(2 * 
(numberOfSuccesses + 1),
-   2 * 
(numberOfTrials - numberOfSuccesses));
-if (numberOfSuccesses > 0) {
+
+final FDistribution distributionUpperBound = new FDistribution(2 * 
(numberOfSuccesses + 1),
+   2 * 
(numberOfTrials - numberOfSuccesses));
 final double fValueUpperBound = 
distributionUpperBound.inverseCumulativeProbability(1 - alpha);
 upperBound = (numberOfSuccesses + 1) * fValueUpperBound /
  (numberOfTrials - numberOfSuccesses + 
(numberOfSuccesses + 1) * fValueUpperBound);

svn commit: r1745933 - in /commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util: ClassPathRepository.java MemorySensitiveClassPathRepository.java SyntheticRepository.java

[dbrosius]

Author: dbrosius
Date: Sat May 28 20:31:42 2016
New Revision: 1745933

URL: http://svn.apache.org/viewvc?rev=1745933=rev
Log:
Issue BCEL-73: Allow for instance based repositories

Added:

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassPathRepository.java

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/MemorySensitiveClassPathRepository.java
Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/SyntheticRepository.java

Added: 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassPathRepository.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassPathRepository.java?rev=1745933=auto
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassPathRepository.java
 (added)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassPathRepository.java
 Sat May 28 20:31:42 2016
@@ -0,0 +1,171 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+package org.apache.commons.bcel6.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.bcel6.classfile.ClassParser;
+import org.apache.commons.bcel6.classfile.JavaClass;
+
+/**
+ * This repository is used in situations where a Class is created outside the 
realm of a ClassLoader. Classes are loaded from the file systems using the paths
+ * specified in the given class path. By default, this is the value returned 
by ClassPath.getClassPath(). 
+ *
+ * @see org.apache.commons.bcel6.Repository
+ */
+public class ClassPathRepository implements Repository {
+
+private ClassPath _path = null;
+private final Map<String, JavaClass> _loadedClasses = new HashMap<>(); // 
CLASSNAME X JAVACLASS
+
+public ClassPathRepository(ClassPath path) {
+_path = path;
+}
+
+/**
+ * Store a new JavaClass instance into this Repository.
+ */
+@Override
+public void storeClass(JavaClass clazz) {
+_loadedClasses.put(clazz.getClassName(), clazz);
+clazz.setRepository(this);
+}
+
+/**
+ * Remove class from repository
+ */
+@Override
+public void removeClass(JavaClass clazz) {
+_loadedClasses.remove(clazz.getClassName());
+}
+
+/**
+ * Find an already defined (cached) JavaClass object by name.
+ */
+@Override
+public JavaClass findClass(String className) {
+return _loadedClasses.get(className);
+}
+
+/**
+ * Find a JavaClass object by name. If it is already in this Repository, 
the Repository version is returned. Otherwise, the Repository's classpath is
+ * searched for the class (and it is added to the Repository if found).
+ *
+ * @param className
+ *the name of the class
+ * @return the JavaClass object
+ * @throws ClassNotFoundException
+ * if the class is not in the Repository, and could not be 
found on the classpath
+ */
+@Override
+public JavaClass loadClass(String className) throws ClassNotFoundException 
{
+if ((className == null) || className.equals("")) {
+throw new IllegalArgumentException("Invalid class name " + 
className);
+}
+className = className.replace('/', '.'); // Just in case, canonical 
form
+JavaClass clazz = findClass(className);
+if (clazz != null) {
+return clazz;
+}
+try {
+return loadClass(_path.getInputStream(className), className);
+} catch (IOException e) {
+throw new ClassNotFoundException("Exception while looking for 
class " + className + ": " + e, e);
+}
+}
+
+/**
+ * Find the JavaClass object for a runtime Class object. If a class with 
the same name is already in this Repository, the Repository version is returned.
+ * Otherwise, getResourceAsStream() is called on the Class object to find 
the class's representatio

svn commit: r1745834 - /commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/Constants.java

[dbrosius]

Author: dbrosius
Date: Sat May 28 05:29:40 2016
New Revision: 1745834

URL: http://svn.apache.org/viewvc?rev=1745834=rev
Log:
add support for invokedynamic

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/Constants.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/Constants.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/Constants.java?rev=1745834=1745833=1745834=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/Constants.java 
(original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/Constants.java 
Sat May 28 05:29:40 2016
@@ -1037,6 +1037,10 @@ public interface Constants {
   /** Java VM opcode.
* @see http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5;>
* Opcode definitions in The Java Virtual Machine Specification */
+  public static final short INVOKEDYNAMIC   = 186;
+  /** Java VM opcode.
+   * @see http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5;>
+   * Opcode definitions in The Java Virtual Machine Specification */
   public static final short NEW  = 187;
   /** Java VM opcode.
* @see http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5;>
@@ -1387,7 +1391,7 @@ public interface Constants {
 0/*dreturn*/, 0/*areturn*/, 0/*return*/,
 2/*getstatic*/, 2/*putstatic*/, 2/*getfield*/,
 2/*putfield*/, 2/*invokevirtual*/, 2/*invokespecial*/, 2/*invokestatic*/,
-4/*invokeinterface*/, UNDEFINED, 2/*new*/,
+4/*invokeinterface*/, 4/*invokedynamic*/, 2/*new*/,
 1/*newarray*/, 2/*anewarray*/,
 0/*arraylength*/, 0/*athrow*/, 2/*checkcast*/,
 2/*instanceof*/, 0/*monitorenter*/,
@@ -1460,7 +1464,7 @@ public interface Constants {
 {T_SHORT}/*putstatic*/, {T_SHORT}/*getfield*/,
 {T_SHORT}/*putfield*/, {T_SHORT}/*invokevirtual*/,
 {T_SHORT}/*invokespecial*/, {T_SHORT}/*invokestatic*/,
-{T_SHORT, T_BYTE, T_BYTE}/*invokeinterface*/, {},
+{T_SHORT, T_BYTE, T_BYTE}/*invokeinterface*/, {T_SHORT, T_BYTE, 
T_BYTE}/*invokedynamic*/,
 {T_SHORT}/*new*/, {T_BYTE}/*newarray*/,
 {T_SHORT}/*anewarray*/, {}/*arraylength*/, {}/*athrow*/,
 {T_SHORT}/*checkcast*/, {T_SHORT}/*instanceof*/,
@@ -1507,7 +1511,7 @@ public interface Constants {
 "tableswitch", "lookupswitch", "ireturn", "lreturn", "freturn",
 "dreturn", "areturn", "return", "getstatic", "putstatic", "getfield",
 "putfield", "invokevirtual", "invokespecial", "invokestatic",
-"invokeinterface", ILLEGAL_OPCODE, "new", "newarray", "anewarray",
+"invokeinterface", "invokedynamic", "new", "newarray", "anewarray",
 "arraylength", "athrow", "checkcast", "instanceof", "monitorenter",
 "monitorexit", "wide", "multianewarray", "ifnull", "ifnonnull",
 "goto_w", "jsr_w", "breakpoint", ILLEGAL_OPCODE, ILLEGAL_OPCODE,
@@ -1563,7 +1567,7 @@ public interface Constants {
 UNPREDICTABLE/*putstatic*/, 1/*getfield*/, UNPREDICTABLE/*putfield*/,
 UNPREDICTABLE/*invokevirtual*/, UNPREDICTABLE/*invokespecial*/,
 UNPREDICTABLE/*invokestatic*/,
-UNPREDICTABLE/*invokeinterface*/, UNDEFINED, 0/*new*/, 1/*newarray*/, 
1/*anewarray*/,
+UNPREDICTABLE/*invokeinterface*/, UNPREDICTABLE/*invokedynamic*/, 
0/*new*/, 1/*newarray*/, 1/*anewarray*/,
 1/*arraylength*/, 1/*athrow*/, 1/*checkcast*/, 1/*instanceof*/, 
1/*monitorenter*/,
 1/*monitorexit*/, 0/*wide*/, UNPREDICTABLE/*multianewarray*/, 1/*ifnull*/, 
1/*ifnonnull*/,
 0/*goto_w*/, 0/*jsr_w*/, 0/*breakpoint*/, UNDEFINED, UNDEFINED,
@@ -1619,7 +1623,7 @@ public interface Constants {
 0/*dreturn*/, 0/*areturn*/, 0/*return*/, UNPREDICTABLE/*getstatic*/, 
0/*putstatic*/,
 UNPREDICTABLE/*getfield*/, 0/*putfield*/, UNPREDICTABLE/*invokevirtual*/,
 UNPREDICTABLE/*invokespecial*/, UNPREDICTABLE/*invokestatic*/,
-UNPREDICTABLE/*invokeinterface*/, UNDEFINED, 1/*new*/, 1/*newarray*/, 
1/*anewarray*/,
+UNPREDICTABLE/*invokeinterface*/, UNPREDICTABLE/*invokedynamic*/, 
1/*new*/, 1/*newarray*/, 1/*anewarray*/,
 1/*arraylength*/, 1/*athrow*/, 1/*checkcast*/, 1/*instanceof*/, 
0/*monitorenter*/,
 0/*monitorexit*/, 0/*wide*/, 1/*multianewarray*/, 0/*ifnull*/, 
0/*ifnonnull*/,
 0/*goto_w*/, 1/*jsr_w*/, 0/*breakpoint*/, UNDEFINED, UNDEFINED,

svn commit: r1728607 - /commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java

[dbrosius]

Author: dbrosius
Date: Fri Feb  5 06:09:42 2016
New Revision: 1728607

URL: http://svn.apache.org/viewvc?rev=1728607=rev
Log:
Issue BCEL-269: make sure instruction list gets completely written, patch by 
emopers

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java?rev=1728607=1728606=1728607=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionList.java
 Fri Feb  5 06:09:42 2016
@@ -31,22 +31,16 @@ import org.apache.commons.bcel6.Const;
 import org.apache.commons.bcel6.classfile.Constant;
 import org.apache.commons.bcel6.util.ByteSequence;
 
-/** 
- * This class is a container for a list of Instruction objects. Instructions can
- * be appended, inserted, moved, deleted, etc.. Instructions are being
- * wrapped into InstructionHandles objects that
- * are returned upon append/insert operations. They give the user
- * (read only) access to the list structure, such that it can be traversed and
- * manipulated in a controlled way.
+/**
+ * This class is a container for a list of Instruction objects. Instructions can be appended, 
inserted, moved, deleted, etc..
+ * Instructions are being wrapped into InstructionHandles objects that are returned 
upon append/insert operations. They
+ * give the user (read only) access to the list structure, such that it can be 
traversed and manipulated in a controlled way.
  *
- * A list is finally dumped to a byte code array with getByteCode.
+ * A list is finally dumped to a byte code array with getByteCode.
  *
  * @version $Id$
- * @see Instruction
- * @see InstructionHandle
+ * @see Instruction
+ * @see InstructionHandle
  * @see BranchHandle
  */
 public class InstructionList implements Iterable {
@@ -56,43 +50,42 @@ public class InstructionList implements
 private int length = 0; // number of elements in list
 private int[] byte_positions; // byte code offsets corresponding to 
instructions
 
-
 /**
  * Create (empty) instruction list.
  */
 public InstructionList() {
 }
 
-
 /**
  * Create instruction list containing one instruction.
- * @param i initial instruction
+ * 
+ * @param i
+ *initial instruction
  */
 public InstructionList(Instruction i) {
 append(i);
 }
 
-
 /**
  * Create instruction list containing one instruction.
- * @param i initial instruction
+ * 
+ * @param i
+ *initial instruction
  */
 public InstructionList(BranchInstruction i) {
 append(i);
 }
 
-
 /**
- * Initialize list with (nonnull) compound instruction. Consumes argument
- * list, i.e., it becomes empty.
+ * Initialize list with (nonnull) compound instruction. Consumes argument 
list, i.e., it becomes empty.
  *
- * @param c compound instruction (list)
+ * @param c
+ *compound instruction (list)
  */
 public InstructionList(CompoundInstruction c) {
 append(c.getInstructionList());
 }
 
-
 /**
  * Test for empty list.
  */
@@ -100,22 +93,24 @@ public class InstructionList implements
 return start == null;
 } // && end == null
 
-
 /**
- * Find the target instruction (handle) that corresponds to the given 
target
- * position (byte code offset).
+ * Find the target instruction (handle) that corresponds to the given 
target position (byte code offset).
  *
- * @param ihs array of instruction handles, i.e. il.getInstructionHandles()
- * @param pos array of positions corresponding to ihs, i.e. 
il.getInstructionPositions()
- * @param count length of arrays
- * @param target target position to search for
+ * @param ihs
+ *array of instruction handles, i.e. il.getInstructionHandles()
+ * @param pos
+ *array of positions corresponding to ihs, i.e. 
il.getInstructionPositions()
+ * @param count
+ *length of arrays
+ * @param target
+ *target position to search for
  * @return target position's instruction handle if available
  */
-public static InstructionHandle findHandle( InstructionHandle[] ihs, int[] 
pos, int count,
-int target ) {
+public static InstructionHandle findHandle(InstructionHandle[] ihs, int[] 
pos, int count, int target) {
 int l = 0;
 int r = count - 1;
-/* Do a binary search since the pos array is orderd.
+/*
+ * Do a binary search since the p

svn commit: r1722481 - /commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java

[dbrosius]

Author: dbrosius
Date: Fri Jan  1 01:42:04 2016
New Revision: 1722481

URL: http://svn.apache.org/viewvc?rev=1722481=rev
Log:
use long math when calculating a long

Modified:
commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java

Modified: 
commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java
URL: 
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java?rev=1722481=1722480=1722481=diff
==
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java 
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/FileUtils.java 
Fri Jan  1 01:42:04 2016
@@ -1724,7 +1724,7 @@ public class FileUtils {
  * @throws NullPointerException if the file is {@code null}
  */
 public static boolean waitFor(final File file, final int seconds) {
-long finishAt = System.currentTimeMillis() + (seconds * 1000);
+long finishAt = System.currentTimeMillis() + (seconds * 1000L);
 boolean wasInterrupted = false;
 try {
 while (!file.exists()) {

[math] push down allocations/calculations to where they are needed

[dbrosius]

Repository: commons-math
Updated Branches:
  refs/heads/master d1123894d -> fb83ba3fd


push down allocations/calculations to where they are needed


Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/fb83ba3f
Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/fb83ba3f
Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/fb83ba3f

Branch: refs/heads/master
Commit: fb83ba3fdb46537a36832a900f124d4c400f7ed9
Parents: d112389
Author: Dave Brosius 
Authored: Tue Dec 29 13:52:48 2015 -0500
Committer: Dave Brosius 
Committed: Tue Dec 29 13:52:48 2015 -0500

--
 .../optim/nonlinear/scalar/noderiv/CMAESOptimizer.java| 10 ++
 .../math4/stat/interval/ClopperPearsonInterval.java   |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-math/blob/fb83ba3f/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/CMAESOptimizer.java
--
diff --git 
a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/CMAESOptimizer.java
 
b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/CMAESOptimizer.java
index f769585..727fd18 100644
--- 
a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/CMAESOptimizer.java
+++ 
b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/CMAESOptimizer.java
@@ -556,14 +556,16 @@ public class CMAESOptimizer
  * Checks dimensions and values of boundaries and inputSigma if defined.
  */
 private void checkParameters() {
-final double[] init = getStartPoint();
-final double[] lB = getLowerBound();
-final double[] uB = getUpperBound();
-
 if (inputSigma != null) {
+final double[] init = getStartPoint();
+
 if (inputSigma.length != init.length) {
 throw new DimensionMismatchException(inputSigma.length, 
init.length);
 }
+
+final double[] lB = getLowerBound();
+final double[] uB = getUpperBound();
+
 for (int i = 0; i < init.length; i++) {
 if (inputSigma[i] > uB[i] - lB[i]) {
 throw new OutOfRangeException(inputSigma[i], 0, uB[i] - 
lB[i]);

http://git-wip-us.apache.org/repos/asf/commons-math/blob/fb83ba3f/src/main/java/org/apache/commons/math4/stat/interval/ClopperPearsonInterval.java
--
diff --git 
a/src/main/java/org/apache/commons/math4/stat/interval/ClopperPearsonInterval.java
 
b/src/main/java/org/apache/commons/math4/stat/interval/ClopperPearsonInterval.java
index 17dc9f5..bf5d6ad 100644
--- 
a/src/main/java/org/apache/commons/math4/stat/interval/ClopperPearsonInterval.java
+++ 
b/src/main/java/org/apache/commons/math4/stat/interval/ClopperPearsonInterval.java
@@ -39,16 +39,16 @@ public class ClopperPearsonInterval implements 
BinomialConfidenceInterval {
 
 final FDistribution distributionLowerBound = new FDistribution(2 * 
(numberOfTrials - numberOfSuccesses + 1),
2 * 
numberOfSuccesses);
-final double fValueLowerBound = 
distributionLowerBound.inverseCumulativeProbability(1 - alpha);
 if (numberOfSuccesses > 0) {
+final double fValueLowerBound = 
distributionLowerBound.inverseCumulativeProbability(1 - alpha);
 lowerBound = numberOfSuccesses /
  (numberOfSuccesses + (numberOfTrials - 
numberOfSuccesses + 1) * fValueLowerBound);
 }
 
 final FDistribution distributionUpperBound = new FDistribution(2 * 
(numberOfSuccesses + 1),
2 * 
(numberOfTrials - numberOfSuccesses));
-final double fValueUpperBound = 
distributionUpperBound.inverseCumulativeProbability(1 - alpha);
 if (numberOfSuccesses > 0) {
+final double fValueUpperBound = 
distributionUpperBound.inverseCumulativeProbability(1 - alpha);
 upperBound = (numberOfSuccesses + 1) * fValueUpperBound /
  (numberOfTrials - numberOfSuccesses + 
(numberOfSuccesses + 1) * fValueUpperBound);
 }

[math] use short-circuiting ops

[dbrosius]

Repository: commons-math
Updated Branches:
  refs/heads/master e779883b2 -> a71c820ba


use short-circuiting ops


Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/a71c820b
Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/a71c820b
Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/a71c820b

Branch: refs/heads/master
Commit: a71c820baeb91025eaa7f07b172a39500c6f5692
Parents: e779883
Author: Dave Brosius 
Authored: Tue Dec 29 14:26:06 2015 -0500
Committer: Dave Brosius 
Committed: Tue Dec 29 14:26:06 2015 -0500

--
 src/main/java/org/apache/commons/math4/util/ArithmeticUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/commons-math/blob/a71c820b/src/main/java/org/apache/commons/math4/util/ArithmeticUtils.java
--
diff --git a/src/main/java/org/apache/commons/math4/util/ArithmeticUtils.java 
b/src/main/java/org/apache/commons/math4/util/ArithmeticUtils.java
index 4b54875..bab02d3 100644
--- a/src/main/java/org/apache/commons/math4/util/ArithmeticUtils.java
+++ b/src/main/java/org/apache/commons/math4/util/ArithmeticUtils.java
@@ -650,7 +650,7 @@ public final class ArithmeticUtils {
  */
  private static long addAndCheck(long a, long b, Localizable pattern) 
throws MathArithmeticException {
  final long result = a + b;
- if (!((a ^ b) < 0 | (a ^ result) >= 0)) {
+ if (!((a ^ b) < 0 || (a ^ result) >= 0)) {
  throw new MathArithmeticException(pattern, a, b);
  }
  return result;

[math] simplify: instanceof checks for nulls

[dbrosius]

Repository: commons-math
Updated Branches:
  refs/heads/master fb83ba3fd -> e779883b2


simplify: instanceof checks for nulls


Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/e779883b
Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/e779883b
Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/e779883b

Branch: refs/heads/master
Commit: e779883b29a67d411493f985de984ffb8088ca05
Parents: fb83ba3
Author: Dave Brosius 
Authored: Tue Dec 29 14:21:42 2015 -0500
Committer: Dave Brosius 
Committed: Tue Dec 29 14:21:42 2015 -0500

--
 .../commons/math4/stat/descriptive/rank/PSquarePercentile.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-math/blob/e779883b/src/main/java/org/apache/commons/math4/stat/descriptive/rank/PSquarePercentile.java
--
diff --git 
a/src/main/java/org/apache/commons/math4/stat/descriptive/rank/PSquarePercentile.java
 
b/src/main/java/org/apache/commons/math4/stat/descriptive/rank/PSquarePercentile.java
index 79bdc5e..7ba2d16 100644
--- 
a/src/main/java/org/apache/commons/math4/stat/descriptive/rank/PSquarePercentile.java
+++ 
b/src/main/java/org/apache/commons/math4/stat/descriptive/rank/PSquarePercentile.java
@@ -159,7 +159,7 @@ public class PSquarePercentile extends 
AbstractStorelessUnivariateStatistic
 boolean result = false;
 if (this == o) {
 result = true;
-} else if (o != null && o instanceof PSquarePercentile) {
+} else if (o instanceof PSquarePercentile) {
 PSquarePercentile that = (PSquarePercentile) o;
 boolean isNotNull = markers != null && that.markers != null;
 boolean isNull = markers == null && that.markers == null;
@@ -410,7 +410,7 @@ public class PSquarePercentile extends 
AbstractStorelessUnivariateStatistic
 boolean result = false;
 if (this == o) {
 result = true;
-} else if (o != null && o instanceof Markers) {
+} else if (o instanceof Markers) {
 Markers that = (Markers) o;
 result = Arrays.deepEquals(markerArray, that.markerArray);
 }
@@ -802,7 +802,7 @@ public class PSquarePercentile extends 
AbstractStorelessUnivariateStatistic
 boolean result = false;
 if (this == o) {
 result = true;
-} else if (o != null && o instanceof Marker) {
+} else if (o instanceof Marker) {
 Marker that = (Marker) o;
 
 result = Double.compare(markerHeight, that.markerHeight) == 0;

[math] simplify: remove dead params

[dbrosius]

Repository: commons-math
Updated Branches:
  refs/heads/master a71c820ba -> a4eff51be


simplify: remove dead params


Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/a4eff51b
Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/a4eff51b
Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/a4eff51b

Branch: refs/heads/master
Commit: a4eff51bedd73a0ea56afc23b1021187dd03561b
Parents: a71c820
Author: Dave Brosius 
Authored: Tue Dec 29 14:31:35 2015 -0500
Committer: Dave Brosius 
Committed: Tue Dec 29 14:31:35 2015 -0500

--
 .../commons/math4/analysis/solvers/LaguerreSolver.java  | 9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-math/blob/a4eff51b/src/main/java/org/apache/commons/math4/analysis/solvers/LaguerreSolver.java
--
diff --git 
a/src/main/java/org/apache/commons/math4/analysis/solvers/LaguerreSolver.java 
b/src/main/java/org/apache/commons/math4/analysis/solvers/LaguerreSolver.java
index f233d42..b038abb 100644
--- 
a/src/main/java/org/apache/commons/math4/analysis/solvers/LaguerreSolver.java
+++ 
b/src/main/java/org/apache/commons/math4/analysis/solvers/LaguerreSolver.java
@@ -113,7 +113,7 @@ public class LaguerreSolver extends 
AbstractPolynomialSolver {
 
 // Reduce interval if min and initial bracket the root.
 if (yInitial * yMin < 0) {
-return laguerre(min, initial, yMin, yInitial);
+return laguerre(min, initial);
 }
 
 // Return the second endpoint if it is good enough.
@@ -124,7 +124,7 @@ public class LaguerreSolver extends 
AbstractPolynomialSolver {
 
 // Reduce interval if initial and max bracket the root.
 if (yInitial * yMax < 0) {
-return laguerre(initial, max, yInitial, yMax);
+return laguerre(initial, max);
 }
 
 throw new NoBracketingException(min, max, yMin, yMax);
@@ -144,12 +144,9 @@ public class LaguerreSolver extends 
AbstractPolynomialSolver {
  *
  * @param lo Lower bound of the search interval.
  * @param hi Higher bound of the search interval.
- * @param fLo Function value at the lower bound of the search interval.
- * @param fHi Function value at the higher bound of the search interval.
  * @return the point at which the function value is zero.
  */
-private double laguerre(double lo, double hi,
-double fLo, double fHi) {
+private double laguerre(double lo, double hi) {
 final Complex c[] = ComplexUtils.convertToComplex(getCoefficients());
 
 final Complex initial = new Complex(0.5 * (lo + hi), 0);

svn commit: r1700377 - /commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java

[dbrosius]

Author: dbrosius
Date: Tue Sep  1 01:20:17 2015
New Revision: 1700377

URL: http://svn.apache.org/r1700377
Log:
fix AnnotationEntryValue.stringifyValue to return something other than the hash

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java?rev=1700377=1700376=1700377=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java
 Tue Sep  1 01:20:17 2015
@@ -148,6 +148,10 @@ public class AnnotationEntry implements
 }
 return result.toString();
 }
+
+public String toString() {
+return toShortString();
+}
 
 public static AnnotationEntry[] createAnnotationEntries(Attribute[] attrs) 
{
 // Find attributes that contain annotation data

svn commit: r1700378 - /commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierAppFrame.java

[dbrosius]

Author: dbrosius
Date: Tue Sep  1 01:23:38 2015
New Revision: 1700378

URL: http://svn.apache.org/r1700378
Log:
no need for toString on a String

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierAppFrame.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierAppFrame.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierAppFrame.java?rev=1700378=1700377=1700378=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierAppFrame.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierAppFrame.java
 Tue Sep  1 01:23:38 2015
@@ -241,7 +241,7 @@ public class VerifierAppFrame extends JF
 if (e.getValueIsAdjusting()) {
 return;
 }
-current_class = classNamesJList.getSelectedValue().toString();
+current_class = classNamesJList.getSelectedValue();
 try {
 verify();
 } catch (ClassNotFoundException ex) {

svn commit: r1697272 - /commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java

[dbrosius]

Author: dbrosius
Date: Sun Aug 23 22:38:49 2015
New Revision: 1697272

URL: http://svn.apache.org/r1697272
Log:
reduce allocations

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java?rev=1697272r1=1697271r2=1697272view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java
 Sun Aug 23 22:38:49 2015
@@ -138,10 +138,10 @@ public class AnnotationEntry implements
 final StringBuilder result = new StringBuilder();
 result.append(@);
 result.append(getAnnotationType());
-if (getElementValuePairs().length  0) {
+ElementValuePair[] evPairs = getElementValuePairs();
+if (evPairs.length  0) {
 result.append(();
-for (int i = 0; i  getElementValuePairs().length; i++) {
-final ElementValuePair element = getElementValuePairs()[i];
+for (ElementValuePair element : evPairs) {
 result.append(element.toShortString());
 }
 result.append());

svn commit: r1697268 - /commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/Class2HTML.java

[dbrosius]

Author: dbrosius
Date: Sun Aug 23 22:25:22 2015
New Revision: 1697268

URL: http://svn.apache.org/r1697268
Log:
use a static set for base types, for more readable code

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/Class2HTML.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/Class2HTML.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/Class2HTML.java?rev=1697268r1=1697267r2=1697268view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/Class2HTML.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/Class2HTML.java
 Sun Aug 23 22:25:22 2015
@@ -21,6 +21,8 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.apache.commons.bcel6.Constants;
 import org.apache.commons.bcel6.classfile.Attribute;
@@ -45,8 +47,8 @@ import org.apache.commons.bcel6.classfil
  * LI  package.class_methods.html contains references to all methods and 
fields of the class
  * /OL
  *
- * All subfiles reference each other appropiately, e.g. clicking on a
- * method in the Method's frame will jump to the appropiate method in
+ * All subfiles reference each other appropriately, e.g. clicking on a
+ * method in the Method's frame will jump to the appropriate method in
  * the Code frame.
  *
  * @version $Id$
@@ -58,7 +60,19 @@ public class Class2HTML {
 private static String class_package; // name of package, unclean to make 
it static, but ...
 private static String class_name; // name of current class, dito
 private static ConstantPool constant_pool;
-
+private static final SetString basic_types = new HashSet();
+
+static {
+basic_types.add(int);
+basic_types.add(short);
+basic_types.add(boolean);
+basic_types.add(void);
+basic_types.add(char);
+basic_types.add(byte);
+basic_types.add(long);
+basic_types.add(double);
+basic_types.add(float);
+}
 
 /**
  * Write contents of the given JavaClass into HTML files.
@@ -170,10 +184,7 @@ public class Class2HTML {
 base_type = type.substring(0, index); // Tack of the `['
 }
 // test for basic type
-if (base_type.equals(int) || base_type.equals(short) || 
base_type.equals(boolean)
-|| base_type.equals(void) || base_type.equals(char) || 
base_type.equals(byte)
-|| base_type.equals(long) || base_type.equals(double)
-|| base_type.equals(float)) {
+if (basic_types.contains(base_type)) {
 return FONT COLOR=\#00FF00\ + type + /FONT;
 }
 return A HREF=\ + base_type + .html\ TARGET=_top + short_type 
+ /A;

svn commit: r1697267 - in /commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6: classfile/ generic/ verifier/structurals/

[dbrosius]

Author: dbrosius
Date: Sun Aug 23 22:19:04 2015
New Revision: 1697267

URL: http://svn.apache.org/r1697267
Log:
remove the need for casting at the clone() call site

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Constant.java

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ClassGen.java

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CodeExceptionGen.java

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGenOrMethodGen.java

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LineNumberGen.java

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/LocalVariableGen.java

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/LocalVariables.java

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/OperandStack.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java?rev=1697267r1=1697266r2=1697267view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java
 Sun Aug 23 22:19:04 2015
@@ -306,7 +306,7 @@ public abstract class Attribute implemen
  * @return shallow copy of this attribute
  */
 @Override
-public Object clone()
+public Attribute clone()
 {
 Attribute attr = null;
 try

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Constant.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Constant.java?rev=1697267r1=1697266r2=1697267view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Constant.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Constant.java
 Sun Aug 23 22:19:04 2015
@@ -111,9 +111,9 @@ public abstract class Constant implement
 
 
 @Override
-public Object clone() {
+public Constant clone() {
 try {
-return super.clone();
+return (Constant) super.clone();
 } catch (CloneNotSupportedException e) {
 throw new Error(Clone Not Supported); // never happens
 }

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ClassGen.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ClassGen.java?rev=1697267r1=1697266r2=1697267view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ClassGen.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/ClassGen.java
 Sun Aug 23 22:19:04 2015
@@ -556,9 +556,9 @@ public class ClassGen extends AccessFlag
 
 
 @Override
-public Object clone() {
+public ClassGen clone() {
 try {
-return super.clone();
+return (ClassGen) super.clone();
 } catch (CloneNotSupportedException e) {
 throw new Error(Clone Not Supported); // never happens
 }

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CodeExceptionGen.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CodeExceptionGen.java?rev=1697267r1=1697266r2=1697267view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CodeExceptionGen.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/CodeExceptionGen.java
 Sun Aug 23 22:19:04 2015
@@ -177,9 +177,9 @@ public final class CodeExceptionGen impl
 
 
 @Override
-public Object clone() {
+public CodeExceptionGen clone() {
 try {
-return super.clone();
+return (CodeExceptionGen) super.clone();
 } catch (CloneNotSupportedException e) {
 throw new Error(Clone Not Supported); // never happens
 }

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGenOrMethodGen.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/FieldGenOrMethodGen.java?rev=1697267r1

svn commit: r1697276 - /commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/Verifier.java

[dbrosius]

Author: dbrosius
Date: Sun Aug 23 22:52:57 2015
New Revision: 1697276

URL: http://svn.apache.org/r1697276
Log:
simplify array building

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/Verifier.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/Verifier.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/Verifier.java?rev=1697276r1=1697275r2=1697276view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/Verifier.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/Verifier.java
 Sun Aug 23 22:52:57 2015
@@ -176,11 +176,8 @@ public class Verifier {
 + '):  + element);
 }
 }
-String[] ret = new String[messages.size()];
-for (int i = 0; i  messages.size(); i++) {
-ret[i] = messages.get(i);
-}
-return ret;
+
+return messages.toArray(new String[messages.size()]);
 }
 
 

svn commit: r1697275 - /commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java

[dbrosius]

Author: dbrosius
Date: Sun Aug 23 22:50:52 2015
New Revision: 1697275

URL: http://svn.apache.org/r1697275
Log:
switch to more typical (idiomatic) java

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java?rev=1697275r1=1697274r2=1697275view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/InstructionFactory.java
 Sun Aug 23 22:50:52 2015
@@ -409,7 +409,7 @@ public class InstructionFactory {
  * @param op operation, such as +, *, lt;lt;, etc.
  */
 public static ArithmeticInstruction createBinaryOperation( String op, Type 
type ) {
-char first = op.toCharArray()[0];
+char first = op.charAt(0);
 switch (type.getType()) {
 case Constants.T_BYTE:
 case Constants.T_SHORT:

svn commit: r1697269 - /commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Utility.java

[dbrosius]

Author: dbrosius
Date: Sun Aug 23 22:28:37 2015
New Revision: 1697269

URL: http://svn.apache.org/r1697269
Log:
use stringbuilders right

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Utility.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Utility.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Utility.java?rev=1697269r1=1697268r2=1697269view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Utility.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Utility.java
 Sun Aug 23 22:28:37 2015
@@ -894,7 +894,7 @@ public abstract class Utility {
 
 // are there more TypeArguments?
 while (signature.charAt(consumed_chars) != '') {
-type.append(,  + 
signatureToString(signature.substring(consumed_chars), chopit));
+type.append(, 
).append(signatureToString(signature.substring(consumed_chars), chopit));
 // update our consumed count by the number of 
characters the for type argument
 consumed_chars = unwrap(Utility.consumed_chars) + 
consumed_chars;
 wrap(Utility.consumed_chars, consumed_chars);

svn commit: r1697273 - /commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java

[dbrosius]

Author: dbrosius
Date: Sun Aug 23 22:45:15 2015
New Revision: 1697273

URL: http://svn.apache.org/r1697273
Log:
reduce allocations

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java?rev=1697273r1=1697272r2=1697273view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java
 Sun Aug 23 22:45:15 2015
@@ -1035,8 +1035,7 @@ public class MethodGen extends FieldGenO
 signature = Utility.methodSignatureToString(signature, name, access, 
true,
 getLocalVariableTable(cp));
 StringBuilder buf = new StringBuilder(signature);
-for (int i = 0; i  getAttributes().length; i++) {
-Attribute a = getAttributes()[i];
+for (Attribute a : getAttributes()) {
 if (!((a instanceof Code) || (a instanceof ExceptionTable))) {
 buf.append( [).append(a).append(]);
 }

svn commit: r1697270 - in /commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6: classfile/ generic/ util/

[dbrosius]

Author: dbrosius
Date: Sun Aug 23 22:34:57 2015
New Revision: 1697270

URL: http://svn.apache.org/r1697270
Log:
avoid possible NPEs in toStrings, and simplify

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ArrayElementValue.java

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Code.java

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Field.java

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumberTable.java

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTable.java

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Method.java

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMap.java

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Utility.java

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUSH.java

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassPath.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ArrayElementValue.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ArrayElementValue.java?rev=1697270r1=1697269r2=1697270view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ArrayElementValue.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ArrayElementValue.java
 Sun Aug 23 22:34:57 2015
@@ -35,7 +35,7 @@ public class ArrayElementValue extends E
 sb.append({);
 for (int i = 0; i  evalues.length; i++)
 {
-sb.append(evalues[i].toString());
+sb.append(evalues[i]);
 if ((i + 1)  evalues.length) {
 sb.append(,);
 }

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Code.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Code.java?rev=1697270r1=1697269r2=1697270view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Code.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Code.java
 Sun Aug 23 22:34:57 2015
@@ -313,7 +313,7 @@ public final class Code extends Attribut
 if (attributes.length  0) {
 buf.append(\nAttribute(s) = );
 for (Attribute attribute : attributes) {
-buf.append(\n).append(attribute.toString());
+buf.append(\n).append(attribute);
 }
 }
 return buf.toString();

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Field.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Field.java?rev=1697270r1=1697269r2=1697270view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Field.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Field.java
 Sun Aug 23 22:34:57 2015
@@ -134,7 +134,7 @@ public final class Field extends FieldOr
 }
 for (Attribute attribute : super.getAttributes()) {
 if (!(attribute instanceof ConstantValue)) {
-buf.append( [).append(attribute.toString()).append(]);
+buf.append( [).append(attribute).append(]);
 }
 }
 return buf.toString();

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumberTable.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumberTable.java?rev=1697270r1=1697269r2=1697270view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumberTable.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumberTable.java
 Sun Aug 23 22:34:57 2015
@@ -139,7 +139,7 @@ public final class LineNumberTable exten
 }
 if ((line.length()  MAX_LINE_LENGTH)  (i  
line_number_table.length - 1)) {
 line.append(newLine);
-buf.append(line.toString());
+buf.append(line);
 line.setLength(0);
 }
 }

Modified: 
commons/proper/bcel/trunk/src/main/java/org

svn commit: r1697274 - /commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassSet.java

[dbrosius]

Author: dbrosius
Date: Sun Aug 23 22:46:36 2015
New Revision: 1697274

URL: http://svn.apache.org/r1697274
Log:
reduce allocations

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassSet.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassSet.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassSet.java?rev=1697274r1=1697273r2=1697274view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassSet.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassSet.java
 Sun Aug 23 22:46:36 2015
@@ -65,6 +65,6 @@ public class ClassSet {
 
 
 public String[] getClassNames() {
-return _map.keySet().toArray(new String[_map.keySet().size()]);
+return _map.keySet().toArray(new String[_map.size()]);
 }
 }

svn commit: r1602784 - /commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Action.java

[dbrosius]

Author: dbrosius
Date: Mon Jun 16 00:57:57 2014
New Revision: 1602784

URL: http://svn.apache.org/r1602784
Log:
guard against npes

Modified:

commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Action.java

Modified: 
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Action.java
URL: 
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Action.java?rev=1602784r1=1602783r2=1602784view=diff
==
--- 
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Action.java
 (original)
+++ 
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/model/Action.java
 Mon Jun 16 00:57:57 2014
@@ -98,7 +98,7 @@ public abstract class Action implements 
  */
 public final EnterableState getParentEnterableState()
 throws ModelException {
-if (parent == null  this instanceof Script  
((Script)this).isGlobalScript()) {
+if (parent == null || (this instanceof Script  
((Script)this).isGlobalScript())) {
 // global script doesn't have a EnterableState
 return null;
 }

svn commit: r1551450 - /commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/

[dbrosius]

Author: dbrosius
Date: Tue Dec 17 02:51:54 2013
New Revision: 1551450

URL: http://svn.apache.org/r1551450
Log:
more invoke dynamic implementation, split out from FieldOrMethod as not truly a 
subclass - patch by Bill Pugh reviewed by dbrosius

Added:

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NameSignatureInstruction.java
Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/EmptyVisitor.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldOrMethod.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GETFIELD.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GETSTATIC.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEDYNAMIC.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEINTERFACE.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESPECIAL.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESTATIC.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEVIRTUAL.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTFIELD.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTSTATIC.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/VisitorSupportsInvokeDynamic.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/EmptyVisitor.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/EmptyVisitor.java?rev=1551450r1=1551449r2=1551450view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/EmptyVisitor.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/EmptyVisitor.java
 Tue Dec 17 02:51:54 2013
@@ -744,7 +744,9 @@ public abstract class EmptyVisitor imple
 public void visitBREAKPOINT( BREAKPOINT obj ) {
 }
 
-
+public void visitNameSignatureInstruction(NameSignatureInstruction obj) {
+   }
+
public void visitINVOKEDYNAMIC(INVOKEDYNAMIC obj) {
}
 }

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldOrMethod.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldOrMethod.java?rev=1551450r1=1551449r2=1551450view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldOrMethod.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldOrMethod.java
 Tue Dec 17 02:51:54 2013
@@ -18,9 +18,7 @@
 package org.apache.bcel.generic;
 
 import org.apache.bcel.classfile.ConstantCP;
-import org.apache.bcel.classfile.ConstantNameAndType;
 import org.apache.bcel.classfile.ConstantPool;
-import org.apache.bcel.classfile.ConstantUtf8;
 
 /**
  * Super class for InvokeInstruction and FieldInstruction, since they have
@@ -29,7 +27,7 @@ import org.apache.bcel.classfile.Constan
  * @version $Id$
  * @author  A HREF=mailto:m.d...@gmx.de;M. Dahm/A
  */
-public abstract class FieldOrMethod extends CPInstruction implements LoadClass 
{
+public abstract class FieldOrMethod extends NameSignatureInstruction 
implements LoadClass {
 
 private static final long serialVersionUID = 2036985877748835708L;
 
@@ -50,26 +48,6 @@ public abstract class FieldOrMethod exte
 }
 
 
-/** @return signature of referenced method/field.
- */
-public String getSignature( ConstantPoolGen cpg ) {
-ConstantPool cp = cpg.getConstantPool();
-ConstantCP cmr = (ConstantCP) cp.getConstant(index);
-ConstantNameAndType cnat = (ConstantNameAndType) 
cp.getConstant(cmr.getNameAndTypeIndex());
-return ((ConstantUtf8) 
cp.getConstant(cnat.getSignatureIndex())).getBytes();
-}
-
-
-/** @return name of referenced method/field.
- */
-public String getName( ConstantPoolGen cpg ) {
-ConstantPool cp = cpg.getConstantPool();
-ConstantCP cmr = (ConstantCP) cp.getConstant(index);
-ConstantNameAndType cnat = (ConstantNameAndType) 
cp.getConstant(cmr.getNameAndTypeIndex());
-return ((ConstantUtf8) cp.getConstant(cnat.getNameIndex())).getBytes();
-}
-
-
 /** @return name of the referenced class/interface
  *  @deprecated If the instruction references an array class,
  *this method will return java.lang.Object.

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GETFIELD.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GETFIELD.java?rev=1551450r1=1551449r2=1551450view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel

svn commit: r1547656 - in /commons/proper/bcel/trunk/src/main/java/org/apache/bcel: ./ classfile/ generic/ util/

[dbrosius]

Author: dbrosius
Date: Wed Dec  4 00:43:17 2013
New Revision: 1547656

URL: http://svn.apache.org/r1547656
Log:
initial support for INVOKE_DYNAMIC. Patch by Bill Pugh, reviewed by dbrosius

Added:

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEDYNAMIC.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/VisitorSupportsInvokeDynamic.java
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Constants.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/EmptyVisitor.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassPath.java

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Constants.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Constants.java?rev=1547656r1=1547655r2=1547656view=diff
==
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Constants.java 
(original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Constants.java Wed 
Dec  4 00:43:17 2013
@@ -281,8 +281,8 @@ public interface Constants {
 CONSTANT_Float, CONSTANT_Long, CONSTANT_Double,
 CONSTANT_Class, CONSTANT_String, CONSTANT_Fieldref,
 CONSTANT_Methodref, CONSTANT_InterfaceMethodref,
-CONSTANT_NameAndType, CONSTANT_MethodHandle,
-CONSTANT_MethodType, CONSTANT_InvokeDynamic };
+CONSTANT_NameAndType, , , CONSTANT_MethodHandle,
+CONSTANT_MethodType, , CONSTANT_InvokeDynamic };
 
   /** The name of the static initializer, also called quot;class
*  initialization methodquot; or quot;interface initialization
@@ -1170,7 +1170,7 @@ public interface Constants {
 0/*dreturn*/, 0/*areturn*/, 0/*return*/,
 2/*getstatic*/, 2/*putstatic*/, 2/*getfield*/,
 2/*putfield*/, 2/*invokevirtual*/, 2/*invokespecial*/, 2/*invokestatic*/,
-4/*invokeinterface*/, UNDEFINED, 2/*new*/,
+4/*invokeinterface*/, 5/*invokedynamic*/, 2/*new*/,
 1/*newarray*/, 2/*anewarray*/,
 0/*arraylength*/, 0/*athrow*/, 2/*checkcast*/,
 2/*instanceof*/, 0/*monitorenter*/,
@@ -1243,7 +1243,7 @@ public interface Constants {
 {T_SHORT}/*putstatic*/, {T_SHORT}/*getfield*/,
 {T_SHORT}/*putfield*/, {T_SHORT}/*invokevirtual*/,
 {T_SHORT}/*invokespecial*/, {T_SHORT}/*invokestatic*/,
-{T_SHORT, T_BYTE, T_BYTE}/*invokeinterface*/, {},
+{T_SHORT, T_BYTE, T_BYTE}/*invokeinterface*/, {T_SHORT, T_BYTE, 
T_BYTE}/*invokedynamic*/,
 {T_SHORT}/*new*/, {T_BYTE}/*newarray*/,
 {T_SHORT}/*anewarray*/, {}/*arraylength*/, {}/*athrow*/,
 {T_SHORT}/*checkcast*/, {T_SHORT}/*instanceof*/,
@@ -1290,7 +1290,7 @@ public interface Constants {
 tableswitch, lookupswitch, ireturn, lreturn, freturn,
 dreturn, areturn, return, getstatic, putstatic, getfield,
 putfield, invokevirtual, invokespecial, invokestatic,
-invokeinterface, ILLEGAL_OPCODE, new, newarray, anewarray,
+invokeinterface, invokedynamic, new, newarray, anewarray,
 arraylength, athrow, checkcast, instanceof, monitorenter,
 monitorexit, wide, multianewarray, ifnull, ifnonnull,
 goto_w, jsr_w, breakpoint, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
@@ -1346,7 +1346,7 @@ public interface Constants {
 UNPREDICTABLE/*putstatic*/, 1/*getfield*/, UNPREDICTABLE/*putfield*/,
 UNPREDICTABLE/*invokevirtual*/, UNPREDICTABLE/*invokespecial*/,
 UNPREDICTABLE/*invokestatic*/,
-UNPREDICTABLE/*invokeinterface*/, UNDEFINED, 0/*new*/, 1/*newarray*/, 
1/*anewarray*/,
+UNPREDICTABLE/*invokeinterface*/, UNPREDICTABLE/*invokedynamic*/, 
0/*new*/, 1/*newarray*/, 1/*anewarray*/,
 1/*arraylength*/, 1/*athrow*/, 1/*checkcast*/, 1/*instanceof*/, 
1/*monitorenter*/,
 1/*monitorexit*/, 0/*wide*/, UNPREDICTABLE/*multianewarray*/, 1/*ifnull*/, 
1/*ifnonnull*/,
 0/*goto_w*/, 0/*jsr_w*/, 0/*breakpoint*/, UNDEFINED, UNDEFINED,
@@ -1402,7 +1402,7 @@ public interface Constants {
 0/*dreturn*/, 0/*areturn*/, 0/*return*/, UNPREDICTABLE/*getstatic*/, 
0/*putstatic*/,
 UNPREDICTABLE/*getfield*/, 0/*putfield*/, UNPREDICTABLE/*invokevirtual*/,
 UNPREDICTABLE/*invokespecial*/, UNPREDICTABLE/*invokestatic*/,
-UNPREDICTABLE/*invokeinterface*/, UNDEFINED, 1/*new*/, 1/*newarray*/, 
1/*anewarray*/,
+UNPREDICTABLE/*invokeinterface*/, UNPREDICTABLE/*invokedynamic*/, 
1/*new*/, 1/*newarray*/, 1/*anewarray*/,
 1/*arraylength*/, 1/*athrow*/, 1/*checkcast*/, 1/*instanceof*/, 
0/*monitorenter*/,
 0/*monitorexit*/, 0/*wide*/, 1/*multianewarray*/, 0/*ifnull*/, 
0/*ifnonnull*/,
 0/*goto_w*/, 1/*jsr_w*/, 0/*breakpoint*/, UNDEFINED, UNDEFINED,

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java

svn commit: r1533849 - /commons/dormant/clazz/trunk/src/java/org/apache/commons/clazz/bean/BeanClazz.java

[dbrosius]

Author: dbrosius
Date: Sun Oct 20 02:58:40 2013
New Revision: 1533849

URL: http://svn.apache.org/r1533849
Log:
'operations' cache was not actually updated in refreshOperationCache, fixed

Modified:

commons/dormant/clazz/trunk/src/java/org/apache/commons/clazz/bean/BeanClazz.java

Modified: 
commons/dormant/clazz/trunk/src/java/org/apache/commons/clazz/bean/BeanClazz.java
URL: 
http://svn.apache.org/viewvc/commons/dormant/clazz/trunk/src/java/org/apache/commons/clazz/bean/BeanClazz.java?rev=1533849r1=1533848r2=1533849view=diff
==
--- 
commons/dormant/clazz/trunk/src/java/org/apache/commons/clazz/bean/BeanClazz.java
 (original)
+++ 
commons/dormant/clazz/trunk/src/java/org/apache/commons/clazz/bean/BeanClazz.java
 Sun Oct 20 02:58:40 2013
@@ -129,7 +129,7 @@ public class BeanClazz extends Clazz {
 }
 
 protected void refreshOperationCache() {
-List operations = new ArrayList();
+operations = new ArrayList();
 Set signatures = new HashSet();
 if (superClazz != null) {
 List superOperations = superClazz.getOperations();

svn commit: r1532946 - /commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java

[dbrosius]

Author: dbrosius
Date: Thu Oct 17 01:10:12 2013
New Revision: 1532946

URL: http://svn.apache.org/r1532946
Log:
remove deprecation with equivalent method (naming)

Modified:

commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java

Modified: 
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
URL: 
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java?rev=1532946r1=1532945r2=1532946view=diff
==
--- 
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
 (original)
+++ 
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
 Thu Oct 17 01:10:12 2013
@@ -2148,7 +2148,7 @@ public final class SCXMLReader {
 // Instantiate the XMLInputFactory
 XMLInputFactory factory = XMLInputFactory.newInstance();
 if (configuration.factoryId != null  
configuration.factoryClassLoader != null) {
-factory = XMLInputFactory.newInstance(configuration.factoryId, 
configuration.factoryClassLoader);
+factory = XMLInputFactory.newFactory(configuration.factoryId, 
configuration.factoryClassLoader);
 }
 factory.setEventAllocator(configuration.allocator);
 for (Map.EntryString, Object property : 
configuration.properties.entrySet()) {

svn commit: r1532951 - /commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/TriggerEventTest.java

[dbrosius]

Author: dbrosius
Date: Thu Oct 17 01:37:21 2013
New Revision: 1532951

URL: http://svn.apache.org/r1532951
Log:
fix junit assert usage

Modified:

commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/TriggerEventTest.java

Modified: 
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/TriggerEventTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/TriggerEventTest.java?rev=1532951r1=1532950r2=1532951view=diff
==
--- 
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/TriggerEventTest.java
 (original)
+++ 
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/TriggerEventTest.java
 Thu Oct 17 01:37:21 2013
@@ -68,18 +68,18 @@ public class TriggerEventTest {
  */
 @Test
 public void testTriggerEventGetters() {
-Assert.assertEquals(te1.getName(), name1);
-Assert.assertEquals(te2.getType(), 2);
+Assert.assertEquals(name1, te1.getName());
+Assert.assertEquals(2, te2.getType());
 Assert.assertNull(te7.getPayload());
 }
 
 @Test
 public void testTriggerEventEquals() {
-Assert.assertTrue(te1.equals(te2));
-Assert.assertTrue(te3.equals(te4));
-Assert.assertTrue(te5.equals(te6));
-Assert.assertFalse(te1.equals(te4));
-Assert.assertFalse(te7.equals(null));
+Assert.assertEquals(te1, te2);
+Assert.assertEquals(te3, te4);
+Assert.assertEquals(te5, te6);
+Assert.assertNotEquals(te1, te4);
+Assert.assertNotNull(te7);
 }
 
 @Test

svn commit: r1532198 - /commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java

[dbrosius]

Author: dbrosius
Date: Tue Oct 15 06:00:57 2013
New Revision: 1532198

URL: http://svn.apache.org/r1532198
Log:
add hashCode()

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java?rev=1532198r1=1532197r2=1532198view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Instruction.java
 Tue Oct 15 06:00:57 2013
@@ -553,4 +553,12 @@ public abstract class Instruction implem
 public boolean equals( Object that ) {
 return (that instanceof Instruction) ? cmp.equals(this, (Instruction) 
that) : false;
 }
+
+/** calculate the hashCode of this object
+ * @return the hashCode
+ */
+@Override
+public int hashCode() {
+return opcode;
+}
 }

svn commit: r1532202 - in /commons/proper/bcel/trunk/src/main/java/org/apache/bcel: util/ verifier/statics/ verifier/structurals/

[dbrosius]

Author: dbrosius
Date: Tue Oct 15 06:13:17 2013
New Revision: 1532202

URL: http://svn.apache.org/r1532202
Log:
simplify and avoid NPEs

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/AttributeHTML.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassLoaderRepository.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/SyntheticRepository.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/LocalVariables.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/OperandStack.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/AttributeHTML.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/AttributeHTML.java?rev=1532202r1=1532201r2=1532202view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/AttributeHTML.java 
(original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/AttributeHTML.java 
Tue Oct 15 06:13:17 2013
@@ -203,7 +203,7 @@ final class AttributeHTML implements org
 file.print(/UL\n);
 break;
 default: // Such as Unknown attribute or Deprecated
-file.print(P + attribute.toString());
+file.print(P + attribute);
 }
 file.println(/TD/TR);
 file.flush();

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassLoaderRepository.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassLoaderRepository.java?rev=1532202r1=1532201r2=1532202view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassLoaderRepository.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassLoaderRepository.java
 Tue Oct 15 06:13:17 2013
@@ -97,7 +97,7 @@ public class ClassLoaderRepository imple
 storeClass(RC);
 return RC;
 } catch (IOException e) {
-throw new ClassNotFoundException(className +  not found:  + 
e.toString(), e);
+throw new ClassNotFoundException(className +  not found:  + e, 
e);
 }
 }
 

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/SyntheticRepository.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/SyntheticRepository.java?rev=1532202r1=1532201r2=1532202view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/SyntheticRepository.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/SyntheticRepository.java
 Tue Oct 15 06:13:17 2013
@@ -123,7 +123,7 @@ public class SyntheticRepository impleme
 return loadClass(_path.getInputStream(className), className);
 } catch (IOException e) {
 throw new ClassNotFoundException(Exception while looking for 
class  + className
-+ :  + e.toString(), e);
++ :  + e, e);
 }
 }
 
@@ -178,7 +178,7 @@ public class SyntheticRepository impleme
 }
 } catch (IOException e) {
 throw new ClassNotFoundException(Exception while looking for 
class  + className
-+ :  + e.toString(), e);
++ :  + e, e);
 } finally {
 if (is != null){
 try {

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java?rev=1532202r1=1532201r2=1532202view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java
 Tue Oct 15 06:13:17 2013
@@ -172,7 +172,7 @@ public final class Pass2Verifier extends
 
} catch (ClassNotFoundException e) {
// FIXME: this might not be the best way to handle missing 
classes

svn commit: r1532204 - /commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassPath.java

[dbrosius]

Author: dbrosius
Date: Tue Oct 15 06:17:32 2013
New Revision: 1532204

URL: http://svn.apache.org/r1532204
Log:
only allocate the archive filter once

Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassPath.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassPath.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassPath.java?rev=1532204r1=1532203r2=1532204view=diff
==
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassPath.java 
(original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassPath.java 
Tue Oct 15 06:17:32 2013
@@ -46,6 +46,15 @@ public class ClassPath implements Serial
 
 private static final long serialVersionUID = 2099441438483340671L;
 public static final ClassPath SYSTEM_CLASS_PATH = new ClassPath();
+
+private static final FilenameFilter ARCHIVE_FILTER = new FilenameFilter() {
+
+public boolean accept( File dir, String name ) {
+name = name.toLowerCase(Locale.ENGLISH);
+return name.endsWith(.zip) || name.endsWith(.jar);
+}
+};
+
 private PathEntry[] paths;
 private String class_path;
 private ClassPath parent;
@@ -155,13 +164,7 @@ public class ClassPath implements Serial
 getPathComponents(ext_path, dirs);
 for (String d : dirs) {
 File ext_dir = new File(d);
-String[] extensions = ext_dir.list(new FilenameFilter() {
-
-public boolean accept( File dir, String name ) {
-name = name.toLowerCase(Locale.ENGLISH);
-return name.endsWith(.zip) || name.endsWith(.jar);
-}
-});
+String[] extensions = ext_dir.list(ARCHIVE_FILTER);
 if (extensions != null) {
 for (int i = 0; i  extensions.length; i++) {
 list.add(ext_dir.getPath() + File.separatorChar + 
extensions[i]);

svn commit: r1532205 - /commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java

[dbrosius]

Author: dbrosius
Date: Tue Oct 15 06:21:06 2013
New Revision: 1532205

URL: http://svn.apache.org/r1532205
Log:
only allocate the instructionhandle q once per MethodGen

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java?rev=1532205r1=1532204r2=1532205view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java
 Tue Oct 15 06:21:06 2013
@@ -413,6 +413,7 @@ public class Subroutines{

MapInstructionHandle, Integer colors = new 
HashMapInstructionHandle, Integer(); //Graph colouring. Key: 
InstructionHandle, Value: Integer .

+ListInstructionHandle Q = new ArrayListInstructionHandle();

for (InstructionHandle actual : sub_leaders) {
// Do some BFS with actual as the root of the graph.
// Init colors
@@ -421,7 +422,8 @@ public class Subroutines{
}
colors.put(actual, GRAY);
// Init Queue
-   ListInstructionHandle Q = new 
ArrayListInstructionHandle();
+
+   Q.clear();
Q.add(actual); // add(Obj) adds to the end, remove(0) 
removes from the start.

/* BFS ALGORITHM MODIFICATION: Start out with multiple 
root nodes, as exception handlers are starting points of top-level code, too. 
[why top-level? TODO: Refer to the special JustIce notion of subroutines.]*/

svn commit: r1532219 - in /commons/proper/bcel/trunk/src/main/java/org/apache/bcel: classfile/ConstantUtf8.java generic/ObjectType.java verifier/VerifierAppFrame.java verifier/VerifierFactoryListModel

[dbrosius]

Author: dbrosius
Date: Tue Oct 15 06:46:05 2013
New Revision: 1532219

URL: http://svn.apache.org/r1532219
Log:
fix generics problems

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantUtf8.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ObjectType.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryListModel.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantUtf8.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantUtf8.java?rev=1532219r1=1532218r2=1532219view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantUtf8.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantUtf8.java
 Tue Oct 15 06:46:05 2013
@@ -70,7 +70,7 @@ public final class ConstantUtf8 extends 
 considered++;
 if (cache == null)  {
 cache = new LinkedHashMapString, 
ConstantUtf8(INITIAL_CACHE_CAPACITY, 0.75f, true) {
-protected boolean removeEldestEntry(Map.Entry eldest) {
+protected boolean removeEldestEntry(Map.EntryString, 
ConstantUtf8 eldest) {
  return size()  MAX_CACHE_ENTRIES;
 }
 };

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ObjectType.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ObjectType.java?rev=1532219r1=1532218r2=1532219view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ObjectType.java 
(original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ObjectType.java 
Tue Oct 15 06:46:05 2013
@@ -44,7 +44,7 @@ public class ObjectType extends Referenc
 cache = new LinkedHashMapString, 
ObjectType(INITIAL_CACHE_CAPACITY, 0.75f, true) {
 
 
-protected boolean removeEldestEntry(Map.Entry eldest) {
+protected boolean removeEldestEntry(Map.EntryString, ObjectType 
eldest) {
return size()  MAX_CACHE_ENTRIES;
 }
 

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java?rev=1532219r1=1532218r2=1532219view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java
 Tue Oct 15 06:46:05 2013
@@ -58,7 +58,7 @@ public class VerifierAppFrame extends JF
 JPanel jPanel2 = new JPanel();
 JSplitPane jSplitPane2 = new JSplitPane();
 JPanel jPanel3 = new JPanel();
-JList classNamesJList = new JList();
+JListString classNamesJList = new JListString();
 GridLayout gridLayout1 = new GridLayout();
 JPanel messagesPanel = new JPanel();
 GridLayout gridLayout2 = new GridLayout();
@@ -83,8 +83,8 @@ public class VerifierAppFrame extends JF
 JScrollPane jScrollPane5 = new JScrollPane();
 JScrollPane jScrollPane6 = new JScrollPane();
 JScrollPane jScrollPane7 = new JScrollPane();
-JList pass3aJList = new JList();
-JList pass3bJList = new JList();
+JListString pass3aJList = new JListString();
+JListString pass3bJList = new JListString();
 JTextPane pass3aTextPane = new JTextPane();
 JTextPane pass3bTextPane = new JTextPane();
 JMenu jMenu2 = new JMenu();
@@ -257,10 +257,10 @@ public class VerifierAppFrame extends JF
 pass2TextPane.setText();
 pass2TextPane.setBackground(Color.yellow);
 pass3aTextPane.setText();
-pass3aJList.setListData(new Object[0]);
+pass3aJList.setListData(new String[0]);
 pass3aTextPane.setBackground(Color.yellow);
 pass3bTextPane.setText();
-pass3bJList.setListData(new Object[0]);
+pass3bJList.setListData(new String[0]);
 pass3bTextPane.setBackground(Color.yellow);
 } else { // Must be VERIFIED_OK, Pass 1 does not know VERIFIED_NOTYET
 pass1TextPane.setBackground(Color.green);
@@ -271,10 +271,10 @@ public class VerifierAppFrame extends JF
 pass2TextPane.setBackground(Color.red);
 pass3aTextPane.setText();
 pass3aTextPane.setBackground(Color.yellow);
-pass3aJList.setListData(new Object[0]);
+pass3aJList.setListData(new String[0

svn commit: r1532221 - in /commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile: PMGClass.java Signature.java SourceFile.java

[dbrosius]

Author: dbrosius
Date: Tue Oct 15 06:49:16 2013
New Revision: 1532221

URL: http://svn.apache.org/r1532221
Log:
remove unnecessary casts

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/PMGClass.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Signature.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/SourceFile.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/PMGClass.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/PMGClass.java?rev=1532221r1=1532220r2=1532221view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/PMGClass.java 
(original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/PMGClass.java 
Tue Oct 15 06:49:16 2013
@@ -169,6 +169,6 @@ public final class PMGClass extends Attr
  */
 @Override
 public Attribute copy( ConstantPool _constant_pool ) {
-return (PMGClass) clone();
+return clone();
 }
 }

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Signature.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Signature.java?rev=1532221r1=1532220r2=1532221view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Signature.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Signature.java
 Tue Oct 15 06:49:16 2013
@@ -265,6 +265,6 @@ public final class Signature extends Att
  */
 @Override
 public Attribute copy( ConstantPool _constant_pool ) {
-return (Signature) clone();
+return clone();
 }
 }

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/SourceFile.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/SourceFile.java?rev=1532221r1=1532220r2=1532221view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/SourceFile.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/SourceFile.java
 Tue Oct 15 06:49:16 2013
@@ -147,6 +147,6 @@ public final class SourceFile extends At
  */
 @Override
 public Attribute copy( ConstantPool _constant_pool ) {
-return (SourceFile) clone();
+return clone();
 }
 }

svn commit: r1532227 - /commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/CodeHTML.java

[dbrosius]

Author: dbrosius
Date: Tue Oct 15 06:55:44 2013
New Revision: 1532227

URL: http://svn.apache.org/r1532227
Log:
remove dead parameter

Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/CodeHTML.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/CodeHTML.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/CodeHTML.java?rev=1532227r1=1532226r2=1532227view=diff
==
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/CodeHTML.java 
(original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/CodeHTML.java 
Tue Oct 15 06:55:44 2013
@@ -365,7 +365,7 @@ final class CodeHTML implements org.apac
  * Find all target addresses in code, so that they can be marked
  * with lt;A NAME = ...gt;. Target addresses are kept in an BitSet 
object.
  */
-private final void findGotos( ByteSequence bytes, Method method, Code code 
) throws IOException {
+private final void findGotos( ByteSequence bytes, Code code ) throws 
IOException {
 int index;
 goto_set = new BitSet(bytes.available());
 int opcode;
@@ -535,7 +535,7 @@ final class CodeHTML implements org.apac
 // Print the byte code
 ByteSequence stream = new ByteSequence(code);
 stream.mark(stream.available());
-findGotos(stream, method, c);
+findGotos(stream, c);
 stream.reset();
 file.println(TABLE BORDER=0TRTH 
ALIGN=LEFTByteBRoffset/TH
 + TH ALIGN=LEFTInstruction/THTH 
ALIGN=LEFTArgument/TH);

svn commit: r1532630 - /commons/proper/jelly/trunk/pom.xml

[dbrosius]

Author: dbrosius
Date: Wed Oct 16 02:22:06 2013
New Revision: 1532630

URL: http://svn.apache.org/r1532630
Log:
an initial attempt at having a maven2 pom

Added:
commons/proper/jelly/trunk/pom.xml

Added: commons/proper/jelly/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/pom.xml?rev=1532630view=auto
==
--- commons/proper/jelly/trunk/pom.xml (added)
+++ commons/proper/jelly/trunk/pom.xml Wed Oct 16 02:22:06 2013
@@ -0,0 +1,487 @@
+?xml version=1.0 encoding=UTF-8?
+project xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd; 
xmlns=http://maven.apache.org/POM/4.0.0;
+xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+  parent
+groupIdorg.apache.commons/groupId
+artifactIdcommons-parent/artifactId
+version28/version
+  /parent
+  modelVersion4.0.0/modelVersion
+  groupIdcommons-jelly/groupId
+  artifactIdcommons-jelly/artifactId
+  version1.1-SNAPSHOT/version
+  namecommons-jelly/name
+  descriptionJelly is a Java and XML based scripting engine. Jelly combines 
the best ideas from JSTL, Velocity, DVSL, Ant and Cocoon all together in a 
simple yet powerful scripting engine./description
+  urlhttp://commons.apache.org/jelly//url
+  inceptionYear2002/inceptionYear
+  organization
+nameThe Apache Software Foundation/name
+urlhttp://commons.apache.org//url
+  /organization
+  mailingLists
+mailingList
+  nameCommons Dev List/name
+  subscribedev-subscr...@commons.apache.org/subscribe
+  unsubscribedev-unsubscr...@commons.apache.org/unsubscribe
+  archivehttp://mail-archives.apache.org/mod_mbox/commons-dev//archive
+/mailingList
+mailingList
+  nameCommons User List/name
+  subscribeuser-subscr...@commons.apache.org/subscribe
+  unsubscribeuser-unsubscr...@commons.apache.org/unsubscribe
+  archivehttp://mail-archives.apache.org/mod_mbox/commons-user//archive
+/mailingList
+  /mailingLists
+  developers
+developer
+  idjstrachan/id
+  nameJames Strachan/name
+  emailjstrac...@apache.org/email
+  organizationSpiritSoft, Inc./organization
+/developer
+developer
+  idgeirm/id
+  nameGeir Magnusson Jr./name
+  emailge...@adeptra.com/email
+  organizationAdeptra, Inc./organization
+/developer
+developer
+  idwerken/id
+  nameBob McWhirter/name
+  emailb...@eng.werken.com/email
+  organizationThe Werken Company/organization
+/developer
+developer
+  iddion/id
+  namedIon Gillard/name
+  emaild...@multitask.com.au/email
+  organizationMultitask Consulting/organization
+  roles
+roleInterested party/role
+  /roles
+/developer
+developer
+  idmorgand/id
+  nameMorgan Delagrange/name
+  emailmorg...@apache.org/email
+/developer
+developer
+  idrwaldhoff/id
+  nameRodney Waldhoff/name
+  emailrwaldh...@apache.org/email
+/developer
+developer
+  idproyal/id
+  namePeter Royal/name
+  emailpro...@apache.org/email
+/developer
+developer
+  idmvdb/id
+  nameMartin van den Bemt/name
+  emailmar...@mvdb.net/email
+/developer
+developer
+  idpolx/id
+  namePaul Libbrecht/name
+  emailp...@activemath.org/email
+/developer
+developer
+  idrdonkin/id
+  nameRobert Burrell Donkin/name
+  emailrdon...@apache.org/email
+/developer
+developer
+  iddfs/id
+  nameDaniel F. Savarese/name
+  emaildfs - apache.org/email
+/developer
+developer
+  idbrett/id
+  nameBrett Porter/name
+  emailbr...@apache.org/email
+/developer
+developer
+  idhgilde/id
+  nameHans Gilde/name
+  emailhgi...@apache.org/email
+/developer
+  /developers
+  contributors
+contributor
+  nameErik Fransen/name
+  emailerik...@xs4all.nl/email
+  roles
+roleLogo designer/role
+  /roles
+/contributor
+contributor
+  nameCalvin Yu/name
+/contributor
+contributor
+  nameStephen Haberman/name
+  emailsteph...@chase3000.com/email
+/contributor
+contributor
+  nameVinay Chandran/name
+  emailsahilvi...@yahoo.com/email
+  roles
+roleDeveloper/role
+  /roles
+/contributor
+contributor
+  nameTheo Niemeijer/name
+/contributor
+contributor
+  nameJoe Walnes/name
+  emailj...@thoughtworks.com/email
+  organizationThoughtWorks, Inc./organization
+  roles
+roleInventor of Mock Tags/role
+  /roles
+/contributor
+contributor
+  nameOtto von Wachter/name
+  emailvon...@yahoo.com/email
+  organization/organization
+  roles
+roleAuthor of the tutorials/role
+roleDeveloper/role
+  /roles
+/contributor
+contributor
+  nameRobert Leftwich/name
+  emailrob...@leftwich.info/email
+  roles

svn commit: r1532631 - /commons/proper/jelly/trunk/pom.xml

[dbrosius]

Author: dbrosius
Date: Wed Oct 16 02:25:48 2013
New Revision: 1532631

URL: http://svn.apache.org/r1532631
Log:
update relocated jar references

Modified:
commons/proper/jelly/trunk/pom.xml

Modified: commons/proper/jelly/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/pom.xml?rev=1532631r1=1532630r2=1532631view=diff
==
--- commons/proper/jelly/trunk/pom.xml (original)
+++ commons/proper/jelly/trunk/pom.xml Wed Oct 16 02:25:48 2013
@@ -369,8 +369,8 @@
   /distributionManagement
   dependencies
 dependency
-  groupIdservletapi/groupId
-  artifactIdservletapi/artifactId
+  groupIdjavax.servlet/groupId
+  artifactIdservlet-api/artifactId
   version2.3/version
 /dependency
 dependency
@@ -394,7 +394,7 @@
   version1.0-beta-5/version
 /dependency
 dependency
-  groupIdjstl/groupId
+  groupIdjavax.servlet/groupId
   artifactIdjstl/artifactId
   version1.0.6/version
 /dependency
@@ -430,7 +430,7 @@
 /dependency
 dependency
   groupIdxerces/groupId
-  artifactIdxerces/artifactId
+  artifactIdxercesImpl/artifactId
   version2.2.1/version
 /dependency
   /dependencies

svn commit: r1532637 [4/4] - in /commons/proper/scxml/trunk: ./ src/test/java/org/apache/commons/scxml2/ src/test/java/org/apache/commons/scxml2/env/ src/test/java/org/apache/commons/scxml2/env/faces/

[dbrosius]

Modified: 
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java?rev=1532637r1=1532636r2=1532637view=diff
==
--- 
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java
 (original)
+++ 
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml2/model/DatamodelTest.java
 Wed Oct 16 03:46:58 2013
@@ -21,7 +21,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import junit.framework.TestCase;
 import org.apache.commons.scxml2.SCXMLExecutor;
 import org.apache.commons.scxml2.SCXMLTestHelper;
 import org.apache.commons.scxml2.TriggerEvent;
@@ -29,17 +28,14 @@ import org.apache.commons.scxml2.env.jex
 import org.apache.commons.scxml2.env.jexl.JexlEvaluator;
 import org.apache.commons.scxml2.env.jsp.ELContext;
 import org.apache.commons.scxml2.env.jsp.ELEvaluator;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 /**
  * Unit tests {@link org.apache.commons.scxml2.SCXMLExecutor}.
  */
-public class DatamodelTest extends TestCase {
-/**
- * Construct a new instance of SCXMLExecutorTest with
- * the specified name
- */
-public DatamodelTest(String name) {
-super(name);
-}
+public class DatamodelTest {
 
 // Test data
 private URL datamodel01jexl, datamodel02jexl, datamodel04jexl, 
datamodel05jexl, datamodel01jsp, datamodel02jsp;
@@ -48,7 +44,7 @@ public class DatamodelTest extends TestC
 /**
  * Set up instance variables required by this test case.
  */
-@Override
+@Before
 public void setUp() {
 datamodel01jexl = this.getClass().getClassLoader().
 getResource(org/apache/commons/scxml2/env/jexl/datamodel-01.xml);
@@ -67,71 +63,76 @@ public class DatamodelTest extends TestC
 /**
  * Tear down instance variables required by this test case.
  */
-@Override
+@After
 public void tearDown() {
 datamodel01jexl = datamodel02jexl = datamodel04jexl = datamodel05jexl 
= datamodel01jsp = datamodel02jsp = null;
 }
 
 /**
  * Test the stateless model, simultaneous executions
- */
+ */
+@Test
 public void testDatamodelSimultaneousJexl() throws Exception {
 exec01 = SCXMLTestHelper.getExecutor(datamodel01jexl,
 new JexlContext(), new JexlEvaluator());
-assertNotNull(exec01);
+Assert.assertNotNull(exec01);
 exec02 = SCXMLTestHelper.getExecutor(datamodel01jexl,
 new JexlContext(), new JexlEvaluator());
-assertNotNull(exec02);
-assertFalse(exec01 == exec02);
+Assert.assertNotNull(exec02);
+Assert.assertFalse(exec01 == exec02);
 runtest();
 }
-
+
+@Test
 public void testDatamodelSimultaneousJsp() throws Exception {
 exec01 = SCXMLTestHelper.getExecutor(datamodel01jsp,
 new ELContext(), new ELEvaluator());
-assertNotNull(exec01);
+Assert.assertNotNull(exec01);
 exec02 = SCXMLTestHelper.getExecutor(datamodel01jsp,
 new ELContext(), new ELEvaluator());
-assertNotNull(exec02);
-assertFalse(exec01 == exec02);
+Assert.assertNotNull(exec02);
+Assert.assertFalse(exec01 == exec02);
 runtest();
 }
-
+
+@Test
 public void testDatamodelNamespacePrefixedXPaths() throws Exception {
 exec01 = SCXMLTestHelper.getExecutor(datamodel02jexl,
 new JexlContext(), new JexlEvaluator());
-assertNotNull(exec01);
+Assert.assertNotNull(exec01);
 exec02 = SCXMLTestHelper.getExecutor(datamodel02jsp,
 new ELContext(), new ELEvaluator());
-assertNotNull(exec02);
-assertFalse(exec01 == exec02);
+Assert.assertNotNull(exec02);
+Assert.assertFalse(exec01 == exec02);
 runtest();
 }
-
+
+@Test
 public void testDatamodel04Jexl() throws Exception {
 exec01 = SCXMLTestHelper.getExecutor(datamodel04jexl,
 new JexlContext(), new JexlEvaluator());
-assertNotNull(exec01);
+Assert.assertNotNull(exec01);
 SetTransitionTarget currentStates = 
exec01.getCurrentStatus().getStates();
-assertEquals(1, currentStates.size());
-assertEquals(ten, currentStates.iterator().next().getId());
+Assert.assertEquals(1, currentStates.size());
+Assert.assertEquals(ten, currentStates.iterator().next().getId());
 MapString, Object payload = new HashMapString, Object();
 payload.put(one, 1);
 payload.put(two, 2);
 TriggerEvent te = new TriggerEvent(ten.done, 
TriggerEvent.SIGNAL_EVENT, payload);
 SCXMLTestHelper.fireEvent(exec01, te);
 

svn commit: r1532170 - in /commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2: ./ impl/

[dbrosius]

Author: dbrosius
Date: Tue Oct 15 02:52:47 2013
New Revision: 1532170

URL: http://svn.apache.org/r1532170
Log:
update junit usage to version 4

Modified:

commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBaseKeyedPoolableObjectFactory.java

commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java

commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBasePoolableObjectFactory.java

commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java

commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestObjectPool.java

commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestPoolUtils.java

commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java

commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java

commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java

commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPoolClassLoaders.java

commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java

Modified: 
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBaseKeyedPoolableObjectFactory.java
URL: 
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBaseKeyedPoolableObjectFactory.java?rev=1532170r1=1532169r2=1532170view=diff
==
--- 
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBaseKeyedPoolableObjectFactory.java
 (original)
+++ 
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBaseKeyedPoolableObjectFactory.java
 Tue Oct 15 02:52:47 2013
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.pool2;
 
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 

Modified: 
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java
URL: 
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java?rev=1532170r1=1532169r2=1532170view=diff
==
--- 
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java
 (original)
+++ 
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java
 Tue Oct 15 02:52:47 2013
@@ -16,9 +16,9 @@
  */
 package org.apache.commons.pool2;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import org.junit.Test;
 

Modified: 
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBasePoolableObjectFactory.java
URL: 
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBasePoolableObjectFactory.java?rev=1532170r1=1532169r2=1532170view=diff
==
--- 
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBasePoolableObjectFactory.java
 (original)
+++ 
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBasePoolableObjectFactory.java
 Tue Oct 15 02:52:47 2013
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.pool2;
 
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 

Modified: 
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
URL: 
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java?rev=1532170r1=1532169r2=1532170view=diff
==
--- 
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
 (original)
+++ 
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
 Tue Oct 15 02:52:47 2013
@@ -16,15 +16,13 @@
  */
 package org.apache.commons.pool2;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import junit.framework.TestCase;
-
 import org.apache.commons.pool2.impl.DefaultPooledObject;
 import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
 import org.junit.After;

Modified: 
commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2

svn commit: r1532192 - /commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java

[dbrosius]

Author: dbrosius
Date: Tue Oct 15 05:27:08 2013
New Revision: 1532192

URL: http://svn.apache.org/r1532192
Log:
avoid unnecessary allocations

Modified:

commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java

Modified: 
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
URL: 
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java?rev=1532192r1=1532191r2=1532192view=diff
==
--- 
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
 (original)
+++ 
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
 Tue Oct 15 05:27:08 2013
@@ -1294,10 +1294,10 @@ public class GenericKeyedObjectPoolK,T
 new HashMapString,ListDefaultPooledObjectInfo();
 
 for (K key : poolMap.keySet()) {
-ListDefaultPooledObjectInfo list =
-new ArrayListDefaultPooledObjectInfo();
 ObjectDequeT queue = poolMap.get(key);
 if (queue != null) {
+ListDefaultPooledObjectInfo list =
+new ArrayListDefaultPooledObjectInfo();
 result.put(key.toString(), list);
 for (PooledObjectT p : queue.getAllObjects().values()) {
 list.add(new DefaultPooledObjectInfo(p));

svn commit: r1532197 - in /commons/proper/bcel/trunk/src/main/java/org/apache/bcel: classfile/ generic/

[dbrosius]

Author: dbrosius
Date: Tue Oct 15 05:52:15 2013
New Revision: 1532197

URL: http://svn.apache.org/r1532197
Log:
make clone() more user friendly

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Attribute.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Constant.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassGen.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CodeExceptionGen.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldGenOrMethodGen.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LineNumberGen.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LocalVariableGen.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Attribute.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Attribute.java?rev=1532197r1=1532196r2=1532197view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Attribute.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Attribute.java
 Tue Oct 15 05:52:15 2013
@@ -298,18 +298,18 @@ public abstract class Attribute implemen
 * @return shallow copy of this attribute
 */
@Override
-public Object clone()
+public Attribute clone()
{
-   Object o = null;
+   Attribute attr = null;
try
{
-   o = super.clone();
+   attr = (Attribute) super.clone();
}
catch (CloneNotSupportedException e)
{
-   e.printStackTrace(); // Never occurs
+   throw new Error(Clone Not Supported); // never happens
}
-   return o;
+   return attr;
}
 
/**

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Constant.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Constant.java?rev=1532197r1=1532196r2=1532197view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Constant.java 
(original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Constant.java 
Tue Oct 15 05:52:15 2013
@@ -21,6 +21,7 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.Serializable;
+
 import org.apache.bcel.Constants;
 import org.apache.bcel.util.BCELComparator;
 
@@ -109,8 +110,12 @@ public abstract class Constant implement
 
 
 @Override
-public Object clone() throws CloneNotSupportedException {
-return super.clone();
+public Constant clone() {
+try {
+return (Constant) super.clone();
+} catch (CloneNotSupportedException e) {
+throw new Error(Clone Not Supported); // never happens
+}
 }
 
 

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassGen.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassGen.java?rev=1532197r1=1532196r2=1532197view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassGen.java 
(original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassGen.java 
Tue Oct 15 05:52:15 2013
@@ -560,12 +560,11 @@ public class ClassGen extends AccessFlag
 
 
 @Override
-public Object clone() {
+public ClassGen clone() {
 try {
-return super.clone();
+return (ClassGen) super.clone();
 } catch (CloneNotSupportedException e) {
-System.err.println(e);
-return null;
+throw new Error(Clone Not Supported); // never happens
 }
 }
 

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CodeExceptionGen.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CodeExceptionGen.java?rev=1532197r1=1532196r2=1532197view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CodeExceptionGen.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CodeExceptionGen.java
 Tue Oct 15 05:52:15 2013
@@ -177,12 +177,11 @@ public final class CodeExceptionGen impl
 
 
 @Override
-public Object clone() {
+public CodeExceptionGen clone() {
 try {
-return super.clone();
+return (CodeExceptionGen) super.clone

svn commit: r1517404 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/FastMath.java

[dbrosius]

Author: dbrosius
Date: Mon Aug 26 01:05:11 2013
New Revision: 1517404

URL: http://svn.apache.org/r1517404
Log:
remove dead store to 'resultb'

Modified:

commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/FastMath.java

Modified: 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/FastMath.java
URL: 
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/FastMath.java?rev=1517404r1=1517403r2=1517404view=diff
==
--- 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/FastMath.java
 (original)
+++ 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/FastMath.java
 Mon Aug 26 01:05:11 2013
@@ -2561,7 +2561,6 @@ public class FastMath {
 zb += pib - resultb;
 
 result = za + zb;
-resultb = -(result - za - zb);
 }
 
 

svn commit: r1517416 - in /commons/proper/math/trunk/src/main/java/org/apache/commons/math3: random/EmpiricalDistribution.java random/SobolSequenceGenerator.java random/ValueServer.java util/DefaultTr

[dbrosius]

Author: dbrosius
Date: Mon Aug 26 03:04:38 2013
New Revision: 1517416

URL: http://svn.apache.org/r1517416
Log:
simplify string to primitive conversion

Modified:

commons/proper/math/trunk/src/main/java/org/apache/commons/math3/random/EmpiricalDistribution.java

commons/proper/math/trunk/src/main/java/org/apache/commons/math3/random/SobolSequenceGenerator.java

commons/proper/math/trunk/src/main/java/org/apache/commons/math3/random/ValueServer.java

commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/DefaultTransformer.java

Modified: 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/random/EmpiricalDistribution.java
URL: 
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/random/EmpiricalDistribution.java?rev=1517416r1=1517415r2=1517416view=diff
==
--- 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/random/EmpiricalDistribution.java
 (original)
+++ 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/random/EmpiricalDistribution.java
 Mon Aug 26 03:04:38 2013
@@ -369,7 +369,7 @@ public class EmpiricalDistribution exten
 double val = 0.0;
 sampleStats = new SummaryStatistics();
 while ((str = inputStream.readLine()) != null) {
-val = Double.valueOf(str).doubleValue();
+val = Double.parseDouble(str);
 sampleStats.addValue(val);
 }
 inputStream.close();
@@ -428,7 +428,7 @@ public class EmpiricalDistribution exten
 // Set up grid
 min = sampleStats.getMin();
 max = sampleStats.getMax();
-delta = (max - min)/(Double.valueOf(binCount)).doubleValue();
+delta = (max - min)/((double) binCount);
 
 // Initialize binStats ArrayList
 if (!binStats.isEmpty()) {

Modified: 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/random/SobolSequenceGenerator.java
URL: 
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/random/SobolSequenceGenerator.java?rev=1517416r1=1517415r2=1517416view=diff
==
--- 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/random/SobolSequenceGenerator.java
 (original)
+++ 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/random/SobolSequenceGenerator.java
 Mon Aug 26 03:04:38 2013
@@ -206,13 +206,13 @@ public class SobolSequenceGenerator impl
 while ( (line = reader.readLine()) != null) {
 StringTokenizer st = new StringTokenizer(line,  );
 try {
-dim = Integer.valueOf(st.nextToken());
+dim = Integer.parseInt(st.nextToken());
 if (dim = 2  dim = dimension) { // we have found the 
right dimension
-final int s = Integer.valueOf(st.nextToken());
-final int a = Integer.valueOf(st.nextToken());
+final int s = Integer.parseInt(st.nextToken());
+final int a = Integer.parseInt(st.nextToken());
 final int[] m = new int[s + 1];
 for (int i = 1; i = s; i++) {
-m[i] = Integer.valueOf(st.nextToken());
+m[i] = Integer.parseInt(st.nextToken());
 }
 initDirectionVector(index++, a, m);
 }

Modified: 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/random/ValueServer.java
URL: 
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/random/ValueServer.java?rev=1517416r1=1517415r2=1517416view=diff
==
--- 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/random/ValueServer.java
 (original)
+++ 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/random/ValueServer.java
 Mon Aug 26 03:04:38 2013
@@ -421,7 +421,7 @@ public class ValueServer {
 valuesFileURL);
 }
 }
-return Double.valueOf(str).doubleValue();
+return Double.parseDouble(str);
 }
 
 /**

Modified: 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/DefaultTransformer.java
URL: 
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/DefaultTransformer.java?rev=1517416r1=1517415r2=1517416view=diff
==
--- 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/DefaultTransformer.java
 (original)
+++ 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util

svn commit: r1517418 - in /commons/proper/math/trunk/src/main/java/org/apache/commons/math3: analysis/differentiation/ distribution/ distribution/fitting/ geometry/euclidean/threed/ geometry/euclidean

[dbrosius]

Author: dbrosius
Date: Mon Aug 26 03:18:55 2013
New Revision: 1517418

URL: http://svn.apache.org/r1517418
Log:
presize collections

Modified:

commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/differentiation/DSCompiler.java

commons/proper/math/trunk/src/main/java/org/apache/commons/math3/distribution/MixtureMultivariateNormalDistribution.java

commons/proper/math/trunk/src/main/java/org/apache/commons/math3/distribution/MixtureMultivariateRealDistribution.java

commons/proper/math/trunk/src/main/java/org/apache/commons/math3/distribution/fitting/MultivariateNormalMixtureExpectationMaximization.java

commons/proper/math/trunk/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/SubLine.java

commons/proper/math/trunk/src/main/java/org/apache/commons/math3/geometry/euclidean/twod/PolygonsSet.java

commons/proper/math/trunk/src/main/java/org/apache/commons/math3/geometry/euclidean/twod/SubLine.java

commons/proper/math/trunk/src/main/java/org/apache/commons/math3/ode/AbstractIntegrator.java

commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optim/linear/SimplexTableau.java

commons/proper/math/trunk/src/main/java/org/apache/commons/math3/optimization/linear/SimplexTableau.java

Modified: 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/differentiation/DSCompiler.java
URL: 
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/differentiation/DSCompiler.java?rev=1517418r1=1517417r2=1517418view=diff
==
--- 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/differentiation/DSCompiler.java
 (original)
+++ 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/analysis/differentiation/DSCompiler.java
 Mon Aug 26 03:18:55 2013
@@ -361,7 +361,7 @@ public class DSCompiler {
 
 for (int i = 0; i  dSize; ++i) {
 final int[][] dRow = derivativeCompiler.multIndirection[i];
-Listint[] row = new ArrayListint[]();
+Listint[] row = new ArrayListint[](dRow.length * 2);
 for (int j = 0; j  dRow.length; ++j) {
 row.add(new int[] { dRow[j][0], lowerIndirection[dRow[j][1]], 
vSize + dRow[j][2] });
 row.add(new int[] { dRow[j][0], vSize + dRow[j][1], 
lowerIndirection[dRow[j][2]] });

Modified: 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/distribution/MixtureMultivariateNormalDistribution.java
URL: 
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/distribution/MixtureMultivariateNormalDistribution.java?rev=1517418r1=1517417r2=1517418view=diff
==
--- 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/distribution/MixtureMultivariateNormalDistribution.java
 (original)
+++ 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/distribution/MixtureMultivariateNormalDistribution.java
 Mon Aug 26 03:18:55 2013
@@ -83,7 +83,7 @@ public class MixtureMultivariateNormalDi

double[][] means,

double[][][] covariances) {
 final ListPairDouble, MultivariateNormalDistribution mvns
-= new ArrayListPairDouble, MultivariateNormalDistribution();
+= new ArrayListPairDouble, 
MultivariateNormalDistribution(weights.length);
 
 for (int i = 0; i  weights.length; i++) {
 final MultivariateNormalDistribution dist

Modified: 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/distribution/MixtureMultivariateRealDistribution.java
URL: 
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/distribution/MixtureMultivariateRealDistribution.java?rev=1517418r1=1517417r2=1517418view=diff
==
--- 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/distribution/MixtureMultivariateRealDistribution.java
 (original)
+++ 
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/distribution/MixtureMultivariateRealDistribution.java
 Mon Aug 26 03:18:55 2013
@@ -153,7 +153,7 @@ public class MixtureMultivariateRealDist
  * @return the component distributions and associated weights.
  */
 public ListPairDouble, T getComponents() {
-final ListPairDouble, T list = new ArrayListPairDouble, T();
+final ListPairDouble, T list = new ArrayListPairDouble, 
T(weight.length);
 
 for (int i = 0; i  weight.length; i++) {
 list.add(new PairDouble, T(weight[i], distribution.get(i)));

Modified: 
commons/proper/math/trunk/src/main/java/org

svn commit: r1482346 - /commons/proper/bcel/trunk/RELEASE-NOTES.txt

[dbrosius]

Author: dbrosius
Date: Tue May 14 14:32:33 2013
New Revision: 1482346

URL: http://svn.apache.org/r1482346
Log:
update release notes for bcel-163

Modified:
commons/proper/bcel/trunk/RELEASE-NOTES.txt

Modified: commons/proper/bcel/trunk/RELEASE-NOTES.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/RELEASE-NOTES.txt?rev=1482346r1=1482345r2=1482346view=diff
==
--- commons/proper/bcel/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/bcel/trunk/RELEASE-NOTES.txt Tue May 14 14:32:33 2013
@@ -27,6 +27,7 @@ Enhancements from 5.2
 -
 
 32945  Wrap JavaClass repository class (map values) with...
+BCEL-163 - Incorporate patch file from Findbugs
 
 
 Feedback
@@ -39,4 +40,4 @@ http://issues.apache.org/bugzilla/buglis
 
 Or subscribe to the bcel-user mailing list
 
-The BCEL Team
\ No newline at end of file
+The BCEL Team

svn commit: r1481383 - in /commons/proper/bcel/trunk/src/main/java/org/apache/bcel: classfile/ generic/ verifier/structurals/

[dbrosius]

Author: dbrosius
Date: Sat May 11 17:34:32 2013
New Revision: 1481383

URL: http://svn.apache.org/r1481383
Log:
incorporate changes used by Findbugs from BCEL-163

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Constant.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantUtf8.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LineNumber.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayType.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldGen.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldOrMethod.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionFactory.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MethodGen.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ObjectType.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ReferenceType.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Constant.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Constant.java?rev=1481383r1=1481382r2=1481383view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Constant.java 
(original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Constant.java 
Sat May 11 17:34:32 2013
@@ -145,7 +145,7 @@ public abstract class Constant implement
 case Constants.CONSTANT_NameAndType:
 return new ConstantNameAndType(file);
 case Constants.CONSTANT_Utf8:
-return new ConstantUtf8(file);
+return ConstantUtf8.getInstance(file);
 case Constants.CONSTANT_MethodHandle:
 return new ConstantMethodHandle(file);
 case Constants.CONSTANT_MethodType:

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantUtf8.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantUtf8.java?rev=1481383r1=1481382r2=1481383view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantUtf8.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantUtf8.java
 Sat May 11 17:34:32 2013
@@ -18,8 +18,12 @@
 package org.apache.bcel.classfile;
 
 import java.io.DataInput;
+import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 import org.apache.bcel.Constants;
 
@@ -35,8 +39,59 @@ import org.apache.bcel.Constants;
 public final class ConstantUtf8 extends Constant {
 
 private static final long serialVersionUID = -8709101585611518985L;
-private String bytes;
+private final String bytes;
 
+private static final int MAX_CACHE_ENTRIES = 2;
+private static final int INITIAL_CACHE_CAPACITY = 
(int)(MAX_CACHE_ENTRIES/0.75);
+private static HashMapString, ConstantUtf8 cache;
+private static int considered = 0;
+private static int hits = 0;
+private static int skipped = 0;
+private static int created = 0;
+final static boolean BCEL_STATISTICS = 
Boolean.getBoolean(bcel.statistics);
+final static boolean BCEL_DONT_CACHE = 
Boolean.getBoolean(bcel.dontCache);
+
+static {
+if (BCEL_STATISTICS)
+Runtime.getRuntime().addShutdownHook(new Thread() {
+public void run() {
+System.err.println(Cache hit  + hits + / + considered 
+, 
++ skipped +  skipped);
+System.err.println(Total of  + created +  ConstantUtf8 
objects created);
+}
+});
+}
+
+public static synchronized ConstantUtf8 getCachedInstance(String s) {
+if (BCEL_DONT_CACHE || s.length()  200) {
+skipped++;
+return  new ConstantUtf8(s);
+}
+considered++;
+if (cache == null)  {
+cache = new LinkedHashMapString, 
ConstantUtf8(INITIAL_CACHE_CAPACITY, 0.75f, true) {
+protected boolean removeEldestEntry(Map.Entry eldest) {
+ return size()  MAX_CACHE_ENTRIES;
+}
+};
+}
+ConstantUtf8 result = cache.get(s);
+if (result != null) {
+hits

svn commit: r1463375 - /commons/proper/bcel/trunk/pom.xml

[dbrosius]

Author: dbrosius
Date: Tue Apr  2 03:59:29 2013
New Revision: 1463375

URL: http://svn.apache.org/r1463375
Log:
add javadoc plugin to pom

Modified:
commons/proper/bcel/trunk/pom.xml

Modified: commons/proper/bcel/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/pom.xml?rev=1463375r1=1463374r2=1463375view=diff
==
--- commons/proper/bcel/trunk/pom.xml (original)
+++ commons/proper/bcel/trunk/pom.xml Tue Apr  2 03:59:29 2013
@@ -212,6 +212,13 @@
 tarLongFileModegnu/tarLongFileMode
 /configuration
 /plugin
+plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-javadoc-plugin/artifactId
+version2.9/version
+configuration
+/configuration
+/plugin
 /plugins
 /build
 

svn commit: r1447116 - /commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Constants.java

[dbrosius]

Author: dbrosius
Date: Mon Feb 18 01:23:22 2013
New Revision: 1447116

URL: http://svn.apache.org/r1447116
Log:
add constant for version 8 class file format[52]

Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Constants.java

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Constants.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Constants.java?rev=1447116r1=1447115r2=1447116view=diff
==
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Constants.java 
(original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Constants.java Mon 
Feb 18 01:23:22 2013
@@ -12,7 +12,7 @@
  *  distributed under the License is distributed on an AS IS BASIS,
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
- *  limitations under the License. 
+ *  limitations under the License.
  *
  */
 package org.apache.bcel;
@@ -84,7 +84,7 @@ public interface Constants {
*  @see #MAJOR_1_6
*  */
   public final static short MINOR_1_6 = 0;
-  
+
   /** Major version number of class files for Java 1.7.
*  @see #MINOR_1_7
*  */
@@ -95,6 +95,16 @@ public interface Constants {
*  */
   public final static short MINOR_1_7 = 0;
 
+  /** Major version number of class files for Java 1.8.
+   *  @see #MINOR_1_8
+   *  */
+  public final static short MAJOR_1_8 = 52;
+
+  /** Minor version number of class files for Java 1.8.
+   *  @see #MAJOR_1_8
+   *  */
+  public final static short MINOR_1_8 = 0;
+
   /** Default major version number.  Class file is for Java 1.1.
*  @see #MAJOR_1_1
*  */
@@ -174,7 +184,7 @@ public interface Constants {
*  @see #ACC_PUBLIC
*/
   public final static short ACC_NATIVE   = 0x0100;
-  
+
   /** One of the access flags for fields, methods, or classes.
*  @see #ACC_PUBLIC
*/
@@ -189,7 +199,7 @@ public interface Constants {
*  @see #ACC_PUBLIC
*/
   public final static short ACC_STRICT   = 0x0800;
-  
+
   /** One of the access flags for fields, methods, or classes.
*  @see #ACC_PUBLIC
*/
@@ -1249,7 +1259,7 @@ public interface Constants {
 
   /**
* Names of opcodes.  Indexed by opcode.  OPCODE_NAMES[ALOAD] = aload.
-   */ 
+   */
   public static final String[] OPCODE_NAMES = {
 nop, aconst_null, iconst_m1, iconst_0, iconst_1,
 iconst_2, iconst_3, iconst_4, iconst_5, lconst_0,
@@ -1303,7 +1313,7 @@ public interface Constants {
* Number of words consumed on operand stack by instructions.
* Indexed by opcode.  CONSUME_STACK[FALOAD] = number of words
* consumed from the stack by a faload instruction.
-   */ 
+   */
   public static final int[] CONSUME_STACK = {
 0/*nop*/, 0/*aconst_null*/, 0/*iconst_m1*/, 0/*iconst_0*/, 0/*iconst_1*/,
 0/*iconst_2*/, 0/*iconst_3*/, 0/*iconst_4*/, 0/*iconst_5*/, 0/*lconst_0*/,
@@ -1327,7 +1337,7 @@ public interface Constants {
 1/*fneg*/, 2/*dneg*/, 2/*ishl*/, 3/*lshl*/, 2/*ishr*/, 3/*lshr*/, 
2/*iushr*/, 3/*lushr*/,
 2/*iand*/, 4/*land*/, 2/*ior*/, 4/*lor*/, 2/*ixor*/, 4/*lxor*/, 0/*iinc*/,
 1/*i2l*/, 1/*i2f*/, 1/*i2d*/, 2/*l2i*/, 2/*l2f*/, 2/*l2d*/, 1/*f2i*/, 
1/*f2l*/,
-1/*f2d*/, 2/*d2i*/, 2/*d2l*/, 2/*d2f*/, 1/*i2b*/, 1/*i2c*/, 1/*i2s*/, 
+1/*f2d*/, 2/*d2i*/, 2/*d2l*/, 2/*d2f*/, 1/*i2b*/, 1/*i2c*/, 1/*i2s*/,
 4/*lcmp*/, 2/*fcmpl*/, 2/*fcmpg*/, 4/*dcmpl*/, 4/*dcmpg*/, 1/*ifeq*/, 
1/*ifne*/,
 1/*iflt*/, 1/*ifge*/, 1/*ifgt*/, 1/*ifle*/, 2/*if_icmpeq*/, 
2/*if_icmpne*/, 2/*if_icmplt*/,
 2 /*if_icmpge*/, 2/*if_icmpgt*/, 2/*if_icmple*/, 2/*if_acmpeq*/, 
2/*if_acmpne*/,
@@ -1359,7 +1369,7 @@ public interface Constants {
* Number of words produced onto operand stack by instructions.
* Indexed by opcode.  CONSUME_STACK[DALOAD] = number of words
* consumed from the stack by a daload instruction.
-   */ 
+   */
   public static final int[] PRODUCE_STACK = {
 0/*nop*/, 1/*aconst_null*/, 1/*iconst_m1*/, 1/*iconst_0*/, 1/*iconst_1*/,
 1/*iconst_2*/, 1/*iconst_3*/, 1/*iconst_4*/, 1/*iconst_5*/, 2/*lconst_0*/,
@@ -1442,7 +1452,7 @@ public interface Constants {
 SourceFile, ConstantValue, Code, Exceptions,
 LineNumberTable, LocalVariableTable,
 InnerClasses, Synthetic, Deprecated,
-PMGClass, Signature, StackMap, 
+PMGClass, Signature, StackMap,
 RuntimeVisibleAnnotations, RuntimeInvisibleAnnotations,
 RuntimeVisibleParameterAnnotations, 
RuntimeInvisibleParameterAnnotations,
 AnnotationDefault, LocalVariableTypeTable, EnclosingMethod, 
StackMapTable
@@ -1462,25 +1472,25 @@ public interface Constants {
 
   public static final String[] ITEM_NAMES = {
 Bogus, Integer, Float, Double, Long,
-Null, InitObject, Object, NewObject 
+Null, InitObject, Object, NewObject
   };
-  
+
   /** Constants used to identify StackMapEntry types

svn commit: r1346228 - /commons/sandbox/classscan/trunk/src/main/java/org/apache/commons/classscan/bcel/FileClassLocation.java

[dbrosius]

Author: dbrosius
Date: Tue Jun  5 04:01:53 2012
New Revision: 1346228

URL: http://svn.apache.org/viewvc?rev=1346228view=rev
Log:
make sure file streams get closed

Modified:

commons/sandbox/classscan/trunk/src/main/java/org/apache/commons/classscan/bcel/FileClassLocation.java

Modified: 
commons/sandbox/classscan/trunk/src/main/java/org/apache/commons/classscan/bcel/FileClassLocation.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/classscan/trunk/src/main/java/org/apache/commons/classscan/bcel/FileClassLocation.java?rev=1346228r1=1346227r2=1346228view=diff
==
--- 
commons/sandbox/classscan/trunk/src/main/java/org/apache/commons/classscan/bcel/FileClassLocation.java
 (original)
+++ 
commons/sandbox/classscan/trunk/src/main/java/org/apache/commons/classscan/bcel/FileClassLocation.java
 Tue Jun  5 04:01:53 2012
@@ -13,6 +13,7 @@
  */
 package org.apache.commons.classscan.bcel;
 
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileFilter;
 import java.io.FileInputStream;
@@ -110,13 +111,23 @@ public class FileClassLocation extends U
 }
 
 private void addClass(String fullPath, File path) {
+InputStream is = null;
 try {
-InputStream is = new FileInputStream(path);
+is = new BufferedInputStream(new FileInputStream(path));
 addClass(fullPath, is);
 }
 catch (Exception ex) {
 logger.debug(Failed to add class  + fullPath, ex);
 }
+finally {
+try {
+if (is != null) {
+is.close();
+} 
+} catch (Exception ex) {
+//ignore
+}
+}
 }
 
 void acceptMetaInf(File path) {

svn commit: r1231616 - /commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LocalVariableGen.java

[dbrosius]

Author: dbrosius
Date: Sun Jan 15 02:43:45 2012
New Revision: 1231616

URL: http://svn.apache.org/viewvc?rev=1231616view=rev
Log:
Apply patch Bug 52422 - [BUG?/PATCH] LocalVariableGen.getLocalVariable() 
computes incorrect length - from Thiago Tonelli Bartolomei

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LocalVariableGen.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LocalVariableGen.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LocalVariableGen.java?rev=1231616r1=1231615r2=1231616view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LocalVariableGen.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/LocalVariableGen.java
 Sun Jan 15 02:43:45 2012
@@ -81,7 +81,7 @@ public class LocalVariableGen implements
 public LocalVariable getLocalVariable( ConstantPoolGen cp ) {
 int start_pc = start.getPosition();
 int length = end.getPosition() - start_pc;
-if (length  0) {
+if (end.getNext() == null) {
 length += end.getInstruction().getLength();
 }
 int name_index = cp.addUtf8(name);

svn commit: r1200112 - /commons/sandbox/csv/trunk/src/main/java/org/apache/commons/csv/writer/CSVConfig.java

[dbrosius]

Author: dbrosius
Date: Thu Nov 10 03:37:47 2011
New Revision: 1200112

URL: http://svn.apache.org/viewvc?rev=1200112view=rev
Log:
bad logic, should use || rather than , but instanceof covers the null case 
anyway

Modified:

commons/sandbox/csv/trunk/src/main/java/org/apache/commons/csv/writer/CSVConfig.java

Modified: 
commons/sandbox/csv/trunk/src/main/java/org/apache/commons/csv/writer/CSVConfig.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/csv/trunk/src/main/java/org/apache/commons/csv/writer/CSVConfig.java?rev=1200112r1=1200111r2=1200112view=diff
==
--- 
commons/sandbox/csv/trunk/src/main/java/org/apache/commons/csv/writer/CSVConfig.java
 (original)
+++ 
commons/sandbox/csv/trunk/src/main/java/org/apache/commons/csv/writer/CSVConfig.java
 Thu Nov 10 03:37:47 2011
@@ -283,7 +283,7 @@ public class CSVConfig {
  * @see java.lang.Object#equals(java.lang.Object)
  */
 public boolean equals(Object obj) {
-if (obj == null  !(obj instanceof CSVConfig)) {
+if (!(obj instanceof CSVConfig)) {
 return false;
 }
 return super.equals(obj);

svn commit: r1195321 - /commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/EmailValidator.java

[dbrosius]

Author: dbrosius
Date: Mon Oct 31 03:46:07 2011
New Revision: 1195321

URL: http://svn.apache.org/viewvc?rev=1195321view=rev
Log:
fix email address embedded comment striping

Modified:

commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/EmailValidator.java

Modified: 
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/EmailValidator.java
URL: 
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/EmailValidator.java?rev=1195321r1=1195320r2=1195321view=diff
==
--- 
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/EmailValidator.java
 (original)
+++ 
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/EmailValidator.java
 Mon Oct 31 03:46:07 2011
@@ -218,7 +218,7 @@ public class EmailValidator {
  Pattern commentMatcher = Pattern.compile(commentPat);
  
  while (commentMatcher.matcher(result).matches()) {
-result.replaceFirst(commentPat, \1 );
+result = result.replaceFirst(commentPat, \1 );
  }
  return result;
 }

svn commit: r1195324 - /commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java

[dbrosius]

Author: dbrosius
Date: Mon Oct 31 03:53:21 2011
New Revision: 1195324

URL: http://svn.apache.org/viewvc?rev=1195324view=rev
Log:
remove check for DAY_OF_MONTH as it is a repeated test with DATE, as 
DAY_OF_MONTH and DATE are synonyms

Modified:

commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java

Modified: 
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java
URL: 
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java?rev=1195324r1=1195323r2=1195324view=diff
==
--- 
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java
 (original)
+++ 
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java
 Mon Oct 31 03:53:21 2011
@@ -298,7 +298,6 @@ public abstract class AbstractCalendarVa
 // Compare Date
 result = calculateCompareResult(value, compare, Calendar.DATE);
 if (result != 0 || (field == Calendar.DATE || 
-  field == Calendar.DAY_OF_MONTH ||
   field == Calendar.DAY_OF_WEEK ||
   field == Calendar.DAY_OF_WEEK_IN_MONTH)) {
 return result;

svn commit: r1190141 - /commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java

[dbrosius]

Author: dbrosius
Date: Fri Oct 28 03:28:59 2011
New Revision: 1190141

URL: http://svn.apache.org/viewvc?rev=1190141view=rev
Log:
remove dead store

Modified:

commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java

Modified: 
commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java?rev=1190141r1=1190140r2=1190141view=diff
==
--- 
commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java
 (original)
+++ 
commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java
 Fri Oct 28 03:28:59 2011
@@ -690,7 +690,6 @@ public class JDOMNodePointer extends Nod
 
 List children = ((Element) parent).getContent();
 int count = 0;
-String name = ((Element) node).getQualifiedName();
 for (int i = 0; i  children.size(); i++) {
 Object child = children.get(i);
 if (child instanceof Element  matchesQName(((Element) 
child))) {

svn commit: r1190145 - /commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathBasicBeanInfo.java

[dbrosius]

Author: dbrosius
Date: Fri Oct 28 03:36:24 2011
New Revision: 1190145

URL: http://svn.apache.org/viewvc?rev=1190145view=rev
Log:
guard against npes on exception path

Modified:

commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathBasicBeanInfo.java

Modified: 
commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathBasicBeanInfo.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathBasicBeanInfo.java?rev=1190145r1=1190144r2=1190145view=diff
==
--- 
commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathBasicBeanInfo.java
 (original)
+++ 
commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathBasicBeanInfo.java
 Fri Oct 28 03:36:24 2011
@@ -120,6 +120,7 @@ public class JXPathBasicBeanInfo impleme
 }
 catch (IntrospectionException ex) {
 ex.printStackTrace();
+return new PropertyDescriptor[0];
 }
 }
 }

svn commit: r1190147 - /commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletContextHandler.java

[dbrosius]

Author: dbrosius
Date: Fri Oct 28 03:51:23 2011
New Revision: 1190147

URL: http://svn.apache.org/viewvc?rev=1190147view=rev
Log:
reduce cohesion in the interface, use Set vs. HashSet

Modified:

commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletContextHandler.java

Modified: 
commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletContextHandler.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletContextHandler.java?rev=1190147r1=1190146r2=1190147view=diff
==
--- 
commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletContextHandler.java
 (original)
+++ 
commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletContextHandler.java
 Fri Oct 28 03:51:23 2011
@@ -18,6 +18,7 @@ package org.apache.commons.jxpath.servle
 
 import java.util.Enumeration;
 import java.util.HashSet;
+import java.util.Set;
 
 import javax.servlet.ServletContext;
 
@@ -35,7 +36,7 @@ public class ServletContextHandler imple
 private static final int DEFAULT_PROPERTY_COUNT = 16;
 
 public String[] getPropertyNames(Object context) {
-HashSet list = new HashSet(DEFAULT_PROPERTY_COUNT);
+Set list = new HashSet(DEFAULT_PROPERTY_COUNT);
 collectPropertyNames(list, context);
 return (String[]) list.toArray(new String[list.size()]);
 }
@@ -45,7 +46,7 @@ public class ServletContextHandler imple
  * @param set destination
  * @param bean to read
  */
-protected void collectPropertyNames(HashSet set, Object bean) {
+protected void collectPropertyNames(Set set, Object bean) {
 Enumeration e = ((ServletContext) bean).getAttributeNames();
 while (e.hasMoreElements()) {
 set.add(e.nextElement());

svn commit: r1190148 - /commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletContextHandler.java

[dbrosius]

Author: dbrosius
Date: Fri Oct 28 04:00:29 2011
New Revision: 1190148

URL: http://svn.apache.org/viewvc?rev=1190148view=rev
Log:
fix unit test, by checking for bean being a HttpSessionAndServletContext, 
rather than a ServletContext

Modified:

commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletContextHandler.java

Modified: 
commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletContextHandler.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletContextHandler.java?rev=1190148r1=1190147r2=1190148view=diff
==
--- 
commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletContextHandler.java
 (original)
+++ 
commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/servlet/ServletContextHandler.java
 Fri Oct 28 04:00:29 2011
@@ -47,6 +47,9 @@ public class ServletContextHandler imple
  * @param bean to read
  */
 protected void collectPropertyNames(Set set, Object bean) {
+if (bean instanceof HttpSessionAndServletContext) {
+bean = ((HttpSessionAndServletContext) bean).getServletContext();
+}
 Enumeration e = ((ServletContext) bean).getAttributeNames();
 while (e.hasMoreElements()) {
 set.add(e.nextElement());

svn commit: r1190150 - /commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/XMLDocumentContainer.java

[dbrosius]

Author: dbrosius
Date: Fri Oct 28 04:02:18 2011
New Revision: 1190150

URL: http://svn.apache.org/viewvc?rev=1190150view=rev
Log:
remove unnecessary cast

Modified:

commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/XMLDocumentContainer.java

Modified: 
commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/XMLDocumentContainer.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/XMLDocumentContainer.java?rev=1190150r1=1190149r2=1190150view=diff
==
--- 
commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/XMLDocumentContainer.java
 (original)
+++ 
commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/XMLDocumentContainer.java
 Fri Oct 28 04:02:18 2011
@@ -81,7 +81,7 @@ public class XMLDocumentContainer implem
 Transformer trans =
 TransformerFactory.newInstance().newTransformer();
 trans.transform(source, result);
-document = (Document) result.getNode();
+document = result.getNode();
 }
 else {
 document = delegate.getValue();

svn commit: r1190151 - /commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/ClassLoaderUtil.java

[dbrosius]

Author: dbrosius
Date: Fri Oct 28 04:07:31 2011
New Revision: 1190151

URL: http://svn.apache.org/viewvc?rev=1190151view=rev
Log:
remove unused collection

Modified:

commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/ClassLoaderUtil.java

Modified: 
commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/ClassLoaderUtil.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/ClassLoaderUtil.java?rev=1190151r1=1190150r2=1190151view=diff
==
--- 
commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/ClassLoaderUtil.java
 (original)
+++ 
commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/util/ClassLoaderUtil.java
 Fri Oct 28 04:07:31 2011
@@ -40,11 +40,6 @@ public class ClassLoaderUtil {
* Maps a primitive class name to its corresponding abbreviation used in 
array class names.
*/
   private static Map abbreviationMap = new HashMap();
-
-  /**
-   * Maps an abbreviation used in array class names to corresponding primitive 
class name.
-   */
-  private static Map reverseAbbreviationMap = new HashMap();
   
   /**
* Add primitive type abbreviation to maps of abbreviations.
@@ -54,7 +49,6 @@ public class ClassLoaderUtil {
*/
   private static void addAbbreviation(String primitive, String abbreviation) {
   abbreviationMap.put(primitive, abbreviation);
-  reverseAbbreviationMap.put(abbreviation, primitive);
   }
   
   /**

svn commit: r1187656 - /commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/util/Flags.java

[dbrosius]

Author: dbrosius
Date: Sat Oct 22 06:31:53 2011
New Revision: 1187656

URL: http://svn.apache.org/viewvc?rev=1187656view=rev
Log:
Add Cloneable interface to Flags as it has a clone() method, without it - which 
doesn't make sense

Modified:

commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/util/Flags.java

Modified: 
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/util/Flags.java
URL: 
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/util/Flags.java?rev=1187656r1=1187655r2=1187656view=diff
==
--- 
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/util/Flags.java
 (original)
+++ 
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/util/Flags.java
 Sat Oct 22 06:31:53 2011
@@ -38,7 +38,7 @@ import java.io.Serializable;
  *
  * @version $Revision$ $Date$
  */
-public class Flags implements Serializable {
+public class Flags implements Serializable, Cloneable {
 
 /**
  * Represents the current flag state.

svn commit: r1187661 - /commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorAction.java

[dbrosius]

Author: dbrosius
Date: Sat Oct 22 06:57:52 2011
New Revision: 1187661

URL: http://svn.apache.org/viewvc?rev=1187661view=rev
Log:
use StringBuffers correctly

Modified:

commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorAction.java

Modified: 
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorAction.java
URL: 
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorAction.java?rev=1187661r1=1187660r2=1187661view=diff
==
--- 
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorAction.java
 (original)
+++ 
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/ValidatorAction.java
 Sat Oct 22 06:57:52 2011
@@ -422,7 +422,7 @@ public class ValidatorAction implements 
 try {
 String line = null;
 while ((line = reader.readLine()) != null) {
-buffer.append(line + \n);
+buffer.append(line).append(\n);
 }
 
 } catch(IOException e) {

svn commit: r1180639 - /commons/sandbox/nabla/trunk/pom.xml

[dbrosius]

Author: dbrosius
Date: Sun Oct  9 16:21:26 2011
New Revision: 1180639

URL: http://svn.apache.org/viewvc?rev=1180639view=rev
Log:
add asm-util dependency to fix build

Modified:
commons/sandbox/nabla/trunk/pom.xml

Modified: commons/sandbox/nabla/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/pom.xml?rev=1180639r1=1180638r2=1180639view=diff
==
--- commons/sandbox/nabla/trunk/pom.xml (original)
+++ commons/sandbox/nabla/trunk/pom.xml Sun Oct  9 16:21:26 2011
@@ -91,6 +91,11 @@
 /dependency
 dependency
 groupIdasm/groupId
+artifactIdasm-util/artifactId
+version3.3.1/version
+/dependency
+dependency
+groupIdasm/groupId
 artifactIdasm/artifactId
 version3.3.1/version
 /dependency

svn commit: r1177529 - in /commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml: env/SimpleErrorReporter.java io/SCXMLSerializer.java

[dbrosius]

Author: dbrosius
Date: Fri Sep 30 06:32:40 2011
New Revision: 1177529

URL: http://svn.apache.org/viewvc?rev=1177529view=rev
Log:
use string buffers correctly

Modified:

commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleErrorReporter.java

commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java

Modified: 
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleErrorReporter.java
URL: 
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleErrorReporter.java?rev=1177529r1=1177528r2=1177529view=diff
==
--- 
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleErrorReporter.java
 (original)
+++ 
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/env/SimpleErrorReporter.java
 Fri Sep 30 06:32:40 2011
@@ -64,18 +64,18 @@ public class SimpleErrorReporter impleme
 } else if (errCtx instanceof State) {
 //determineInitialStates
 //determineTargetStates
-msg.append(State  + LogUtils.getTTPath((State) errCtx));
+msg.append(State ).append(LogUtils.getTTPath((State) 
errCtx));
 }
 } else if (errCode == ErrorConstants.UNKNOWN_ACTION) {
 //executeActionList
-msg.append(Action:  + errCtx.getClass().getName());
+msg.append(Action: ).append(errCtx.getClass().getName());
 } else if (errCode == ErrorConstants.ILLEGAL_CONFIG) {
 //isLegalConfig
 if (errCtx instanceof Map.Entry) {
 TransitionTarget tt = (TransitionTarget)
 (((Map.Entry) errCtx).getKey());
 Set vals = (Set) (((Map.Entry) errCtx).getValue());
-msg.append(LogUtils.getTTPath(tt) +  : [);
+msg.append(LogUtils.getTTPath(tt)).append( : [);
 for (Iterator i = vals.iterator(); i.hasNext();) {
 TransitionTarget tx = (TransitionTarget) i.next();
 msg.append(LogUtils.getTTPath(tx));

Modified: 
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java
URL: 
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java?rev=1177529r1=1177528r2=1177529view=diff
==
--- 
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java
 (original)
+++ 
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java
 Fri Sep 30 06:32:40 2011
@@ -313,7 +313,7 @@ public class SCXMLSerializer {
 }
 boolean next = !SCXMLHelper.isStringEmpty(t.getNext());
 if (next) {
-b.append( target=\ + t.getNext() + \);
+b.append( target=\).append(t.getNext()).append(\);
 }
 b.append(\n);
 boolean exit = serializeActions(b, t.getActions(), indent + INDENT);
@@ -481,10 +481,10 @@ public class SCXMLSerializer {
 String expr = SCXMLHelper.escapeXML(e.getExpr());
 String nl = e.getNamelist();
 if (expr != null) {
-b.append( expr=\ + expr + \);
+b.append( expr=\).append(expr).append(\);
 }
 if (nl != null) {
-b.append( namelist=\ + nl + \);
+b.append( namelist=\).append(nl).append(\);
 }
 b.append(/\n);
 exit = true;

svn commit: r1177384 - /commons/proper/collections/trunk/build.xml

[dbrosius]

Author: dbrosius
Date: Thu Sep 29 18:13:06 2011
New Revision: 1177384

URL: http://svn.apache.org/viewvc?rev=1177384view=rev
Log:
add ignoreantruntime flag to quell build warnings

Modified:
commons/proper/collections/trunk/build.xml

Modified: commons/proper/collections/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/collections/trunk/build.xml?rev=1177384r1=1177383r2=1177384view=diff
==
--- commons/proper/collections/trunk/build.xml (original)
+++ commons/proper/collections/trunk/build.xml Thu Sep 29 18:13:06 2011
@@ -151,7 +151,8 @@ limitations under the License.
destdir=${build.classes}
  debug=${compile.debug}
deprecation=${compile.deprecation}
-  optimize=${compile.optimize}
+  optimize=${compile.optimize}
+ includeantruntime=false
 /javac
   /target
 
@@ -294,7 +295,8 @@ limitations under the License.
destdir=${build.tests}
  debug=true
deprecation=false
-  optimize=false
+  optimize=false
+ includeantruntime=false
   classpath
 pathelement location=${build.classes}/
 path refid=test.support.path/
@@ -476,7 +478,8 @@ limitations under the License.
 destdir=${tf.build.tf}
 debug=true
 deprecation=false
-optimize=false
+optimize=false
+includeantruntime=false
   patternset refid=tf.patternset.validate /
   classpath
 path refid=test.support.path/

svn commit: r1177393 - /commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java

[dbrosius]

Author: dbrosius
Date: Thu Sep 29 18:37:26 2011
New Revision: 1177393

URL: http://svn.apache.org/viewvc?rev=1177393view=rev
Log:
fix invalid parameter check -- only problem could be that it is null, not, not 
instanceof Class

Modified:

commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java

Modified: 
commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java
URL: 
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java?rev=1177393r1=1177392r2=1177393view=diff
==
--- 
commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java
 (original)
+++ 
commons/proper/collections/trunk/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java
 Thu Sep 29 18:37:26 2011
@@ -105,10 +105,9 @@ public class InstantiateTransformerT i
  */
 public T transform(Class? extends T input) {
 try {
-if (input instanceof Class == false) {
+if (input == null) {
 throw new FunctorException(
-InstantiateTransformer: Input object was not an 
instanceof Class, it was a 
-+ (input == null ? null object : 
input.getClass().getName()));
+InstantiateTransformer: Input object was not an 
instanceof Class, it was a null object);
 }
 Constructor? extends T con = input.getConstructor(iParamTypes);
 return con.newInstance(iArgs);

svn commit: r1177491 - /commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCache.java

[dbrosius]

Author: dbrosius
Date: Fri Sep 30 03:28:51 2011
New Revision: 1177491

URL: http://svn.apache.org/viewvc?rev=1177491view=rev
Log:
avoid unnecessary map allocation

Modified:

commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCache.java

Modified: 
commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCache.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCache.java?rev=1177491r1=1177490r2=1177491view=diff
==
--- 
commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCache.java
 (original)
+++ 
commons/proper/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCache.java
 Fri Sep 30 03:28:51 2011
@@ -159,23 +159,20 @@ public class LateralCache
 protected MapSerializable, ICacheElement processGetMatching( String 
pattern )
 throws IOException
 {
-MapSerializable, ICacheElement elements = new HashMapSerializable, 
ICacheElement();
-
 if ( this.lateralCacheAttribures.getPutOnlyMode() )
 {
-return Collections.emptyMap();
+return Collections.Serializable, ICacheElementemptyMap();
 }
 try
 {
-elements = lateralCacheService.getMatching( cacheName, pattern );
+return lateralCacheService.getMatching( cacheName, pattern );
 }
 catch ( IOException e )
 {
 log.error( e );
 handleException( e, Failed to getMatching [ + pattern + ] from 
 + lateralCacheAttribures.getCacheName() + @ + lateralCacheAttribures );
+return Collections.Serializable, ICacheElementemptyMap();
 }
-
-return elements;
 }
 
 /**

svn commit: r1175574 - /commons/proper/betwixt/trunk/build.xml

[dbrosius]

Author: dbrosius
Date: Sun Sep 25 20:58:53 2011
New Revision: 1175574

URL: http://svn.apache.org/viewvc?rev=1175574view=rev
Log:
quell warnings about including ant runtimes for javac

Modified:
commons/proper/betwixt/trunk/build.xml

Modified: commons/proper/betwixt/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/betwixt/trunk/build.xml?rev=1175574r1=1175573r2=1175574view=diff
==
--- commons/proper/betwixt/trunk/build.xml (original)
+++ commons/proper/betwixt/trunk/build.xml Sun Sep 25 20:58:53 2011
@@ -43,7 +43,7 @@
   target name=compile description=o Compile the code depends=get-deps
 mkdir dir=${classesdir}
 /mkdir
-javac destdir=${classesdir} deprecation=true debug=true 
optimize=false excludes=**/package.html
+javac destdir=${classesdir} deprecation=true debug=true 
optimize=false excludes=**/package.html includeantruntime=false
   src
 pathelement location=src/java
 /pathelement
@@ -124,7 +124,7 @@
   target name=compile-tests if=Junit.present 
depends=junit-present,compile
 mkdir dir=${testclassesdir}
 /mkdir
-javac destdir=${testclassesdir} deprecation=true debug=true 
optimize=false excludes=**/package.html
+javac destdir=${testclassesdir} deprecation=true debug=true 
optimize=false excludes=**/package.html includeantruntime=false
   src
 pathelement location=src/test
 /pathelement
@@ -191,4 +191,4 @@
 unjar dest=${maven.home} src=${user.home}/maven-install-latest.jar
 /unjar
   /target
-/project
\ No newline at end of file
+/project

svn commit: r1158060 - in /commons/proper/bcel/trunk/src/main/java/org/apache/bcel: classfile/ generic/ util/ verifier/ verifier/structurals/

[dbrosius]

Author: dbrosius
Date: Mon Aug 15 23:17:19 2011
New Revision: 1158060

URL: http://svn.apache.org/viewvc?rev=1158060view=rev
Log:
methods in interfaces are both public and abstract by default

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AttributeReader.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantObject.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Node.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Visitor.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ClassObserver.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/CompoundInstruction.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ConstantPushInstruction.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ExceptionThrower.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldObserver.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/IndexedInstruction.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionComparator.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionListObserver.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionTargeter.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MethodObserver.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/NamedAndTyped.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/StackConsumer.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/StackProducer.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/TypedInstruction.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Visitor.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/BCELComparator.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/Repository.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryObserver.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/InstructionContext.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Subroutine.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AttributeReader.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AttributeReader.java?rev=1158060r1=1158059r2=1158060view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AttributeReader.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AttributeReader.java
 Mon Aug 15 23:17:19 2011
@@ -54,6 +54,6 @@ public interface AttributeReader {
 
  @see Attribute#addAttributeReader( String, AttributeReader )
  */
-public Attribute createAttribute( int name_index, int length, 
java.io.DataInputStream file,
+Attribute createAttribute( int name_index, int length, 
java.io.DataInputStream file,
 ConstantPool constant_pool );
 }

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantObject.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantObject.java?rev=1158060r1=1158059r2=1158060view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantObject.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantObject.java
 Mon Aug 15 23:17:19 2011
@@ -29,5 +29,5 @@ public interface ConstantObject {
 
 /** @return object representing the constant, e.g., Long for ConstantLong
  */
-public abstract Object getConstantValue( ConstantPool cp );
+Object getConstantValue( ConstantPool cp );
 }

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Node.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Node.java?rev=1158060r1=1158059r2=1158060view=diff
==
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Node.java 
(original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Node.java 
Mon Aug 15 23:17:19 2011
@@ -25,5 +25,5 @@ package org.apache.bcel.classfile;
  */
 public interface Node {
 
-public void accept( Visitor obj );
+void accept( Visitor obj );
 }

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Visitor.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel

svn commit: r1158063 - /commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java

[dbrosius]

Author: dbrosius
Date: Mon Aug 15 23:26:12 2011
New Revision: 1158063

URL: http://svn.apache.org/viewvc?rev=1158063view=rev
Log:
use enhanced loop

Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java?rev=1158063r1=1158062r2=1158063view=diff
==
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java 
(original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java 
Mon Aug 15 23:26:12 2011
@@ -143,9 +143,10 @@ public abstract class Type implements ja
  */
 public static String getMethodSignature( Type return_type, Type[] 
arg_types ) {
 StringBuilder buf = new StringBuilder(();
-int length = (arg_types == null) ? 0 : arg_types.length;
-for (int i = 0; i  length; i++) {
-buf.append(arg_types[i].getSignature());
+if (arg_types != null) {
+for (Type arg_type : arg_types) {
+buf.append(arg_type.getSignature());
+}
 }
 buf.append(')');
 buf.append(return_type.getSignature());

svn commit: r1152074 - /commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationElementValue.java

[dbrosius]

Author: dbrosius
Date: Fri Jul 29 02:05:55 2011
New Revision: 1152074

URL: http://svn.apache.org/viewvc?rev=1152074view=rev
Log:
simplify

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationElementValue.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationElementValue.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationElementValue.java?rev=1152074r1=1152073r2=1152074view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationElementValue.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationElementValue.java
 Fri Jul 29 02:05:55 2011
@@ -45,9 +45,7 @@ public class AnnotationElementValue exte
 @Override
 public String stringifyValue()
 {
-StringBuffer sb = new StringBuffer();
-sb.append(annotationEntry.toString());
-return sb.toString();
+return annotationEntry.toString();
 }
 
 @Override

svn commit: r1152075 - /commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValue.java

[dbrosius]

Author: dbrosius
Date: Fri Jul 29 02:09:53 2011
New Revision: 1152075

URL: http://svn.apache.org/viewvc?rev=1152075view=rev
Log:
simplify

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValue.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValue.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValue.java?rev=1152075r1=1152074r2=1152075view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValue.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValue.java
 Fri Jul 29 02:09:53 2011
@@ -137,8 +137,6 @@ public abstract class ElementValue
 
public String toShortString()
{
-   StringBuffer result = new StringBuffer();
-   result.append(stringifyValue());
-   return result.toString();
+   return stringifyValue();
}
 }

svn commit: r1152077 - in /commons/proper/bcel/trunk/src/main/java/org/apache/bcel: classfile/ generic/ util/ verifier/structurals/

[dbrosius]

Author: dbrosius
Date: Fri Jul 29 02:29:42 2011
New Revision: 1152077

URL: http://svn.apache.org/viewvc?rev=1152077view=rev
Log:
use StringBuilder

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ArrayElementValue.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Code.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ConstantPool.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ElementValuePair.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ExceptionTable.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Field.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/InnerClasses.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/JavaClass.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LineNumberTable.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariableTable.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariableTypeTable.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Method.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Signature.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMap.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapEntry.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapTable.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/StackMapTableEntry.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Synthetic.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayElementValueGen.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ArrayType.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/ConstantPoolGen.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/FieldGen.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/InstructionList.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/MethodGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Select.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/BCELifier.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/Class2HTML.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassPath.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/CodeHTML.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ConstantHTML.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/InstructionFinder.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/LocalVariables.java

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/OperandStack.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java?rev=1152077r1=1152076r2=1152077view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java
 Fri Jul 29 02:29:42 2011
@@ -137,7 +137,7 @@ public class AnnotationEntry implements 
 }
 
 public String toShortString() {
-final StringBuffer result = new StringBuffer();
+final StringBuilder result = new StringBuilder();
 result.append(@);
 result.append(getAnnotationType());
 if (getElementValuePairs().length  0) {

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ArrayElementValue.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ArrayElementValue.java?rev=1152077r1=1152076r2=1152077view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ArrayElementValue.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/ArrayElementValue.java
 Fri Jul 29 02:29:42 2011
@@ -28,7 +28,7 @@ public class ArrayElementValue extends E
@Override
 public String toString

svn commit: r1152079 - /commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariableTable.java

[dbrosius]

Author: dbrosius
Date: Fri Jul 29 02:39:57 2011
New Revision: 1152079

URL: http://svn.apache.org/viewvc?rev=1152079view=rev
Log:
remove mistaken double annotation

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariableTable.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariableTable.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariableTable.java?rev=1152079r1=1152078r2=1152079view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariableTable.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/LocalVariableTable.java
 Fri Jul 29 02:39:57 2011
@@ -125,8 +125,6 @@ public class LocalVariableTable extends 
  * @deprecated since 5.2 because multiple variables can share the
  * same slot, use getLocalVariable(int index, int pc) instead.
  */
-@Deprecated
-@Deprecated
 public final LocalVariable getLocalVariable( int index ) {
 for (int i = 0; i  local_variable_table_length; i++) {
 if (local_variable_table[i].getIndex() == index) {

svn commit: r1151706 - /commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java

[dbrosius]

Author: dbrosius
Date: Thu Jul 28 03:15:18 2011
New Revision: 1151706

URL: http://svn.apache.org/viewvc?rev=1151706view=rev
Log:
apply patch: Bug 51565 - [patch] Pass3bVerifier crashes on empty methods

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java?rev=1151706r1=1151705r2=1151706view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java
 Thu Jul 28 03:15:18 2011
@@ -252,19 +252,26 @@ public final class Pass3bVerifier extend
 //see JVM $4.8.2
 //TODO implement all based on stack 
 Type returnedType = null;
-if( ih.getPrev().getInstruction() instanceof InvokeInstruction 
)
-{
-returnedType = 
((InvokeInstruction)ih.getPrev().getInstruction()).getType(m.getConstantPool());
-}
-if( ih.getPrev().getInstruction() instanceof LoadInstruction )
-{
-int index = 
((LoadInstruction)ih.getPrev().getInstruction()).getIndex();
-returnedType = lvs.get(index);
-}
-if( ih.getPrev().getInstruction() instanceof GETFIELD )
-{
-returnedType = 
((GETFIELD)ih.getPrev().getInstruction()).getType(m.getConstantPool());
-}
+   InstructionHandle ihPrev = null;
+   ihPrev = ih.getPrev();
+
+   if (ihPrev != null)
+   {
+   if( ihPrev.getInstruction() instanceof 
InvokeInstruction )
+   {
+   returnedType = 
((InvokeInstruction)ihPrev.getInstruction()).getType(m.getConstantPool());
+   }
+   if( ihPrev.getInstruction() instanceof LoadInstruction )
+   {
+   int index = 
((LoadInstruction)ihPrev.getInstruction()).getIndex();
+   returnedType = lvs.get(index);
+   }
+   if( ihPrev.getInstruction() instanceof GETFIELD )
+   {
+   returnedType = 
((GETFIELD)ihPrev.getInstruction()).getType(m.getConstantPool());
+   }
+   }
+   
 if( returnedType != null )
 {
 if( returnedType instanceof ObjectType )

svn commit: r1151709 - /commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java

[dbrosius]

Author: dbrosius
Date: Thu Jul 28 03:21:13 2011
New Revision: 1151709

URL: http://svn.apache.org/viewvc?rev=1151709view=rev
Log:
apply patch: Bug 51563 - [patch] InstConstraintVisitor does not handle class 
constants

Modified:

commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java

Modified: 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java?rev=1151709r1=1151708r2=1151709view=diff
==
--- 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java
 (original)
+++ 
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java
 Thu Jul 28 03:21:13 2011
@@ -2186,12 +2186,13 @@ public class InstConstraintVisitor exten
public void visitLDC(LDC o){
// visitCPInstruction is called first.

-   Constant c = cpg.getConstant(o.getIndex());
-   if  (!  (   ( c instanceof ConstantInteger) ||
-   ( c instanceof 
ConstantFloat)   ||
-   ( c instanceof 
ConstantString ) )   ){
-   constraintViolated(o, Referenced constant should be a 
CONSTANT_Integer, a CONSTANT_Float or a CONSTANT_String, but is '+c+'.);
-   }
+   Constant c = cpg.getConstant(o.getIndex());
+   if  (!  (   ( c instanceof ConstantInteger) ||
+   ( c instanceof ConstantFloat)   
||
+   ( c instanceof ConstantString   )   
||
+   ( c instanceof ConstantClass) ) 
){
+   constraintViolated(o, Referenced constant should be a 
CONSTANT_Integer, a CONSTANT_Float, a CONSTANT_String or a CONSTANT_Class, but 
is '+c+'.);
+   }
}
 
/**
@@ -2201,11 +2202,12 @@ public class InstConstraintVisitor exten
// visitCPInstruction is called first.

Constant c = cpg.getConstant(o.getIndex());
-   if  (!  (   ( c instanceof ConstantInteger) ||
-   ( c instanceof 
ConstantFloat)   ||
-   ( c instanceof 
ConstantString ) )   ){
-   constraintViolated(o, Referenced constant should be a 
CONSTANT_Integer, a CONSTANT_Float or a CONSTANT_String, but is '+c+'.);
-   }
+   if  (!  (   ( c instanceof ConstantInteger) ||
+   ( c instanceof ConstantFloat)   
||
+   ( c instanceof ConstantString   )   
||
+   ( c instanceof ConstantClass) ) 
){
+   constraintViolated(o, Referenced constant should be a 
CONSTANT_Integer, a CONSTANT_Float, a CONSTANT_String or a CONSTANT_Class, but 
is '+c+'.);
+   }
}
 
/**

svn commit: r1151711 - /commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Constants.java

[dbrosius]

Author: dbrosius
Date: Thu Jul 28 03:27:59 2011
New Revision: 1151711

URL: http://svn.apache.org/viewvc?rev=1151711view=rev
Log:
add constants for java 1.7 internal version numbers

Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Constants.java

Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Constants.java
URL: 
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Constants.java?rev=1151711r1=1151710r2=1151711view=diff
==
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Constants.java 
(original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Constants.java Thu 
Jul 28 03:27:59 2011
@@ -75,8 +75,8 @@ public interface Constants {
*  */
   public final static short MINOR_1_5 = 0;
 
-  /** Major version number of class files for Java 1.5.
-   *  @see #MINOR_1_5
+  /** Major version number of class files for Java 1.6.
+   *  @see #MINOR_1_6
*  */
   public final static short MAJOR_1_6 = 50;
 
@@ -84,6 +84,16 @@ public interface Constants {
*  @see #MAJOR_1_6
*  */
   public final static short MINOR_1_6 = 0;
+  
+  /** Major version number of class files for Java 1.7.
+   *  @see #MINOR_1_7
+   *  */
+  public final static short MAJOR_1_7 = 51;
+
+  /** Minor version number of class files for Java 1.7.
+   *  @see #MAJOR_1_7
+   *  */
+  public final static short MINOR_1_7 = 0;
 
   /** Default major version number.  Class file is for Java 1.1.
*  @see #MAJOR_1_1