diff --git a/common/common-image/src/main/java/com/twelvemonkeys/image/DiffusionDither.java b/common/common-image/src/main/java/com/twelvemonkeys/image/DiffusionDither.java
index 14faa3ac..363b9542 100755
--- a/common/common-image/src/main/java/com/twelvemonkeys/image/DiffusionDither.java
+++ b/common/common-image/src/main/java/com/twelvemonkeys/image/DiffusionDither.java
@@ -36,34 +36,36 @@ import java.util.Random;
* @author Harald Kuhr
* @author last modified by $Author: haku $
*
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/DiffusionDither.java#1 $
+ * @version $Id: DiffusionDither.java#1 $
*
*/
public class DiffusionDither implements BufferedImageOp, RasterOp {
- protected IndexColorModel indexColorModel = null;
- private boolean alternateScans = true;
private static final int FS_SCALE = 1 << 8;
private static final Random RANDOM = new Random();
+ protected final IndexColorModel indexColorModel;
+ private boolean alternateScans = true;
+
/**
* Creates a {@code DiffusionDither}, using the given
* {@code IndexColorModel} for dithering into.
*
* @param pICM an IndexColorModel.
*/
- public DiffusionDither(IndexColorModel pICM) {
- // Store colormodel
+ public DiffusionDither(final IndexColorModel pICM) {
+ // Store color model
indexColorModel = pICM;
}
/**
* Creates a {@code DiffusionDither}, with no fixed
- * {@code IndexColorModel}. The colormodel will be generated for each
- * filtering, unless the dest image allready has an
+ * {@code IndexColorModel}. The color model will be generated for each
+ * filtering, unless the destination image already has an
* {@code IndexColorModel}.
*/
public DiffusionDither() {
+ this(null);
}
/**
@@ -86,8 +88,7 @@ public class DiffusionDither implements BufferedImageOp, RasterOp {
* @throws ImageFilterException if {@code pDestCM} is not {@code null} or
* an instance of {@code IndexColorModel}.
*/
- public final BufferedImage createCompatibleDestImage(BufferedImage pSource,
- ColorModel pDestCM) {
+ public final BufferedImage createCompatibleDestImage(BufferedImage pSource, ColorModel pDestCM) {
if (pDestCM == null) {
return new BufferedImage(pSource.getWidth(), pSource.getHeight(),
BufferedImage.TYPE_BYTE_INDEXED,
@@ -107,7 +108,7 @@ public class DiffusionDither implements BufferedImageOp, RasterOp {
* Creates a compatible {@code Raster} to dither into.
* Only {@code IndexColorModel} allowed.
*
- * @param pSrc
+ * @param pSrc the source raster
*
* @return a {@code WritableRaster}
*/
@@ -115,14 +116,16 @@ public class DiffusionDither implements BufferedImageOp, RasterOp {
return createCompatibleDestRaster(pSrc, getICM(pSrc));
}
- public final WritableRaster createCompatibleDestRaster(Raster pSrc,
- IndexColorModel pIndexColorModel) {
+ /**
+ * Creates a compatible {@code Raster} to dither into.
+ *
+ * @param pSrc the source raster.
+ * @param pIndexColorModel the index color model used to create a {@code Raster}.
+ *
+ * @return a {@code WritableRaster}
+ */
+ public final WritableRaster createCompatibleDestRaster(Raster pSrc, IndexColorModel pIndexColorModel) {
return pIndexColorModel.createCompatibleWritableRaster(pSrc.getWidth(), pSrc.getHeight());
- /*
- return new BufferedImage(pSrc.getWidth(), pSrc.getHeight(),
- BufferedImage.TYPE_BYTE_INDEXED,
- pIndexColorModel).getRaster();
- */
}
@@ -221,8 +224,7 @@ public class DiffusionDither implements BufferedImageOp, RasterOp {
* @return the destination image, or a new image, if {@code pDest} was
* {@code null}.
*/
- public final BufferedImage filter(BufferedImage pSource,
- BufferedImage pDest) {
+ public final BufferedImage filter(BufferedImage pSource, BufferedImage pDest) {
// Create destination image, if none provided
if (pDest == null) {
pDest = createCompatibleDestImage(pSource, getICM(pSource));
@@ -265,8 +267,6 @@ public class DiffusionDither implements BufferedImageOp, RasterOp {
return IndexImage.getIndexColorModel(image, 256, IndexImage.TRANSPARENCY_BITMASK);
}
-
-
/**
* Performs a single-input/single-output dither operation, applying basic
* Floyd-Steinberg error-diffusion to the image.
@@ -278,8 +278,7 @@ public class DiffusionDither implements BufferedImageOp, RasterOp {
* @return the destination raster, or a new raster, if {@code pDest} was
* {@code null}.
*/
- public final WritableRaster filter(final Raster pSource, WritableRaster pDest,
- IndexColorModel pColorModel) {
+ public final WritableRaster filter(final Raster pSource, WritableRaster pDest, IndexColorModel pColorModel) {
int width = pSource.getWidth();
int height = pSource.getHeight();
@@ -460,6 +459,7 @@ public class DiffusionDither implements BufferedImageOp, RasterOp {
forward = !forward;
}
}
+
return pDest;
}
}
\ No newline at end of file
diff --git a/common/common-image/src/main/java/com/twelvemonkeys/image/IndexImage.java b/common/common-image/src/main/java/com/twelvemonkeys/image/IndexImage.java
index 950b195a..ef97bc5c 100755
--- a/common/common-image/src/main/java/com/twelvemonkeys/image/IndexImage.java
+++ b/common/common-image/src/main/java/com/twelvemonkeys/image/IndexImage.java
@@ -89,6 +89,8 @@ import java.awt.image.BufferedImage;
import java.awt.image.ColorModel;
import java.awt.image.IndexColorModel;
import java.awt.image.RenderedImage;
+import java.io.File;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -127,7 +129,7 @@ import java.util.List;
* @author Thomas DeWeese
* @author Jun Inamori
* @author Harald Kuhr
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/IndexImage.java#1 $
+ * @version $Id: IndexImage.java#1 $
* @see DiffusionDither
*/
class IndexImage {
@@ -237,19 +239,22 @@ class IndexImage {
if (this.val != val) {
return false;
}
+
count++;
+
return true;
}
}
/**
- * Used to define a cube of the colorspace. The cube can be split
- * approximagely in half to generate two cubes.
+ * Used to define a cube of the color space. The cube can be split
+ * approximately in half to generate two cubes.
*/
private static class Cube {
- int[] min = {0, 0, 0}, max = {255, 255, 255};
+ int[] min = {0, 0, 0};
+ int[] max = {255, 255, 255};
boolean done = false;
- List[] colors = null;
+ List[] colors = null;
int count = 0;
static final int RED = 0;
static final int GRN = 1;
@@ -261,7 +266,7 @@ class IndexImage {
* @param colors contains the 3D color histogram to be subdivided
* @param count the total number of pixels in the 3D histogram.
*/
- public Cube(List[] colors, int count) {
+ public Cube(List[] colors, int count) {
this.colors = colors;
this.count = count;
}
@@ -312,20 +317,27 @@ class IndexImage {
c0 = RED;
c1 = GRN;
}
+
Cube ret;
ret = splitChannel(splitChannel, c0, c1);
+
if (ret != null) {
return ret;
}
+
ret = splitChannel(c0, splitChannel, c1);
+
if (ret != null) {
return ret;
}
+
ret = splitChannel(c1, splitChannel, c0);
+
if (ret != null) {
return ret;
}
+
done = true;
return null;
@@ -381,16 +393,13 @@ class IndexImage {
for (int k = minIdx[c1]; k <= maxIdx[c1]; k++) {
int idx = idx2 | (k << c1Sh4);
- List v = colors[idx];
+ List v = colors[idx];
if (v == null) {
continue;
}
- Iterator itr = v.iterator();
- Counter c;
-
- while (itr.hasNext()) {
- c = (Counter) itr.next();
+
+ for (Counter c : v) {
val = c.val;
vals[0] = (val & 0xFF0000) >> 16;
vals[1] = (val & 0xFF00) >> 8;
@@ -425,7 +434,6 @@ class IndexImage {
int c = counts[i];
if (c == 0) {
-
// No counts below this so move up bottom of cube.
if ((tcount == 0) && (i < max[splitChannel])) {
this.min[splitChannel] = i + 1;
@@ -438,10 +446,8 @@ class IndexImage {
continue;
}
if ((half - tcount) <= ((tcount + c) - half)) {
-
// Then lastAdd is a better top idx for this then i.
if (lastAdd == -1) {
-
// No lower place to break.
if (c == this.count) {
@@ -465,13 +471,11 @@ class IndexImage {
else {
if (i == this.max[splitChannel]) {
if (c == this.count) {
-
// would move min up but that should
// have happened already.
return null;// no split to make.
}
else {
-
// Would like to break between i and i+1
// but no i+1 so use lastAdd and i;
splitLo = lastAdd;
@@ -503,6 +507,7 @@ class IndexImage {
ret.max[c0] = this.max[c0];
ret.min[c1] = this.min[c1];
ret.max[c1] = this.max[c1];
+
return ret;
}
@@ -515,6 +520,7 @@ class IndexImage {
if (this.count == 0) {
return 0;
}
+
float red = 0, grn = 0, blu = 0;
int minR = min[0], minG = min[1], minB = min[2];
int maxR = max[0], maxG = max[1], maxB = max[2];
@@ -531,20 +537,18 @@ class IndexImage {
for (int k = minIdx[2]; k <= maxIdx[2]; k++) {
int idx = idx2 | k;
- List v = colors[idx];
+ List v = colors[idx];
if (v == null) {
continue;
}
- Iterator itr = v.iterator();
- Counter c;
- while (itr.hasNext()) {
- c = (Counter) itr.next();
+ for (Counter c : v) {
val = c.val;
ired = (val & 0xFF0000) >> 16;
igrn = (val & 0x00FF00) >> 8;
iblu = (val & 0x0000FF);
+
if (((ired >= minR) && (ired <= maxR)) && ((igrn >= minG) && (igrn <= maxG)) && ((iblu >= minB) && (iblu <= maxB))) {
weight = (c.count / (float) this.count);
red += ((float) ired) * weight;
@@ -579,10 +583,7 @@ class IndexImage {
* This version will be removed in a later version of the API.
*/
public static IndexColorModel getIndexColorModel(Image pImage, int pNumberOfColors, boolean pFast) {
-
- return getIndexColorModel(pImage, pNumberOfColors, pFast
- ? COLOR_SELECTION_FAST
- : COLOR_SELECTION_QUALITY);
+ return getIndexColorModel(pImage, pNumberOfColors, pFast ? COLOR_SELECTION_FAST : COLOR_SELECTION_QUALITY);
}
/**
@@ -636,17 +637,12 @@ class IndexImage {
// We now have at least a buffered image, create model from it
if (icm == null) {
icm = createIndexColorModel(ImageUtil.toBuffered(image), pNumberOfColors, pHints);
-
- //System.out.println("IndexColorModel created from colors.");
- }
+ }
else if (!(icm instanceof InverseColorMapIndexColorModel)) {
// If possible, use faster code
- //System.out.println("Wrappimg IndexColorModel in InverseColorMapIndexColorModel");
icm = new InverseColorMapIndexColorModel(icm);
}
- //else {
- //System.out.println("Allredy InverseColorMapIndexColorModel");
- //}
+
return icm;
}
@@ -674,7 +670,8 @@ class IndexImage {
int height = pImage.getHeight();
// Using 4 bits from R, G & B.
- List[] colors = new List[1 << 12];// [4096]
+ @SuppressWarnings("unchecked")
+ List[] colors = new List[1 << 12];// [4096]
// Speedup, doesn't decrease image quality much
int step = 1;
@@ -739,13 +736,16 @@ class IndexImage {
while (numberOfCubes < pNumberOfColors) {
while (cubes[fCube].isDone()) {
fCube++;
+
if (fCube == numberOfCubes) {
break;
}
}
+
if (fCube == numberOfCubes) {
break;
}
+
Cube cube = cubes[fCube];
Cube newCube = cube.split();
@@ -756,6 +756,7 @@ class IndexImage {
cube = newCube;
newCube = tmp;
}
+
int j = fCube;
int count = cube.count;
@@ -765,17 +766,19 @@ class IndexImage {
}
cubes[j++] = cubes[i];
}
+
cubes[j++] = cube;
count = newCube.count;
+
while (j < numberOfCubes) {
if (cubes[j].count < count) {
break;
}
j++;
}
- for (int i = numberOfCubes; i > j; i--) {
- cubes[i] = cubes[i - 1];
- }
+
+ System.arraycopy(cubes, j, cubes, j + 1, numberOfCubes - j);
+
cubes[j/*++*/] = newCube;
numberOfCubes++;
}
@@ -803,15 +806,13 @@ class IndexImage {
// - transparency added to all totally black colors?
int numOfBits = 8;
- // -- haraldK, 20021024, as suggested by Thomas E Deweese
+ // -- haraldK, 20021024, as suggested by Thomas E. Deweese
// plus adding a transparent pixel
IndexColorModel icm;
if (useTransparency) {
- //icm = new IndexColorModel(numOfBits, r.length, r, g, b, r.length - 1);
icm = new InverseColorMapIndexColorModel(numOfBits, r.length, r, g, b, r.length - 1);
}
else {
- //icm = new IndexColorModel(numOfBits, r.length, r, g, b);
icm = new InverseColorMapIndexColorModel(numOfBits, r.length, r, g, b);
}
return icm;
@@ -925,7 +926,7 @@ class IndexImage {
* @see IndexColorModel
*/
public static BufferedImage getIndexedImage(BufferedImage pImage, int pNumberOfColors, Color pMatte, int pHints) {
- // NOTE: We need to apply matte before creating colormodel, otherwise we
+ // NOTE: We need to apply matte before creating color model, otherwise we
// won't have colors for potential faded transitions
IndexColorModel icm;
@@ -985,15 +986,16 @@ class IndexImage {
final int width = pImage.getWidth();
final int height = pImage.getHeight();
- // Support transparancy?
+ // Support transparency?
boolean transparency = isTransparent(pHints) && (pImage.getColorModel().getTransparency() != Transparency.OPAQUE) && (pColors.getTransparency() != Transparency.OPAQUE);
// Create image with solid background
BufferedImage solid = pImage;
- if (pMatte != null) {// transparency doesn't really matter
+ if (pMatte != null) { // transparency doesn't really matter
solid = createSolid(pImage, pMatte);
}
+
BufferedImage indexed;
// Support TYPE_BYTE_BINARY, but only for 2 bit images, as the default
@@ -1044,12 +1046,12 @@ class IndexImage {
finally {
g2d.dispose();
}
+
break;
}
// Transparency support, this approach seems lame, but it's the only
// solution I've found until now (that actually works).
- // Got anything to do with isPremultiplied? Hmm...
if (transparency) {
// Re-apply the alpha-channel of the original image
applyAlpha(indexed, pImage);
@@ -1183,14 +1185,14 @@ class IndexImage {
* @param pAlpha the image containing the alpha
*/
private static void applyAlpha(BufferedImage pImage, BufferedImage pAlpha) {
- // Apply alpha as transparancy, using threshold of 25%
+ // Apply alpha as transparency, using threshold of 25%
for (int y = 0; y < pAlpha.getHeight(); y++) {
for (int x = 0; x < pAlpha.getWidth(); x++) {
// Get alpha component of pixel, if less than 25% opaque
// (0x40 = 64 => 25% of 256), the pixel will be transparent
if (((pAlpha.getRGB(x, y) >> 24) & 0xFF) < 0x40) {
- pImage.setRGB(x, y, 0x00FFFFFF);// 100% transparent
+ pImage.setRGB(x, y, 0x00FFFFFF); // 100% transparent
}
}
}
@@ -1200,7 +1202,6 @@ class IndexImage {
* This class is also a command-line utility.
*/
public static void main(String pArgs[]) {
-
// Defaults
int argIdx = 0;
int speedTest = -1;
@@ -1237,14 +1238,13 @@ class IndexImage {
speedTest = 10;
}
}
- else
- if ((pArgs[argIdx].charAt(1) == 'w') || pArgs[argIdx].equals("--overwrite")) {
+ else if ((pArgs[argIdx].charAt(1) == 'w') || pArgs[argIdx].equals("--overwrite")) {
overWrite = true;
argIdx++;
}
- else
- if ((pArgs[argIdx].charAt(1) == 'c') || pArgs[argIdx].equals("--colors")) {
+ else if ((pArgs[argIdx].charAt(1) == 'c') || pArgs[argIdx].equals("--colors")) {
argIdx++;
+
try {
numColors = Integer.parseInt(pArgs[argIdx++]);
}
@@ -1253,34 +1253,28 @@ class IndexImage {
break;
}
}
- else
- if ((pArgs[argIdx].charAt(1) == 'g') || pArgs[argIdx].equals("--grayscale")) {
+ else if ((pArgs[argIdx].charAt(1) == 'g') || pArgs[argIdx].equals("--grayscale")) {
argIdx++;
gray = true;
}
- else
- if ((pArgs[argIdx].charAt(1) == 'm') || pArgs[argIdx].equals("--monochrome")) {
+ else if ((pArgs[argIdx].charAt(1) == 'm') || pArgs[argIdx].equals("--monochrome")) {
argIdx++;
numColors = 2;
monochrome = true;
}
- else
- if ((pArgs[argIdx].charAt(1) == 'd') || pArgs[argIdx].equals("--dither")) {
+ else if ((pArgs[argIdx].charAt(1) == 'd') || pArgs[argIdx].equals("--dither")) {
argIdx++;
dither = pArgs[argIdx++];
}
- else
- if ((pArgs[argIdx].charAt(1) == 'p') || pArgs[argIdx].equals("--palette")) {
+ else if ((pArgs[argIdx].charAt(1) == 'p') || pArgs[argIdx].equals("--palette")) {
argIdx++;
paletteFileName = pArgs[argIdx++];
}
- else
- if ((pArgs[argIdx].charAt(1) == 'q') || pArgs[argIdx].equals("--quality")) {
+ else if ((pArgs[argIdx].charAt(1) == 'q') || pArgs[argIdx].equals("--quality")) {
argIdx++;
quality = pArgs[argIdx++];
}
- else
- if ((pArgs[argIdx].charAt(1) == 'b') || pArgs[argIdx].equals("--bgcolor")) {
+ else if ((pArgs[argIdx].charAt(1) == 'b') || pArgs[argIdx].equals("--bgcolor")) {
argIdx++;
try {
background = StringUtil.toColor(pArgs[argIdx++]);
@@ -1290,18 +1284,15 @@ class IndexImage {
break;
}
}
- else
- if ((pArgs[argIdx].charAt(1) == 't') || pArgs[argIdx].equals("--transparency")) {
+ else if ((pArgs[argIdx].charAt(1) == 't') || pArgs[argIdx].equals("--transparency")) {
argIdx++;
transparency = true;
}
- else
- if ((pArgs[argIdx].charAt(1) == 'f') || pArgs[argIdx].equals("--outputformat")) {
+ else if ((pArgs[argIdx].charAt(1) == 'f') || pArgs[argIdx].equals("--outputformat")) {
argIdx++;
format = StringUtil.toLowerCase(pArgs[argIdx++]);
}
- else
- if ((pArgs[argIdx].charAt(1) == 'h') || pArgs[argIdx].equals("--help")) {
+ else if ((pArgs[argIdx].charAt(1) == 'h') || pArgs[argIdx].equals("--help")) {
argIdx++;
// Setting errArgs to true, to print usage
@@ -1321,6 +1312,7 @@ class IndexImage {
? ", "
: "\n"));
}
+
System.err.print("Output format names: ");
String[] writers = ImageIO.getWriterFormatNames();
@@ -1333,7 +1325,7 @@ class IndexImage {
}
// Read in image
- java.io.File in = new java.io.File(pArgs[argIdx++]);
+ File in = new File(pArgs[argIdx++]);
if (!in.exists()) {
System.err.println("File \"" + in.getAbsolutePath() + "\" does not exist!");
@@ -1341,10 +1333,10 @@ class IndexImage {
}
// Read palette if needed
- java.io.File paletteFile = null;
+ File paletteFile = null;
if (paletteFileName != null) {
- paletteFile = new java.io.File(paletteFileName);
+ paletteFile = new File(paletteFileName);
if (!paletteFile.exists()) {
System.err.println("File \"" + in.getAbsolutePath() + "\" does not exist!");
System.exit(5);
@@ -1352,10 +1344,10 @@ class IndexImage {
}
// Make sure we can write
- java.io.File out;
+ File out;
if (argIdx < pArgs.length) {
- out = new java.io.File(pArgs[argIdx/*++*/]);
+ out = new File(pArgs[argIdx/*++*/]);
// Get format from file extension
if (format == null) {
@@ -1363,7 +1355,6 @@ class IndexImage {
}
}
else {
-
// Create new file in current dir, same name + format extension
String baseName = FileUtil.getBasename(in);
@@ -1371,8 +1362,9 @@ class IndexImage {
if (format == null) {
format = "png";
}
- out = new java.io.File(baseName + '.' + format);
+ out = new File(baseName + '.' + format);
}
+
if (!overWrite && out.exists()) {
System.err.println("The file \"" + out.getAbsolutePath() + "\" allready exists!");
System.exit(5);
@@ -1396,7 +1388,7 @@ class IndexImage {
}
}
}
- catch (java.io.IOException ioe) {
+ catch (IOException ioe) {
ioe.printStackTrace(System.err);
System.exit(5);
}
@@ -1441,16 +1433,14 @@ class IndexImage {
///////////////////////////////
// Index
long start = 0;
- long end;
if (speedTest > 0) {
-
// SPEED TESTING
System.out.println("Measuring speed!");
start = System.currentTimeMillis();
-
// END SPEED TESTING
}
+
BufferedImage indexed;
IndexColorModel colors;
@@ -1459,7 +1449,6 @@ class IndexImage {
colors = MonochromeColorModel.getInstance();
}
else if (gray) {
-
//indexed = ImageUtil.toBuffered(ImageUtil.grayscale(image), BufferedImage.TYPE_BYTE_GRAY);
image = ImageUtil.toBuffered(ImageUtil.grayscale(image));
indexed = getIndexedImage(image, colors = getIndexColorModel(image, numColors, hints), background, hints);
@@ -1470,7 +1459,6 @@ class IndexImage {
}
}
else if (paletteImg != null) {
-
// Get palette from image
indexed = getIndexedImage(ImageUtil.toBuffered(image, BufferedImage.TYPE_INT_ARGB),
colors = getIndexColorModel(paletteImg, numColors, hints), background, hints);
@@ -1479,12 +1467,10 @@ class IndexImage {
image = ImageUtil.toBuffered(image, BufferedImage.TYPE_INT_ARGB);
indexed = getIndexedImage(image, colors = getIndexColorModel(image, numColors, hints), background, hints);
}
+
if (speedTest > 0) {
-
// SPEED TESTING
- end = System.currentTimeMillis();
- System.out.println("Color selection + dither: " + (end - start) + " ms");
-
+ System.out.println("Color selection + dither: " + (System.currentTimeMillis() - start) + " ms");
// END SPEED TESTING
}
@@ -1494,11 +1480,11 @@ class IndexImage {
System.err.println("No writer for format: \"" + format + "\"!");
}
}
- catch (java.io.IOException ioe) {
+ catch (IOException ioe) {
ioe.printStackTrace(System.err);
}
- if (speedTest > 0) {
+ if (speedTest > 0) {
// SPEED TESTING
System.out.println("Measuring speed!");
@@ -1513,17 +1499,16 @@ class IndexImage {
for (int i = 0; i < speedTest; i++) {
start = System.currentTimeMillis();
getIndexedImage(image, colors, background, hints);
- end = System.currentTimeMillis();
- time += (end - start);
+ time += (System.currentTimeMillis() - start);
System.out.print('.');
if ((i + 1) % 10 == 0) {
System.out.println("\nAverage (after " + (i + 1) + " iterations): " + (time / (i + 1)) + "ms");
}
}
+
System.out.println("\nDither only:");
System.out.println("Total time (" + speedTest + " invocations): " + time + "ms");
System.out.println("Average: " + time / speedTest + "ms");
-
// END SPEED TESTING
}
}
diff --git a/common/common-io/src/main/java/com/twelvemonkeys/io/FastByteArrayOutputStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/FastByteArrayOutputStream.java
index d653ed10..0a8b7706 100755
--- a/common/common-io/src/main/java/com/twelvemonkeys/io/FastByteArrayOutputStream.java
+++ b/common/common-io/src/main/java/com/twelvemonkeys/io/FastByteArrayOutputStream.java
@@ -39,7 +39,7 @@ import java.io.ByteArrayInputStream;
*
*
* @author Harald Kuhr
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FastByteArrayOutputStream.java#2 $
+ * @version $Id: FastByteArrayOutputStream.java#2 $
*/
// TODO: Performance test of a stream impl that uses list of fixed size blocks, rather than contiguous block
public final class FastByteArrayOutputStream extends ByteArrayOutputStream {
@@ -78,23 +78,24 @@ public final class FastByteArrayOutputStream extends ByteArrayOutputStream {
else if (pLength == 0) {
return;
}
- int newcount = count + pLength;
- growIfNeeded(newcount);
+
+ int newCount = count + pLength;
+ growIfNeeded(newCount);
System.arraycopy(pBytes, pOffset, buf, count, pLength);
- count = newcount;
+ count = newCount;
}
@Override
public synchronized void write(int pByte) {
- int newcount = count + 1;
- growIfNeeded(newcount);
+ int newCount = count + 1;
+ growIfNeeded(newCount);
buf[count] = (byte) pByte;
- count = newcount;
+ count = newCount;
}
- private void growIfNeeded(int pNewcount) {
- if (pNewcount > buf.length) {
- int newSize = Math.max(Math.min(buf.length << 1, buf.length + maxGrowSize), pNewcount);
+ private void growIfNeeded(int pNewCount) {
+ if (pNewCount > buf.length) {
+ int newSize = Math.max(Math.min(buf.length << 1, buf.length + maxGrowSize), pNewCount);
byte newBuf[] = new byte[newSize];
System.arraycopy(buf, 0, newBuf, 0, count);
buf = newBuf;
@@ -110,9 +111,10 @@ public final class FastByteArrayOutputStream extends ByteArrayOutputStream {
// Non-synchronized version of toByteArray
@Override
public byte[] toByteArray() {
- byte newbuf[] = new byte[count];
- System.arraycopy(buf, 0, newbuf, 0, count);
- return newbuf;
+ byte newBuf[] = new byte[count];
+ System.arraycopy(buf, 0, newBuf, 0, count);
+
+ return newBuf;
}
/**
diff --git a/common/common-io/src/main/java/com/twelvemonkeys/io/FileSystem.java b/common/common-io/src/main/java/com/twelvemonkeys/io/FileSystem.java
index 75c86fcd..9b18f789 100755
--- a/common/common-io/src/main/java/com/twelvemonkeys/io/FileSystem.java
+++ b/common/common-io/src/main/java/com/twelvemonkeys/io/FileSystem.java
@@ -38,7 +38,7 @@ import java.io.InputStreamReader;
*
*
* @author Harald Kuhr
- * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FileSystem.java#1 $
+ * @version $Id: FileSystem.java#1 $
*/
abstract class FileSystem {
abstract long getFreeSpace(File pPath);
@@ -57,21 +57,21 @@ abstract class FileSystem {
//System.out.println("os = " + os);
os = os.toLowerCase();
- if (os.indexOf("windows") != -1) {
+ if (os.contains("windows")) {
return new Win32FileSystem();
}
- else if (os.indexOf("linux") != -1 ||
- os.indexOf("sun os") != -1 ||
- os.indexOf("sunos") != -1 ||
- os.indexOf("solaris") != -1 ||
- os.indexOf("mpe/ix") != -1 ||
- os.indexOf("hp-ux") != -1 ||
- os.indexOf("aix") != -1 ||
- os.indexOf("freebsd") != -1 ||
- os.indexOf("irix") != -1 ||
- os.indexOf("digital unix") != -1 ||
- os.indexOf("unix") != -1 ||
- os.indexOf("mac os x") != -1) {
+ else if (os.contains("linux") ||
+ os.contains("sun os") ||
+ os.contains("sunos") ||
+ os.contains("solaris") ||
+ os.contains("mpe/ix") ||
+ os.contains("hp-ux") ||
+ os.contains("aix") ||
+ os.contains("freebsd") ||
+ os.contains("irix") ||
+ os.contains("digital unix") ||
+ os.contains("unix") ||
+ os.contains("mac os x")) {
return new UnixFileSystem();
}
else {
diff --git a/common/common-io/src/main/java/com/twelvemonkeys/io/FileUtil.java b/common/common-io/src/main/java/com/twelvemonkeys/io/FileUtil.java
index 288f6540..f538d742 100755
--- a/common/common-io/src/main/java/com/twelvemonkeys/io/FileUtil.java
+++ b/common/common-io/src/main/java/com/twelvemonkeys/io/FileUtil.java
@@ -186,6 +186,7 @@ public final class FileUtil {
if (!pOverWrite && pToFile.exists()) {
return false;
}
+
InputStream in = null;
OutputStream out = null;
@@ -202,6 +203,7 @@ public final class FileUtil {
close(in);
close(out);
}
+
return true; // If we got here, everything's probably okay.. ;-)
}
@@ -307,6 +309,8 @@ public final class FileUtil {
Validate.notNull(pFrom, "from");
Validate.notNull(pTo, "to");
+ // TODO: Consider using file channels for faster copy where possible
+
// Use buffer size two times byte array, to avoid i/o bottleneck
// TODO: Consider letting the client decide as this is sometimes not a good thing!
InputStream in = new BufferedInputStream(pFrom, BUF_SIZE * 2);
@@ -322,31 +326,9 @@ public final class FileUtil {
// Flush out stream, to write any remaining buffered data
out.flush();
- return true; // If we got here, everything's probably okay.. ;-)
+ return true; // If we got here, everything is probably okay.. ;-)
}
- /*
- // Consider using the example from
- // http://developer.java.sun.com/developer/Books/performance/ch04.pdf
- // Test if this is really faster. And what about a lot of concurrence?
- // Have a pool of buffers? :-)
-
- static final int BUFF_SIZE = 100000;
- static final byte[] buffer = new byte[BUFF_SIZE];
-
- public static void copy(InputStream in, OutputStream out) throws IOException {
- while (true) {
- synchronized (buffer) {
- int amountRead = in.read(buffer);
- if (amountRead == -1) {
- break;
- }
- out.write(buffer, 0, amountRead);
- }
- }
- }
- */
-
/**
* Gets the file (type) extension of the given file.
* A file extension is the part of the filename, after the last occurence