You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2015/01/03 13:42:19 UTC
svn commit: r1649197 - in /commons/proper/imaging/trunk/src:
main/java/org/apache/commons/imaging/formats/tiff/
test/java/org/apache/commons/imaging/formats/jpeg/exif/
test/java/org/apache/commons/imaging/formats/png/
Author: britter
Date: Sat Jan 3 12:42:19 2015
New Revision: 1649197
URL: http://svn.apache.org/r1649197
Log:
Use HashMap instead of HashTable since HashTable is synchronized which makes it slower than HashMap
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java?rev=1649197&r1=1649196&r2=1649197&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java Sat Jan 3 12:42:19 2015
@@ -24,7 +24,7 @@ import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
-import java.util.Hashtable;
+import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -562,7 +562,7 @@ public class TiffField {
private static Map<Object, List<TagInfo>> makeTagMap(
final List<TagInfo> tags) {
// make sure to use the thread-safe version; this is shared state.
- final Map<Object, List<TagInfo>> map = new Hashtable<Object, List<TagInfo>>();
+ final Map<Object, List<TagInfo>> map = new HashMap<Object, List<TagInfo>>();
for (TagInfo tag : tags) {
List<TagInfo> tagList = map.get(tag.tag);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java?rev=1649197&r1=1649196&r2=1649197&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.java Sat Jan 3 12:42:19 2015
@@ -20,7 +20,7 @@ import java.awt.image.BufferedImage;
import java.io.IOException;
import java.nio.ByteOrder;
import java.util.ArrayList;
-import java.util.Hashtable;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -60,7 +60,7 @@ public class TiffImageMetadata extends G
}
private static Map<Object, Integer> countTags(final List<TagInfo> tags) {
- final Map<Object, Integer> map = new Hashtable<Object, Integer>();
+ final Map<Object, Integer> map = new HashMap<Object, Integer>();
for (TagInfo tag : tags) {
final Integer count = map.get(tag.tag);
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java?rev=1649197&r1=1649196&r2=1649197&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java Sat Jan 3 12:42:19 2015
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertTru
import java.io.File;
import java.util.HashMap;
-import java.util.Hashtable;
import java.util.List;
import java.util.Map;
@@ -51,7 +50,7 @@ public class AsciiFieldTest extends Exif
// note that exif might be null if no Exif metadata is found.
final TiffImageMetadata exif = jpegMetadata.getExif();
final List<TiffField> fields = exif.getAllFields();
- final Map<Integer,TiffField> fieldMap = new Hashtable<Integer,TiffField>();
+ final Map<Integer,TiffField> fieldMap = new HashMap<Integer, TiffField>();
// Build a simplified field tag -> field map, ignoring directory
// structures.
// Good enough for our purposes, since the image in question is known.
@@ -59,7 +58,7 @@ public class AsciiFieldTest extends Exif
fieldMap.put(field.getTag(), field);
}
- final Map<Integer,Object> expectedFieldValues = new Hashtable<Integer,Object>();
+ final Map<Integer,Object> expectedFieldValues = new HashMap<Integer, Object>();
expectedFieldValues.put(
TiffTagConstants.TIFF_TAG_MAKE.tag, "Canon");
expectedFieldValues.put(
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java?rev=1649197&r1=1649196&r2=1649197&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java Sat Jan 3 12:42:19 2015
@@ -30,7 +30,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Hashtable;
import java.util.List;
import java.util.Map;
import java.util.Set;
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java?rev=1649197&r1=1649196&r2=1649197&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java Sat Jan 3 12:42:19 2015
@@ -21,8 +21,9 @@ import static org.junit.Assert.assertNot
import java.awt.image.BufferedImage;
import java.io.File;
-import java.util.Hashtable;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.Imaging;
@@ -45,7 +46,7 @@ public class ConvertPngToGifTest extends
// Debug.debug();
}
- final Hashtable<String, Object> params = new Hashtable<String, Object>();
+ final Map<String, Object> params = new HashMap<String, Object>();
// params.put(ImagingConstants.PARAM_KEY_VERBOSE, Boolean.TRUE);
final BufferedImage image = Imaging.getBufferedImage(imageFile, params);