diff --git a/common/common-image/src/main/java/com/twelvemonkeys/image/ImageUtil.java b/common/common-image/src/main/java/com/twelvemonkeys/image/ImageUtil.java index 9f08f0fd..f9159a9e 100644 --- a/common/common-image/src/main/java/com/twelvemonkeys/image/ImageUtil.java +++ b/common/common-image/src/main/java/com/twelvemonkeys/image/ImageUtil.java @@ -175,10 +175,6 @@ public final class ImageUtil { /** Our static image tracker */ private static MediaTracker sTracker = new MediaTracker(NULL_COMPONENT); - //private static Object sTrackerMutex = new Object(); - - /** Image id used by the image tracker */ - //private static int sTrackerId = 0; /** */ protected static final AffineTransform IDENTITY_TRANSFORM = new AffineTransform(); @@ -1140,26 +1136,26 @@ public final class ImageUtil { * Sharpens an image using a convolution matrix. * The sharpen kernel used, is defined by the following 3 by 3 matrix: * - * - * - * - * - * + * + * + * + * + * *
0.0-{@code pAmmount}0.0
-{@code pAmmount}4.0 * {@code pAmmount} + 1.0-{@code pAmmount}
0.0-{@code pAmmount}0.0
0.0-{@code pAmount}0.0
-{@code pAmount}4.0 * {@code pAmount} + 1.0-{@code pAmount}
0.0-{@code pAmount}0.0
* * @param pOriginal the BufferedImage to sharpen - * @param pAmmount the ammount of sharpening + * @param pAmount the amount of sharpening * * @return a BufferedImage, containing the sharpened image. */ - public static BufferedImage sharpen(BufferedImage pOriginal, float pAmmount) { - if (pAmmount == 0f) { + public static BufferedImage sharpen(BufferedImage pOriginal, float pAmount) { + if (pAmount == 0f) { return pOriginal; } // Create the convolution matrix float[] data = new float[] { - 0.0f, -pAmmount, 0.0f, -pAmmount, 4f * pAmmount + 1f, -pAmmount, 0.0f, -pAmmount, 0.0f + 0.0f, -pAmount, 0.0f, -pAmount, 4f * pAmount + 1f, -pAmount, 0.0f, -pAmount, 0.0f }; // Do the filtering @@ -1185,7 +1181,7 @@ public final class ImageUtil { * Creates a blurred version of the given image. * * @param pOriginal the original image - * @param pRadius the ammount to blur + * @param pRadius the amount to blur * * @return a new {@code BufferedImage} with a blurred version of the given image */ @@ -1198,18 +1194,18 @@ public final class ImageUtil { // See: http://en.wikipedia.org/wiki/Gaussian_blur#Implementation // Also see http://www.jhlabs.com/ip/blurring.html - // TODO: Rethink... Fixed ammount and scale matrix instead? -// pAmmount = 1f - pAmmount; -// float pAmmount = 1f - pRadius; + // TODO: Rethink... Fixed amount and scale matrix instead? +// pAmount = 1f - pAmount; +// float pAmount = 1f - pRadius; // -// // Normalize ammount -// float normAmt = (1f - pAmmount) / 24; +// // Normalize amount +// float normAmt = (1f - pAmount) / 24; // // // Create the convolution matrix // float[] data = new float[] { // normAmt / 2, normAmt, normAmt, normAmt, normAmt / 2, // normAmt, normAmt, normAmt * 2, normAmt, normAmt, -// normAmt, normAmt * 2, pAmmount, normAmt * 2, normAmt, +// normAmt, normAmt * 2, pAmount, normAmt * 2, normAmt, // normAmt, normAmt, normAmt * 2, normAmt, normAmt, // normAmt / 2, normAmt, normAmt, normAmt, normAmt / 2 // }; @@ -1391,18 +1387,18 @@ public final class ImageUtil { * Changes the contrast of the image * * @param pOriginal the {@code Image} to change - * @param pAmmount the ammount of contrast in the range [-1.0..1.0]. + * @param pAmount the amount of contrast in the range [-1.0..1.0]. * * @return an {@code Image}, containing the contrasted image. */ - public static Image contrast(Image pOriginal, float pAmmount) { + public static Image contrast(Image pOriginal, float pAmount) { // No change, return original - if (pAmmount == 0f) { + if (pAmount == 0f) { return pOriginal; } // Create filter - RGBImageFilter filter = new BrightnessContrastFilter(0f, pAmmount); + RGBImageFilter filter = new BrightnessContrastFilter(0f, pAmount); // Return contrast adjusted image return filter(pOriginal, filter); @@ -1413,18 +1409,18 @@ public final class ImageUtil { * Changes the brightness of the original image. * * @param pOriginal the {@code Image} to change - * @param pAmmount the ammount of brightness in the range [-2.0..2.0]. + * @param pAmount the amount of brightness in the range [-2.0..2.0]. * * @return an {@code Image} */ - public static Image brightness(Image pOriginal, float pAmmount) { + public static Image brightness(Image pOriginal, float pAmount) { // No change, return original - if (pAmmount == 0f) { + if (pAmount == 0f) { return pOriginal; } // Create filter - RGBImageFilter filter = new BrightnessContrastFilter(pAmmount, 0f); + RGBImageFilter filter = new BrightnessContrastFilter(pAmount, 0f); // Return brightness adjusted image return filter(pOriginal, filter); @@ -1465,7 +1461,7 @@ public final class ImageUtil { } /** - * Tries to use H/W-accellerated code for an image for display purposes. + * Tries to use H/W-accelerated code for an image for display purposes. * Note that transparent parts of the image might be replaced by solid * color. Additional image information not used by the current diplay * hardware may be discarded, like extra bith depth etc. @@ -1478,7 +1474,7 @@ public final class ImageUtil { } /** - * Tries to use H/W-accellerated code for an image for display purposes. + * Tries to use H/W-accelerated code for an image for display purposes. * Note that transparent parts of the image might be replaced by solid * color. Additional image information not used by the current diplay * hardware may be discarded, like extra bith depth etc. @@ -1494,7 +1490,7 @@ public final class ImageUtil { } /** - * Tries to use H/W-accellerated code for an image for display purposes. + * Tries to use H/W-accelerated code for an image for display purposes. * Note that transparent parts of the image will be replaced by solid * color. Additional image information not used by the current diplay * hardware may be discarded, like extra bith depth etc. @@ -1825,13 +1821,6 @@ public final class ImageUtil { // Create a local id for use with the mediatracker int imageId; - // NOTE: The synchronization throws IllegalMonitorStateException if - // using JIT on J2SE 1.2 (tested version Sun JRE 1.2.2_017). - // Works perfectly interpreted... Hmmm... - //synchronized (sTrackerMutex) { - //imageId = ++sTrackerId; - //} - // NOTE: This is very experimental... imageId = pImages.length == 1 ? System.identityHashCode(pImages[0]) : System.identityHashCode(pImages); diff --git a/common/common-lang/src/main/java/com/twelvemonkeys/util/AbstractTokenIterator.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/AbstractTokenIterator.java index edfa51bf..90e56161 100755 --- a/common/common-lang/src/main/java/com/twelvemonkeys/util/AbstractTokenIterator.java +++ b/common/common-lang/src/main/java/com/twelvemonkeys/util/AbstractTokenIterator.java @@ -46,7 +46,7 @@ public abstract class AbstractTokenIterator implements TokenIterator { public void remove() { // TODO: This is not difficult: // - Convert String to StringBuilder in constructor - // - delete(pos, mNext.lenght()) + // - delete(pos, next.lenght()) // - Add toString() method // BUT: Would it ever be useful? :-) diff --git a/common/common-lang/src/main/java/com/twelvemonkeys/util/LRUHashMap.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/LRUHashMap.java index cbaa015f..eee68eeb 100755 --- a/common/common-lang/src/main/java/com/twelvemonkeys/util/LRUHashMap.java +++ b/common/common-lang/src/main/java/com/twelvemonkeys/util/LRUHashMap.java @@ -205,6 +205,7 @@ public class LRUHashMap extends LinkedHashMap implements ExpiringMap */ public void removeLRU() { int removeCount = (int) Math.max((size() * trimFactor), 1); + Iterator> entries = entrySet().iterator(); while ((removeCount--) > 0 && entries.hasNext()) { entries.next(); diff --git a/common/common-lang/src/main/java/com/twelvemonkeys/util/LRUMap.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/LRUMap.java index d5057046..040ed014 100755 --- a/common/common-lang/src/main/java/com/twelvemonkeys/util/LRUMap.java +++ b/common/common-lang/src/main/java/com/twelvemonkeys/util/LRUMap.java @@ -45,7 +45,7 @@ import java.util.Map; * * * @author Harald Kuhr - * @version $Id: //depot/branches/personal/haraldk/twelvemonkeys/release-2/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/LRUMap.java#1 $ + * @version $Id: com/twelvemonkeys/util/LRUMap.java#1 $ */ public class LRUMap extends LinkedMap implements ExpiringMap { @@ -222,8 +222,9 @@ public class LRUMap extends LinkedMap implements ExpiringMap { */ public void removeLRU() { int removeCount = (int) Math.max((size() * trimFactor), 1); + while ((removeCount--) > 0) { - removeEntry(head.mNext); + removeEntry(head.next); } } } diff --git a/common/common-lang/src/main/java/com/twelvemonkeys/util/LinkedMap.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/LinkedMap.java index b493ff9d..e9a071a0 100755 --- a/common/common-lang/src/main/java/com/twelvemonkeys/util/LinkedMap.java +++ b/common/common-lang/src/main/java/com/twelvemonkeys/util/LinkedMap.java @@ -181,19 +181,19 @@ public class LinkedMap extends AbstractDecoratedMap implements Seria return "head"; } }; - head.mPrevious = head.mNext = head; + head.previous = head.next = head; } public boolean containsValue(Object pValue) { // Overridden to take advantage of faster iterator if (pValue == null) { - for (LinkedEntry e = head.mNext; e != head; e = e.mNext) { + for (LinkedEntry e = head.next; e != head; e = e.next) { if (e.mValue == null) { return true; } } } else { - for (LinkedEntry e = head.mNext; e != head; e = e.mNext) { + for (LinkedEntry e = head.next; e != head; e = e.next) { if (pValue.equals(e.mValue)) { return true; } @@ -215,7 +215,7 @@ public class LinkedMap extends AbstractDecoratedMap implements Seria } private abstract class LinkedMapIterator implements Iterator { - LinkedEntry mNextEntry = head.mNext; + LinkedEntry mNextEntry = head.next; LinkedEntry mLastReturned = null; /** @@ -254,7 +254,7 @@ public class LinkedMap extends AbstractDecoratedMap implements Seria } LinkedEntry e = mLastReturned = mNextEntry; - mNextEntry = e.mNext; + mNextEntry = e.next; return e; } @@ -309,7 +309,7 @@ public class LinkedMap extends AbstractDecoratedMap implements Seria oldValue = null; // Remove eldest entry if instructed, else grow capacity if appropriate - LinkedEntry eldest = head.mNext; + LinkedEntry eldest = head.next; if (removeEldestEntry(eldest)) { removeEntry(eldest); } @@ -407,13 +407,13 @@ public class LinkedMap extends AbstractDecoratedMap implements Seria * Linked list implementation of {@code Map.Entry}. */ protected static class LinkedEntry extends BasicEntry implements Serializable { - LinkedEntry mPrevious; - LinkedEntry mNext; + LinkedEntry previous; + LinkedEntry next; LinkedEntry(K pKey, V pValue, LinkedEntry pNext) { super(pKey, pValue); - mNext = pNext; + next = pNext; } /** @@ -423,19 +423,19 @@ public class LinkedMap extends AbstractDecoratedMap implements Seria * @param pExisting the entry to add before */ void addBefore(LinkedEntry pExisting) { - mNext = pExisting; - mPrevious = pExisting.mPrevious; + next = pExisting; + previous = pExisting.previous; - mPrevious.mNext = this; - mNext.mPrevious = this; + previous.next = this; + next.previous = this; } /** * Removes this entry from the linked list. */ void remove() { - mPrevious.mNext = mNext; - mNext.mPrevious = mPrevious; + previous.next = next; + next.previous = previous; } /** @@ -456,7 +456,7 @@ public class LinkedMap extends AbstractDecoratedMap implements Seria /** * Removes this entry from the linked list. * - * @param pMap the map to record remoal from + * @param pMap the map to record removal from */ protected void recordRemoval(Map pMap) { // TODO: Is this REALLY correct?