incubator-sanselan-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmc...@apache.org
Subject svn commit: r609506 [3/3] - in /incubator/sanselan/trunk/src: main/java/org/apache/sanselan/ main/java/org/apache/sanselan/color/ main/java/org/apache/sanselan/common/ main/java/org/apache/sanselan/common/byteSources/ main/java/org/apache/sanselan/comm...
Date Mon, 07 Jan 2008 03:45:24 GMT
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/GPSTagConstants.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/GPSTagConstants.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/GPSTagConstants.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/GPSTagConstants.java Sun Jan  6 19:45:20 2008
@@ -21,76 +21,75 @@
 			TiffDirectoryConstants,
 			TiffFieldTypeConstants
 {
-	public static final TagInfo2 GPS_TAG_GPS_VERSION_ID = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_VERSION_ID = new TagInfo(
 			"GPS Version ID", 0x0000, FIELD_TYPE_DESCRIPTION_BYTE, 4,
 			EXIF_DIRECTORY_GPS);
 
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_LATITUDE_REF = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_LATITUDE_REF = new TagInfo(
 			"GPS Latitude Ref", 0x0001, FIELD_TYPE_DESCRIPTION_ASCII, 2,
 			EXIF_DIRECTORY_GPS);
 
 	public static final String GPS_TAG_GPS_LATITUDE_REF_VALUE_NORTH = "N";
 	public static final String GPS_TAG_GPS_LATITUDE_REF_VALUE_SOUTH = "S";
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_LATITUDE = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_LATITUDE = new TagInfo(
 			"GPS Latitude", 0x0002, FIELD_TYPE_DESCRIPTION_RATIONAL, 3,
 			EXIF_DIRECTORY_GPS);
 
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_LONGITUDE_REF = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_LONGITUDE_REF = new TagInfo(
 			"GPS Longitude Ref", 0x0003, FIELD_TYPE_DESCRIPTION_ASCII, 2,
 			EXIF_DIRECTORY_GPS);
 
 	public static final String GPS_TAG_GPS_LONGITUDE_REF_VALUE_EAST = "E";
 	public static final String GPS_TAG_GPS_LONGITUDE_REF_VALUE_WEST = "W";
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_LONGITUDE = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_LONGITUDE = new TagInfo(
 			"GPS Longitude", 0x0004, FIELD_TYPE_DESCRIPTION_RATIONAL, 3,
 			EXIF_DIRECTORY_GPS);
 
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_ALTITUDE_REF = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_ALTITUDE_REF = new TagInfo(
 			"GPS Altitude Ref", 0x0005, FIELD_TYPE_DESCRIPTION_BYTE, -1,
 			EXIF_DIRECTORY_GPS);
 
 	public static final int GPS_TAG_GPS_ALTITUDE_REF_VALUE_ABOVE_SEA_LEVEL = 0;
 	public static final int GPS_TAG_GPS_ALTITUDE_REF_VALUE_BELOW_SEA_LEVEL = 1;
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_ALTITUDE = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_ALTITUDE = new TagInfo(
 			"GPS Altitude", 0x0006, FIELD_TYPE_DESCRIPTION_RATIONAL, -1,
 			EXIF_DIRECTORY_GPS);
 
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_TIME_STAMP = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_TIME_STAMP = new TagInfo(
 			"GPS Time Stamp", 0x0007, FIELD_TYPE_DESCRIPTION_RATIONAL, 3,
 			EXIF_DIRECTORY_GPS);
 
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_SATELLITES = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_SATELLITES = new TagInfo(
 			"GPS Satellites", 0x0008, FIELD_TYPE_DESCRIPTION_ASCII, -1,
 			EXIF_DIRECTORY_GPS);
 
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_STATUS = new TagInfo2(
-			"GPS Status", 0x0009, FIELD_TYPE_DESCRIPTION_ASCII, 2,
-			EXIF_DIRECTORY_GPS);
+	public static final TagInfo GPS_TAG_GPS_STATUS = new TagInfo("GPS Status",
+			0x0009, FIELD_TYPE_DESCRIPTION_ASCII, 2, EXIF_DIRECTORY_GPS);
 
 	public static final String GPS_TAG_GPS_STATUS_VALUE_MEASUREMENT_IN_PROGRESS = "A";
 	public static final String GPS_TAG_GPS_STATUS_VALUE_MEASUREMENT_INTEROPERABILITY = "V";
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_MEASURE_MODE = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_MEASURE_MODE = new TagInfo(
 			"GPS Measure Mode", 0x000a, FIELD_TYPE_DESCRIPTION_ASCII, 2,
 			EXIF_DIRECTORY_GPS);
 
 	public static final int GPS_TAG_GPS_MEASURE_MODE_VALUE_2_DIMENSIONAL_MEASUREMENT = 2;
 	public static final int GPS_TAG_GPS_MEASURE_MODE_VALUE_3_DIMENSIONAL_MEASUREMENT = 3;
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_DOP = new TagInfo2("GPS DOP",
+	public static final TagInfo GPS_TAG_GPS_DOP = new TagInfo("GPS DOP",
 			0x000b, FIELD_TYPE_DESCRIPTION_RATIONAL, -1, EXIF_DIRECTORY_GPS);
 
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_SPEED_REF = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_SPEED_REF = new TagInfo(
 			"GPS Speed Ref", 0x000c, FIELD_TYPE_DESCRIPTION_ASCII, 2,
 			EXIF_DIRECTORY_GPS);
 
@@ -98,75 +97,75 @@
 	public static final String GPS_TAG_GPS_SPEED_REF_VALUE_MPH = "M";
 	public static final String GPS_TAG_GPS_SPEED_REF_VALUE_KNOTS = "N";
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_SPEED = new TagInfo2("GPS Speed",
+	public static final TagInfo GPS_TAG_GPS_SPEED = new TagInfo("GPS Speed",
 			0x000d, FIELD_TYPE_DESCRIPTION_RATIONAL, -1, EXIF_DIRECTORY_GPS);
 
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_TRACK_REF = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_TRACK_REF = new TagInfo(
 			"GPS Track Ref", 0x000e, FIELD_TYPE_DESCRIPTION_ASCII, 2,
 			EXIF_DIRECTORY_GPS);
 
 	public static final String GPS_TAG_GPS_TRACK_REF_VALUE_MAGNETIC_NORTH = "M";
 	public static final String GPS_TAG_GPS_TRACK_REF_VALUE_TRUE_NORTH = "T";
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_TRACK = new TagInfo2("GPS Track",
+	public static final TagInfo GPS_TAG_GPS_TRACK = new TagInfo("GPS Track",
 			0x000f, FIELD_TYPE_DESCRIPTION_RATIONAL, -1, EXIF_DIRECTORY_GPS);
 
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_IMG_DIRECTION_REF = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_IMG_DIRECTION_REF = new TagInfo(
 			"GPS Img Direction Ref", 0x0010, FIELD_TYPE_DESCRIPTION_ASCII, 2,
 			EXIF_DIRECTORY_GPS);
 
 	public static final String GPS_TAG_GPS_IMG_DIRECTION_REF_VALUE_MAGNETIC_NORTH = "M";
 	public static final String GPS_TAG_GPS_IMG_DIRECTION_REF_VALUE_TRUE_NORTH = "T";
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_IMG_DIRECTION = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_IMG_DIRECTION = new TagInfo(
 			"GPS Img Direction", 0x0011, FIELD_TYPE_DESCRIPTION_RATIONAL, -1,
 			EXIF_DIRECTORY_GPS);
 
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_MAP_DATUM = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_MAP_DATUM = new TagInfo(
 			"GPS Map Datum", 0x0012, FIELD_TYPE_DESCRIPTION_ASCII, -1,
 			EXIF_DIRECTORY_GPS);
 
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_DEST_LATITUDE_REF = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_DEST_LATITUDE_REF = new TagInfo(
 			"GPS Dest Latitude Ref", 0x0013, FIELD_TYPE_DESCRIPTION_ASCII, 2,
 			EXIF_DIRECTORY_GPS);
 
 	public static final String GPS_TAG_GPS_DEST_LATITUDE_REF_VALUE_NORTH = "N";
 	public static final String GPS_TAG_GPS_DEST_LATITUDE_REF_VALUE_SOUTH = "S";
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_DEST_LATITUDE = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_DEST_LATITUDE = new TagInfo(
 			"GPS Dest Latitude", 0x0014, FIELD_TYPE_DESCRIPTION_RATIONAL, 3,
 			EXIF_DIRECTORY_GPS);
 
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_DEST_LONGITUDE_REF = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_DEST_LONGITUDE_REF = new TagInfo(
 			"GPS Dest Longitude Ref", 0x0015, FIELD_TYPE_DESCRIPTION_ASCII, 2,
 			EXIF_DIRECTORY_GPS);
 
 	public static final String GPS_TAG_GPS_DEST_LONGITUDE_REF_VALUE_EAST = "E";
 	public static final String GPS_TAG_GPS_DEST_LONGITUDE_REF_VALUE_WEST = "W";
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_DEST_LONGITUDE = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_DEST_LONGITUDE = new TagInfo(
 			"GPS Dest Longitude", 0x0016, FIELD_TYPE_DESCRIPTION_RATIONAL, 3,
 			EXIF_DIRECTORY_GPS);
 
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_DEST_BEARING_REF = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_DEST_BEARING_REF = new TagInfo(
 			"GPS Dest Bearing Ref", 0x0017, FIELD_TYPE_DESCRIPTION_ASCII, 2,
 			EXIF_DIRECTORY_GPS);
 
 	public static final String GPS_TAG_GPS_DEST_BEARING_REF_VALUE_MAGNETIC_NORTH = "M";
 	public static final String GPS_TAG_GPS_DEST_BEARING_REF_VALUE_TRUE_NORTH = "T";
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_DEST_BEARING = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_DEST_BEARING = new TagInfo(
 			"GPS Dest Bearing", 0x0018, FIELD_TYPE_DESCRIPTION_RATIONAL, -1,
 			EXIF_DIRECTORY_GPS);
 
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_DEST_DISTANCE_REF = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_DEST_DISTANCE_REF = new TagInfo(
 			"GPS Dest Distance Ref", 0x0019, FIELD_TYPE_DESCRIPTION_ASCII, 2,
 			EXIF_DIRECTORY_GPS);
 
@@ -174,27 +173,27 @@
 	public static final String GPS_TAG_GPS_DEST_DISTANCE_REF_VALUE_MILES = "M";
 	public static final String GPS_TAG_GPS_DEST_DISTANCE_REF_VALUE_NAUTICAL_MILES = "N";
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_DEST_DISTANCE = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_DEST_DISTANCE = new TagInfo(
 			"GPS Dest Distance", 0x001a, FIELD_TYPE_DESCRIPTION_RATIONAL, -1,
 			EXIF_DIRECTORY_GPS);
 
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_PROCESSING_METHOD = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_PROCESSING_METHOD = new TagInfo(
 			"GPS Processing Method", 0x001b, FIELD_TYPE_DESCRIPTION_UNKNOWN,
 			-1, EXIF_DIRECTORY_GPS);
 
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_AREA_INFORMATION = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_AREA_INFORMATION = new TagInfo(
 			"GPS Area Information", 0x001c, FIELD_TYPE_DESCRIPTION_UNKNOWN, -1,
 			EXIF_DIRECTORY_GPS);
 
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_DATE_STAMP = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_DATE_STAMP = new TagInfo(
 			"GPS Date Stamp", 0x001d, FIELD_TYPE_DESCRIPTION_ASCII, 11,
 			EXIF_DIRECTORY_GPS);
 
 	// ************************************************************
-	public static final TagInfo2 GPS_TAG_GPS_DIFFERENTIAL = new TagInfo2(
+	public static final TagInfo GPS_TAG_GPS_DIFFERENTIAL = new TagInfo(
 			"GPS Differential", 0x001e, FIELD_TYPE_DESCRIPTION_SHORT, -1,
 			EXIF_DIRECTORY_GPS);
 
@@ -202,7 +201,7 @@
 	public static final int GPS_TAG_GPS_DIFFERENTIAL_VALUE_DIFFERENTIAL_CORRECTED = 1;
 	// ************************************************************
 
-	public static final TagInfo2 ALL_GPS_TAGS[] = {
+	public static final TagInfo ALL_GPS_TAGS[] = {
 			GPS_TAG_GPS_VERSION_ID, GPS_TAG_GPS_LATITUDE_REF,
 			GPS_TAG_GPS_LATITUDE, GPS_TAG_GPS_LONGITUDE_REF,
 			GPS_TAG_GPS_LONGITUDE, GPS_TAG_GPS_ALTITUDE_REF,

Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/TagConstantsUtils.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/TagConstantsUtils.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/TagConstantsUtils.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/TagConstantsUtils.java Sun Jan  6 19:45:20 2008
@@ -19,13 +19,13 @@
 public class TagConstantsUtils
 {
 
-	public static TagInfo2[] mergeTagLists(TagInfo2 lists[][])
+	public static TagInfo[] mergeTagLists(TagInfo lists[][])
 	{
 		int count = 0;
 		for (int i = 0; i < lists.length; i++)
 			count += lists[i].length;
 
-		TagInfo2 result[] = new TagInfo2[count];
+		TagInfo result[] = new TagInfo[count];
 
 		int index = 0;
 		for (int i = 0; i < lists.length; i++)

Added: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/TagInfo.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/TagInfo.java?rev=609506&view=auto
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/TagInfo.java (added)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/TagInfo.java Sun Jan  6 19:45:20 2008
@@ -0,0 +1,172 @@
+/**
+ * 
+ */
+package org.apache.sanselan.formats.tiff.constants;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+
+import org.apache.sanselan.formats.tiff.TiffField;
+import org.apache.sanselan.formats.tiff.fieldtypes.FieldType;
+import org.apache.sanselan.util.Debug;
+
+public class TagInfo implements TiffDirectoryConstants
+{
+	protected static final int LENGTH_UNKNOWN = -1;
+
+	public TagInfo(String name, int tag, FieldType dataType, int length,
+			ExifDirectoryType exifDirectory)
+	{
+		this(name, tag, new FieldType[]{
+			dataType
+		}, length, exifDirectory);
+	}
+
+	public TagInfo(String name, int tag, FieldType dataType, int length)
+	{
+		this(name, tag, new FieldType[]{
+			dataType
+		}, length, EXIF_DIRECTORY_UNKNOWN);
+	}
+
+	public TagInfo(String name, int tag, FieldType dataType,
+			String lengthDescription)
+	{
+		this(name, tag, new FieldType[]{
+			dataType
+		}, LENGTH_UNKNOWN, EXIF_DIRECTORY_UNKNOWN);
+	}
+
+	public TagInfo(String name, int tag, FieldType dataTypes[],
+			String lengthDescription)
+	{
+		this(name, tag, dataTypes, LENGTH_UNKNOWN, EXIF_DIRECTORY_UNKNOWN);
+	}
+
+	public TagInfo(String name, int tag, FieldType dataType)
+	{
+		this(name, tag, dataType, LENGTH_UNKNOWN, EXIF_DIRECTORY_UNKNOWN);
+	}
+
+	public TagInfo(String name, int tag, FieldType dataTypes[], int length,
+			String lengthDescription)
+	{
+		this(name, tag, dataTypes, length, EXIF_DIRECTORY_UNKNOWN);
+	}
+	public final String name;
+	public final int tag;
+	public final FieldType dataTypes[];
+	public final int length;
+	public final ExifDirectoryType exifDirectory;
+
+	//	public final String lengthDescription;
+
+	public TagInfo(String name, int tag, FieldType dataTypes[], int length,
+			ExifDirectoryType exifDirectory
+	//			, String lengthDescription
+	)
+	{
+		this.name = name;
+		this.tag = tag;
+		this.dataTypes = dataTypes;
+		this.length = length;
+		//		this.lengthDescription = lengthDescription;
+		this.exifDirectory = exifDirectory;
+	}
+
+	public Object getValue(TiffField entry)
+	{
+		Object o = entry.fieldType.getSimpleValue(entry);
+		return o;
+	}
+
+	public String toString()
+	{
+		return "[TagInfo. tag: " + tag + " (0x" + Integer.toHexString(tag)
+				+ ", name: " + name + "]";
+	}
+
+	public boolean isDate()
+	{
+		return false;
+	}
+
+	public boolean isOffset()
+	{
+		return false;
+	}
+
+	public static class Offset extends TagInfo
+	{
+		public Offset(String name, int tag, FieldType dataTypes[], int length,
+				ExifDirectoryType exifDirectory)
+		{
+			super(name, tag, dataTypes, length, exifDirectory);
+		}
+
+		public Offset(String name, int tag, FieldType dataType, int length)
+		{
+			super(name, tag, dataType, length);
+		}
+
+		//		"Exif Offset", 0x8769, FIELD_TYPE_DESCRIPTION_UNKNOWN, 1,
+		//		EXIF_DIRECTORY_UNKNOWN);
+		public boolean isOffset()
+		{
+			return true;
+		}
+	}
+
+	public static class Date extends TagInfo
+	{
+		public Date(String name, int tag, FieldType dataType, int length)
+		{
+			super(name, tag, dataType, length);
+		}
+
+		private static final DateFormat DATE_FORMAT_1 = new SimpleDateFormat(
+				"yyyy:MM:dd HH:mm:ss");
+		private static final DateFormat DATE_FORMAT_2 = new SimpleDateFormat(
+				"yyyy:MM:dd:HH:mm:ss");
+
+		public Object getValue(TiffField entry)
+		{
+			Object o = entry.fieldType.getSimpleValue(entry);
+
+			String s = (String) o;
+			try
+			{
+				java.util.Date date = DATE_FORMAT_1.parse(s);
+				return date;
+			}
+			catch (Exception e)
+			{
+				//		Debug.debug(e);
+			}
+			try
+			{
+				java.util.Date date = DATE_FORMAT_2.parse(s);
+				return date;
+			}
+			catch (Exception e)
+			{
+				Debug.debug(e);
+			}
+
+			return o;
+		}
+
+		public String toString()
+		{
+			return "[TagInfo. tag: " + tag + ", name: " + name + " (data)"
+					+ "]";
+		}
+
+		// TODO: use polymorphism
+		public boolean isDate()
+		{
+			return true;
+		}
+
+	}
+}
\ No newline at end of file

Propchange: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/TagInfo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/TiffTagConstants.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/TiffTagConstants.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/TiffTagConstants.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/TiffTagConstants.java Sun Jan  6 19:45:20 2008
@@ -22,295 +22,290 @@
 			TiffFieldTypeConstants
 {
 
-	public static final TagInfo2 TIFF_TAG_NEW_SUBFILE_TYPE = new TagInfo2(
+	public static final TagInfo TIFF_TAG_NEW_SUBFILE_TYPE = new TagInfo(
 			"New Subfile Type", 0xFE, FIELD_TYPE_DESCRIPTION_LONG, 1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_SUBFILE_TYPE = new TagInfo2(
+	public static final TagInfo TIFF_TAG_SUBFILE_TYPE = new TagInfo(
 			"Subfile Type", 0xFF, FIELD_TYPE_DESCRIPTION_SHORT, 1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_IMAGE_WIDTH = new TagInfo2(
+	public static final TagInfo TIFF_TAG_IMAGE_WIDTH = new TagInfo(
 			"Image Width", 0x100, FIELD_TYPE_DESCRIPTION_SHORT_OR_LONG, 1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_IMAGE_LENGTH = new TagInfo2(
+	public static final TagInfo TIFF_TAG_IMAGE_LENGTH = new TagInfo(
 			"Image Length", 0x101, FIELD_TYPE_DESCRIPTION_SHORT_OR_LONG, 1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_BITS_PER_SAMPLE = new TagInfo2(
+	public static final TagInfo TIFF_TAG_BITS_PER_SAMPLE = new TagInfo(
 			"Bits Per Sample", 0x102, FIELD_TYPE_DESCRIPTION_SHORT, -1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_COMPRESSION = new TagInfo2(
+	public static final TagInfo TIFF_TAG_COMPRESSION = new TagInfo(
 			"Compression", 0x103, FIELD_TYPE_DESCRIPTION_SHORT, 1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_PHOTOMETRIC_INTERPRETATION = new TagInfo2(
+	public static final TagInfo TIFF_TAG_PHOTOMETRIC_INTERPRETATION = new TagInfo(
 			"Photometric Interpretation", 0x106, FIELD_TYPE_DESCRIPTION_SHORT,
 			1, TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_THRESHHOLDING = new TagInfo2(
+	public static final TagInfo TIFF_TAG_THRESHHOLDING = new TagInfo(
 			"Threshholding", 0x107, FIELD_TYPE_DESCRIPTION_SHORT, 1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_CELL_WIDTH = new TagInfo2(
-			"Cell Width", 0x108, FIELD_TYPE_DESCRIPTION_SHORT, 1,
-			TIFF_DIRECTORY_ROOT);
+	public static final TagInfo TIFF_TAG_CELL_WIDTH = new TagInfo("Cell Width",
+			0x108, FIELD_TYPE_DESCRIPTION_SHORT, 1, TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_CELL_LENGTH = new TagInfo2(
+	public static final TagInfo TIFF_TAG_CELL_LENGTH = new TagInfo(
 			"Cell Length", 0x109, FIELD_TYPE_DESCRIPTION_SHORT, 1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_FILL_ORDER = new TagInfo2(
-			"Fill Order", 0x10A, FIELD_TYPE_DESCRIPTION_SHORT, 1,
-			TIFF_DIRECTORY_ROOT);
+	public static final TagInfo TIFF_TAG_FILL_ORDER = new TagInfo("Fill Order",
+			0x10A, FIELD_TYPE_DESCRIPTION_SHORT, 1, TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_DOCUMENT_NAME = new TagInfo2(
+	public static final TagInfo TIFF_TAG_DOCUMENT_NAME = new TagInfo(
 			"Document Name", 0x10D, FIELD_TYPE_DESCRIPTION_ASCII, -1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_IMAGE_DESCRIPTION = new TagInfo2(
+	public static final TagInfo TIFF_TAG_IMAGE_DESCRIPTION = new TagInfo(
 			"Image Description", 0x10E, FIELD_TYPE_DESCRIPTION_ASCII, -1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_MAKE = new TagInfo2("Make", 0x10F,
+	public static final TagInfo TIFF_TAG_MAKE = new TagInfo("Make", 0x10F,
 			FIELD_TYPE_DESCRIPTION_ASCII, -1, TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_MODEL = new TagInfo2("Model", 0x110,
+	public static final TagInfo TIFF_TAG_MODEL = new TagInfo("Model", 0x110,
 			FIELD_TYPE_DESCRIPTION_ASCII, -1, TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_STRIP_OFFSETS = new TagInfo2(
+	public static final TagInfo TIFF_TAG_STRIP_OFFSETS = new TagInfo(
 			"Strip Offsets", 0x111, FIELD_TYPE_DESCRIPTION_SHORT_OR_LONG, -1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_ORIENTATION = new TagInfo2(
+	public static final TagInfo TIFF_TAG_ORIENTATION = new TagInfo(
 			"Orientation", 0x112, FIELD_TYPE_DESCRIPTION_SHORT, 1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_SAMPLES_PER_PIXEL = new TagInfo2(
+	public static final TagInfo TIFF_TAG_SAMPLES_PER_PIXEL = new TagInfo(
 			"Samples Per Pixel", 0x115, FIELD_TYPE_DESCRIPTION_SHORT, 1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_ROWS_PER_STRIP = new TagInfo2(
+	public static final TagInfo TIFF_TAG_ROWS_PER_STRIP = new TagInfo(
 			"Rows Per Strip", 0x116, FIELD_TYPE_DESCRIPTION_SHORT_OR_LONG, 1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_STRIP_BYTE_COUNTS = new TagInfo2(
+	public static final TagInfo TIFF_TAG_STRIP_BYTE_COUNTS = new TagInfo(
 			"Strip Byte Counts", 0x117, FIELD_TYPE_DESCRIPTION_LONG_OR_SHORT,
 			-1, TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_MIN_SAMPLE_VALUE = new TagInfo2(
+	public static final TagInfo TIFF_TAG_MIN_SAMPLE_VALUE = new TagInfo(
 			"Min Sample Value", 0x118, FIELD_TYPE_DESCRIPTION_SHORT, -1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_MAX_SAMPLE_VALUE = new TagInfo2(
+	public static final TagInfo TIFF_TAG_MAX_SAMPLE_VALUE = new TagInfo(
 			"Max Sample Value", 0x119, FIELD_TYPE_DESCRIPTION_SHORT, -1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_XRESOLUTION = new TagInfo2(
+	public static final TagInfo TIFF_TAG_XRESOLUTION = new TagInfo(
 			"XResolution", 0x11A, FIELD_TYPE_DESCRIPTION_RATIONAL, 1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_YRESOLUTION = new TagInfo2(
+	public static final TagInfo TIFF_TAG_YRESOLUTION = new TagInfo(
 			"YResolution", 0x11B, FIELD_TYPE_DESCRIPTION_RATIONAL, 1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_PLANAR_CONFIGURATION = new TagInfo2(
+	public static final TagInfo TIFF_TAG_PLANAR_CONFIGURATION = new TagInfo(
 			"Planar Configuration", 0x11C, FIELD_TYPE_DESCRIPTION_SHORT, 1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_PAGE_NAME = new TagInfo2("Page Name",
+	public static final TagInfo TIFF_TAG_PAGE_NAME = new TagInfo("Page Name",
 			0x11D, FIELD_TYPE_DESCRIPTION_ASCII, -1, TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_XPOSITION = new TagInfo2("XPosition",
+	public static final TagInfo TIFF_TAG_XPOSITION = new TagInfo("XPosition",
 			0x11E, FIELD_TYPE_DESCRIPTION_RATIONAL, -1, TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_YPOSITION = new TagInfo2("YPosition",
+	public static final TagInfo TIFF_TAG_YPOSITION = new TagInfo("YPosition",
 			0x11F, FIELD_TYPE_DESCRIPTION_RATIONAL, -1, TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_FREE_OFFSETS = new TagInfo2(
+	public static final TagInfo TIFF_TAG_FREE_OFFSETS = new TagInfo(
 			"Free Offsets", 0x120, FIELD_TYPE_DESCRIPTION_LONG, -1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_FREE_BYTE_COUNTS = new TagInfo2(
+	public static final TagInfo TIFF_TAG_FREE_BYTE_COUNTS = new TagInfo(
 			"Free Byte Counts", 0x121, FIELD_TYPE_DESCRIPTION_LONG, -1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_GRAY_RESPONSE_UNIT = new TagInfo2(
+	public static final TagInfo TIFF_TAG_GRAY_RESPONSE_UNIT = new TagInfo(
 			"Gray Response Unit", 0x122, FIELD_TYPE_DESCRIPTION_SHORT, 1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_GRAY_RESPONSE_CURVE = new TagInfo2(
+	public static final TagInfo TIFF_TAG_GRAY_RESPONSE_CURVE = new TagInfo(
 			"Gray Response Curve", 0x123, FIELD_TYPE_DESCRIPTION_SHORT, -1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_T4_OPTIONS = new TagInfo2(
-			"T4 Options", 0x124, FIELD_TYPE_DESCRIPTION_LONG, 1,
-			TIFF_DIRECTORY_ROOT);
+	public static final TagInfo TIFF_TAG_T4_OPTIONS = new TagInfo("T4 Options",
+			0x124, FIELD_TYPE_DESCRIPTION_LONG, 1, TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_T6_OPTIONS = new TagInfo2(
-			"T6 Options", 0x125, FIELD_TYPE_DESCRIPTION_LONG, 1,
-			TIFF_DIRECTORY_ROOT);
+	public static final TagInfo TIFF_TAG_T6_OPTIONS = new TagInfo("T6 Options",
+			0x125, FIELD_TYPE_DESCRIPTION_LONG, 1, TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_RESOLUTION_UNIT = new TagInfo2(
+	public static final TagInfo TIFF_TAG_RESOLUTION_UNIT = new TagInfo(
 			"Resolution Unit", 0x128, FIELD_TYPE_DESCRIPTION_SHORT, 1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_PAGE_NUMBER = new TagInfo2(
+	public static final TagInfo TIFF_TAG_PAGE_NUMBER = new TagInfo(
 			"Page Number", 0x129, FIELD_TYPE_DESCRIPTION_SHORT, 2,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_TRANSFER_FUNCTION = new TagInfo2(
+	public static final TagInfo TIFF_TAG_TRANSFER_FUNCTION = new TagInfo(
 			"Transfer Function", 0x12D, FIELD_TYPE_DESCRIPTION_SHORT, -1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_SOFTWARE = new TagInfo2("Software",
+	public static final TagInfo TIFF_TAG_SOFTWARE = new TagInfo("Software",
 			0x131, FIELD_TYPE_DESCRIPTION_ASCII, -1, TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_DATE_TIME = new TagInfo2("Date Time",
+	public static final TagInfo TIFF_TAG_DATE_TIME = new TagInfo("Date Time",
 			0x132, FIELD_TYPE_DESCRIPTION_ASCII, 20, TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_ARTIST = new TagInfo2("Artist",
-			0x13B, FIELD_TYPE_DESCRIPTION_ASCII, -1, TIFF_DIRECTORY_ROOT);
+	public static final TagInfo TIFF_TAG_ARTIST = new TagInfo("Artist", 0x13B,
+			FIELD_TYPE_DESCRIPTION_ASCII, -1, TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_HOST_COMPUTER = new TagInfo2(
+	public static final TagInfo TIFF_TAG_HOST_COMPUTER = new TagInfo(
 			"Host Computer", 0x13C, FIELD_TYPE_DESCRIPTION_ASCII, -1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_PREDICTOR = new TagInfo2("Predictor",
+	public static final TagInfo TIFF_TAG_PREDICTOR = new TagInfo("Predictor",
 			0x13D, FIELD_TYPE_DESCRIPTION_SHORT, 1, TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_WHITE_POINT = new TagInfo2(
+	public static final TagInfo TIFF_TAG_WHITE_POINT = new TagInfo(
 			"White Point", 0x13E, FIELD_TYPE_DESCRIPTION_RATIONAL, 2,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_PRIMARY_CHROMATICITIES = new TagInfo2(
+	public static final TagInfo TIFF_TAG_PRIMARY_CHROMATICITIES = new TagInfo(
 			"Primary Chromaticities", 0x13F, FIELD_TYPE_DESCRIPTION_RATIONAL,
 			6, TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_COLOR_MAP = new TagInfo2("Color Map",
+	public static final TagInfo TIFF_TAG_COLOR_MAP = new TagInfo("Color Map",
 			0x140, FIELD_TYPE_DESCRIPTION_SHORT, -1, TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_HALFTONE_HINTS = new TagInfo2(
+	public static final TagInfo TIFF_TAG_HALFTONE_HINTS = new TagInfo(
 			"Halftone Hints", 0x141, FIELD_TYPE_DESCRIPTION_SHORT, 2,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_TILE_WIDTH = new TagInfo2(
-			"Tile Width", 0x142, FIELD_TYPE_DESCRIPTION_SHORT_OR_LONG, 1,
-			TIFF_DIRECTORY_ROOT);
+	public static final TagInfo TIFF_TAG_TILE_WIDTH = new TagInfo("Tile Width",
+			0x142, FIELD_TYPE_DESCRIPTION_SHORT_OR_LONG, 1, TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_TILE_LENGTH = new TagInfo2(
+	public static final TagInfo TIFF_TAG_TILE_LENGTH = new TagInfo(
 			"Tile Length", 0x143, FIELD_TYPE_DESCRIPTION_SHORT_OR_LONG, 1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_TILE_OFFSETS = new TagInfo2(
+	public static final TagInfo TIFF_TAG_TILE_OFFSETS = new TagInfo(
 			"Tile Offsets", 0x144, FIELD_TYPE_DESCRIPTION_LONG, -1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_TILE_BYTE_COUNTS = new TagInfo2(
+	public static final TagInfo TIFF_TAG_TILE_BYTE_COUNTS = new TagInfo(
 			"Tile Byte Counts", 0x145, FIELD_TYPE_DESCRIPTION_SHORT_OR_LONG,
 			-1, TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_INK_SET = new TagInfo2("Ink Set",
+	public static final TagInfo TIFF_TAG_INK_SET = new TagInfo("Ink Set",
 			0x14C, FIELD_TYPE_DESCRIPTION_SHORT, 1, TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_INK_NAMES = new TagInfo2("Ink Names",
+	public static final TagInfo TIFF_TAG_INK_NAMES = new TagInfo("Ink Names",
 			0x14D, FIELD_TYPE_DESCRIPTION_ASCII, -1, TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_NUMBER_OF_INKS = new TagInfo2(
+	public static final TagInfo TIFF_TAG_NUMBER_OF_INKS = new TagInfo(
 			"Number Of Inks", 0x14E, FIELD_TYPE_DESCRIPTION_SHORT, 1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_DOT_RANGE = new TagInfo2("Dot Range",
+	public static final TagInfo TIFF_TAG_DOT_RANGE = new TagInfo("Dot Range",
 			0x150, FIELD_TYPE_DESCRIPTION_BYTE_OR_SHORT, -1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_TARGET_PRINTER = new TagInfo2(
+	public static final TagInfo TIFF_TAG_TARGET_PRINTER = new TagInfo(
 			"Target Printer", 0x151, FIELD_TYPE_DESCRIPTION_ASCII, -1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_EXTRA_SAMPLES = new TagInfo2(
+	public static final TagInfo TIFF_TAG_EXTRA_SAMPLES = new TagInfo(
 			"Extra Samples", 0x152, FIELD_TYPE_DESCRIPTION_BYTE, -1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_SAMPLE_FORMAT = new TagInfo2(
+	public static final TagInfo TIFF_TAG_SAMPLE_FORMAT = new TagInfo(
 			"Sample Format", 0x153, FIELD_TYPE_DESCRIPTION_SHORT, -1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_SMIN_SAMPLE_VALUE = new TagInfo2(
+	public static final TagInfo TIFF_TAG_SMIN_SAMPLE_VALUE = new TagInfo(
 			"SMin Sample Value", 0x154, FIELD_TYPE_DESCRIPTION_ANY, -1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_SMAX_SAMPLE_VALUE = new TagInfo2(
+	public static final TagInfo TIFF_TAG_SMAX_SAMPLE_VALUE = new TagInfo(
 			"SMax Sample Value", 0x155, FIELD_TYPE_DESCRIPTION_ANY, -1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_TRANSFER_RANGE = new TagInfo2(
+	public static final TagInfo TIFF_TAG_TRANSFER_RANGE = new TagInfo(
 			"Transfer Range", 0x156, FIELD_TYPE_DESCRIPTION_SHORT, 6,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_JPEG_PROC = new TagInfo2("JPEGProc",
+	public static final TagInfo TIFF_TAG_JPEG_PROC = new TagInfo("JPEGProc",
 			0x200, FIELD_TYPE_DESCRIPTION_SHORT, 1, TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_JPEG_INTERCHANGE_FORMAT = new TagInfo2(
+	public static final TagInfo TIFF_TAG_JPEG_INTERCHANGE_FORMAT = new TagInfo(
 			"JPEGInterchange Format", 0x201, FIELD_TYPE_DESCRIPTION_LONG, 1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH = new TagInfo2(
+	public static final TagInfo TIFF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH = new TagInfo(
 			"JPEGInterchange Format Length", 0x202,
 			FIELD_TYPE_DESCRIPTION_LONG, 1, TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_JPEG_RESTART_INTERVAL = new TagInfo2(
+	public static final TagInfo TIFF_TAG_JPEG_RESTART_INTERVAL = new TagInfo(
 			"JPEGRestart Interval", 0x203, FIELD_TYPE_DESCRIPTION_SHORT, 1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_JPEG_LOSSLESS_PREDICTORS = new TagInfo2(
+	public static final TagInfo TIFF_TAG_JPEG_LOSSLESS_PREDICTORS = new TagInfo(
 			"JPEGLossless Predictors", 0x205, FIELD_TYPE_DESCRIPTION_SHORT, -1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_JPEG_POINT_TRANSFORMS = new TagInfo2(
+	public static final TagInfo TIFF_TAG_JPEG_POINT_TRANSFORMS = new TagInfo(
 			"JPEGPoint Transforms", 0x206, FIELD_TYPE_DESCRIPTION_SHORT, -1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_JPEG_QTABLES = new TagInfo2(
+	public static final TagInfo TIFF_TAG_JPEG_QTABLES = new TagInfo(
 			"JPEGQTables", 0x207, FIELD_TYPE_DESCRIPTION_LONG, -1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_JPEG_DCTABLES = new TagInfo2(
+	public static final TagInfo TIFF_TAG_JPEG_DCTABLES = new TagInfo(
 			"JPEGDCTables", 0x208, FIELD_TYPE_DESCRIPTION_LONG, -1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_JPEG_ACTABLES = new TagInfo2(
+	public static final TagInfo TIFF_TAG_JPEG_ACTABLES = new TagInfo(
 			"JPEGACTables", 0x209, FIELD_TYPE_DESCRIPTION_LONG, -1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_YCBCR_COEFFICIENTS = new TagInfo2(
+	public static final TagInfo TIFF_TAG_YCBCR_COEFFICIENTS = new TagInfo(
 			"YCbCr Coefficients", 0x211, FIELD_TYPE_DESCRIPTION_RATIONAL, 3,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_YCBCR_SUB_SAMPLING = new TagInfo2(
+	public static final TagInfo TIFF_TAG_YCBCR_SUB_SAMPLING = new TagInfo(
 			"YCbCr Sub Sampling", 0x212, FIELD_TYPE_DESCRIPTION_SHORT, 2,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_YCBCR_POSITIONING = new TagInfo2(
+	public static final TagInfo TIFF_TAG_YCBCR_POSITIONING = new TagInfo(
 			"YCbCr Positioning", 0x213, FIELD_TYPE_DESCRIPTION_SHORT, 1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_REFERENCE_BLACK_WHITE = new TagInfo2(
+	public static final TagInfo TIFF_TAG_REFERENCE_BLACK_WHITE = new TagInfo(
 			"Reference Black White", 0x214, FIELD_TYPE_DESCRIPTION_LONG, -1,
 			TIFF_DIRECTORY_ROOT);
 
-	public static final TagInfo2 TIFF_TAG_COPYRIGHT = new TagInfo2("Copyright",
+	public static final TagInfo TIFF_TAG_COPYRIGHT = new TagInfo("Copyright",
 			0x8298, FIELD_TYPE_DESCRIPTION_ASCII, -1, TIFF_DIRECTORY_ROOT);
 
 	// TODO:
 	//	public static final TagInfo2 TIFF_TAG_UNKNOWN = null;
-	public static final TagInfo2 TIFF_TAG_UNKNOWN = new TagInfo2("Unknown Tag",
-			-1, FIELD_TYPE_DESCRIPTION_UNKNOWN, TagInfo2.LENGTH_UNKNOWN,
+	public static final TagInfo TIFF_TAG_UNKNOWN = new TagInfo("Unknown Tag",
+			-1, FIELD_TYPE_DESCRIPTION_UNKNOWN, TagInfo.LENGTH_UNKNOWN,
 			EXIF_DIRECTORY_UNKNOWN);
 
-	public static final TagInfo2 ALL_TIFF_TAGS[] = {
+	public static final TagInfo ALL_TIFF_TAGS[] = {
 			TIFF_TAG_NEW_SUBFILE_TYPE, TIFF_TAG_SUBFILE_TYPE,
 			TIFF_TAG_IMAGE_WIDTH, TIFF_TAG_IMAGE_LENGTH,
 			TIFF_TAG_BITS_PER_SAMPLE, TIFF_TAG_COMPRESSION,

Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/datareaders/DataReaderTiled.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/datareaders/DataReaderTiled.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/datareaders/DataReaderTiled.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/datareaders/DataReaderTiled.java Sun Jan  6 19:45:20 2008
@@ -33,7 +33,7 @@
 	private final int tileOffsets[];
 	private final int tileByteCounts[];
 
-//	private final int predictor;
+	//	private final int predictor;
 	private final int bitsPerPixel;
 
 	private final int width, height;
@@ -55,7 +55,7 @@
 		this.tileLength = TileLength;
 
 		this.bitsPerPixel = fBitsPerPixel;
-//		this.predictor = Predictor;
+		//		this.predictor = Predictor;
 		this.width = width;
 		this.height = height;
 		this.compression = fCompression;

Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/fieldtypes/FieldType.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/fieldtypes/FieldType.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/fieldtypes/FieldType.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/fieldtypes/FieldType.java Sun Jan  6 19:45:20 2008
@@ -21,7 +21,9 @@
 import org.apache.sanselan.formats.tiff.TiffField;
 import org.apache.sanselan.formats.tiff.constants.TiffConstants;
 
-public abstract class FieldType extends BinaryFileFunctions implements TiffConstants
+public abstract class FieldType extends BinaryFileFunctions
+		implements
+			TiffConstants
 {
 	public final int type, length;
 	public final String name;
@@ -75,8 +77,8 @@
 
 	public String toString()
 	{
-		return "[" + getClass().getName() + ". type: " + type
-				+ ", name: " + name + ", length: " + length + "]";
+		return "[" + getClass().getName() + ". type: " + type + ", name: "
+				+ name + ", length: " + length + "]";
 	}
 
 	public abstract byte[] writeData(Object o, int byteOrder)

Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/PointerDirectoriesInfo.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/PointerDirectoriesInfo.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/PointerDirectoriesInfo.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/PointerDirectoriesInfo.java Sun Jan  6 19:45:20 2008
@@ -16,7 +16,6 @@
  */
 package org.apache.sanselan.formats.tiff.write;
 
-
 class PointerDirectoriesInfo
 {
 	public final TiffOutputField exifDirectoryOffsetField;

Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffImageWriter.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffImageWriter.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffImageWriter.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffImageWriter.java Sun Jan  6 19:45:20 2008
@@ -31,8 +31,6 @@
 import org.apache.sanselan.common.mylzw.MyLZWCompressor;
 import org.apache.sanselan.formats.tiff.RawTiffImageData;
 import org.apache.sanselan.formats.tiff.TiffDirectory;
-import org.apache.sanselan.formats.tiff.TiffField;
-import org.apache.sanselan.formats.tiff.constants.TagInfo2;
 import org.apache.sanselan.util.Debug;
 import org.apache.sanselan.util.DebugOutputStream;
 
@@ -454,7 +452,6 @@
 		TiffOutputDirectory rootDirectory = (TiffOutputDirectory) dirMap
 				.get(new Integer(DIRECTORY_TYPE_ROOT));
 
-
 		if (exifDirectory == null && exifDirectoryOffsetField != null)
 		{
 			// perhaps we should just discard field?
@@ -480,21 +477,22 @@
 					EXIF_TAG_GPSINFO, byteOrder);
 			rootDirectory.add(gpsDirectoryOffsetField);
 		}
-		
 
-		if (interoperabilityDirectory == null && interoperabilityDirectoryOffsetField != null)
+		if (interoperabilityDirectory == null
+				&& interoperabilityDirectoryOffsetField != null)
 		{
 			// perhaps we should just discard field?
 			throw new ImageWriteException(
 					"Output set has Interoperability Directory Offset field, but no Interoperability Directory");
 		}
-		else if (interoperabilityDirectory != null && interoperabilityDirectoryOffsetField == null)
+		else if (interoperabilityDirectory != null
+				&& interoperabilityDirectoryOffsetField == null)
 		{
-			interoperabilityDirectoryOffsetField = TiffOutputField.createOffsetField(
-					EXIF_TAG_INTEROP_OFFSET, byteOrder);
+			interoperabilityDirectoryOffsetField = TiffOutputField
+					.createOffsetField(EXIF_TAG_INTEROP_OFFSET, byteOrder);
 			rootDirectory.add(interoperabilityDirectoryOffsetField);
 		}
-		
+
 		return new PointerDirectoriesInfo(exifDirectoryOffsetField,
 				exifDirectory, gpsDirectoryOffsetField, gpsDirectory,
 				interoperabilityDirectoryOffsetField, interoperabilityDirectory);
@@ -506,7 +504,7 @@
 			throws IOException, ImageWriteException
 	{
 
-		PointerDirectoriesInfo pointerDirectoriesInfo = 	validateDirectories(directories);
+		PointerDirectoriesInfo pointerDirectoriesInfo = validateDirectories(directories);
 
 		//        Collections.sort(directories, Directory.COMPARATOR);
 
@@ -516,8 +514,7 @@
 		//                stripsNotTiles);
 		/**/
 
-//		PointerDirectoriesInfo pointerDirectoriesInfo = pointerDirectoriesStep(directories);
-
+		//		PointerDirectoriesInfo pointerDirectoriesInfo = pointerDirectoriesStep(directories);
 		/**/
 
 		//        final int imageDataOffset = 
@@ -546,8 +543,6 @@
 		//        writeImageDataStep(bos, directories, imageDataInfo);
 		/**/
 	}
-
-
 
 	private void calculateLengthsAndOffsetsStep(List directories)
 			throws IOException, ImageWriteException

Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffImageWriterBase.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffImageWriterBase.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffImageWriterBase.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffImageWriterBase.java Sun Jan  6 19:45:20 2008
@@ -16,25 +16,13 @@
  */
 package org.apache.sanselan.formats.tiff.write;
 
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.ArrayList;
-
-import org.apache.sanselan.ImageWriteException;
 import org.apache.sanselan.common.BinaryConstants;
-import org.apache.sanselan.common.BinaryOutputStream;
-import org.apache.sanselan.common.PackBits;
-import org.apache.sanselan.common.mylzw.MyLZWCompressor;
-import org.apache.sanselan.formats.tiff.RawTiffImageData;
-import org.apache.sanselan.formats.tiff.TiffDirectory;
 import org.apache.sanselan.formats.tiff.constants.TiffConstants;
-import org.apache.sanselan.util.Debug;
-import org.apache.sanselan.util.DebugOutputStream;
 
-public abstract class TiffImageWriterBase implements TiffConstants, BinaryConstants
+public abstract class TiffImageWriterBase
+		implements
+			TiffConstants,
+			BinaryConstants
 {
 	public static final int DEFAULT_WRITE_BYTE_ORDER = BYTE_ORDER_INTEL;
 
@@ -49,6 +37,5 @@
 	{
 		this.byteOrder = byteOrder;
 	}
-
 
 }

Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffOutputDirectory.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffOutputDirectory.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffOutputDirectory.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffOutputDirectory.java Sun Jan  6 19:45:20 2008
@@ -25,8 +25,8 @@
 import org.apache.sanselan.common.BinaryOutputStream;
 import org.apache.sanselan.formats.tiff.RawTiffImageData;
 import org.apache.sanselan.formats.tiff.TiffDirectory;
-import org.apache.sanselan.formats.tiff.constants.TagInfo2;
 import org.apache.sanselan.formats.tiff.constants.AllTagConstants;
+import org.apache.sanselan.formats.tiff.constants.TagInfo;
 
 public final class TiffOutputDirectory implements AllTagConstants
 {
@@ -54,7 +54,7 @@
 		return new ArrayList(fields);
 	}
 
-	public TiffOutputField findField(TagInfo2 tagInfo)
+	public TiffOutputField findField(TagInfo tagInfo)
 	{
 		for (int i = 0; i < fields.size(); i++)
 		{
@@ -225,7 +225,7 @@
 
 		// Append imageData-related fields to first directory
 		{
-			TagInfo2 tagInfo;
+			TagInfo tagInfo;
 			if (stripsNotTiles)
 				tagInfo = TiffImageWriter.TIFF_TAG_STRIP_OFFSETS;
 			else
@@ -243,7 +243,7 @@
 			}
 		}
 		{
-			TagInfo2 tagInfo;
+			TagInfo tagInfo;
 			if (stripsNotTiles)
 				tagInfo = TiffImageWriter.TIFF_TAG_STRIP_BYTE_COUNTS;
 			else
@@ -279,7 +279,7 @@
 
 		// Append imageData-related fields to first directory
 		{
-			TagInfo2 tagInfo = TiffImageWriter.TIFF_TAG_JPEG_INTERCHANGE_FORMAT;
+			TagInfo tagInfo = TiffImageWriter.TIFF_TAG_JPEG_INTERCHANGE_FORMAT;
 
 			jpegImageDataOffsetField = findField(tagInfo);
 			if (null == jpegImageDataOffsetField)
@@ -293,7 +293,7 @@
 			}
 		}
 		{
-			TagInfo2 tagInfo = TiffImageWriter.TIFF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH;
+			TagInfo tagInfo = TiffImageWriter.TIFF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH;
 
 			byte data[] = TiffImageWriter.FIELD_TYPE_LONG.writeData(new int[]{
 				rawJpegImageData.length,

Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffOutputField.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffOutputField.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffOutputField.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffOutputField.java Sun Jan  6 19:45:20 2008
@@ -20,26 +20,26 @@
 
 import org.apache.sanselan.ImageWriteException;
 import org.apache.sanselan.common.BinaryOutputStream;
-import org.apache.sanselan.formats.tiff.constants.TagInfo2;
+import org.apache.sanselan.formats.tiff.constants.TagInfo;
 import org.apache.sanselan.formats.tiff.constants.TiffConstants;
 import org.apache.sanselan.formats.tiff.fieldtypes.FieldType;
 
 public class TiffOutputField implements TiffConstants
 {
 	public final int tag;
-	public final TagInfo2 tagInfo;
+	public final TagInfo tagInfo;
 	public final FieldType fieldType;
 	public final int count;
 
 	public byte bytes[];
 
-	public TiffOutputField(TagInfo2 tagInfo, FieldType tagtype, int count,
+	public TiffOutputField(TagInfo tagInfo, FieldType tagtype, int count,
 			byte bytes[])
 	{
 		this(tagInfo.tag, tagInfo, tagtype, count, bytes);
 	}
 
-	public TiffOutputField(final int tag, TagInfo2 tagInfo, FieldType tagtype,
+	public TiffOutputField(final int tag, TagInfo tagInfo, FieldType tagtype,
 			int count, byte bytes[])
 	{
 		this.tag = tag;
@@ -49,7 +49,7 @@
 		this.bytes = bytes;
 	}
 
-	public static final TiffOutputField createOffsetField(TagInfo2 tagInfo,
+	public static final TiffOutputField createOffsetField(TagInfo tagInfo,
 			int byteOrder)
 	{
 		return new TiffOutputField(tagInfo, FIELD_TYPE_LONG, 1, FIELD_TYPE_LONG

Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffOutputSet.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffOutputSet.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffOutputSet.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffOutputSet.java Sun Jan  6 19:45:20 2008
@@ -126,7 +126,6 @@
 	//	public static final int DIRECTORY_TYPE_DIR_3 = 3;
 	//	public static final int DIRECTORY_TYPE_DIR_4 = 4;
 
-
 	private static final String newline = System.getProperty("line.separator");
 
 	public String toString()
@@ -141,35 +140,36 @@
 
 		StringBuffer result = new StringBuffer();
 
-		
 		result.append(prefix);
 		result.append("TiffOutputSet {");
-		result.append(newline );
+		result.append(newline);
 
 		result.append(prefix);
 		result.append("byteOrder: " + byteOrder);
-		result.append(newline );
-		
-		for(int i=0;i<directories.size();i++)
+		result.append(newline);
+
+		for (int i = 0; i < directories.size(); i++)
 		{
-			TiffOutputDirectory directory = (TiffOutputDirectory)  directories.get(i);
-			result.append(prefix );
-			result.append("\t" + "directory " + i + ": " + directory.description() + " (" + directory.type + ")");
-			result.append(newline );
-			
+			TiffOutputDirectory directory = (TiffOutputDirectory) directories
+					.get(i);
+			result.append(prefix);
+			result.append("\t" + "directory " + i + ": "
+					+ directory.description() + " (" + directory.type + ")");
+			result.append(newline);
+
 			ArrayList fields = directory.getFields();
-			for(int j=0;j<fields.size();j++)
+			for (int j = 0; j < fields.size(); j++)
 			{
-				TiffOutputField field = (TiffOutputField)  fields.get(j);
-				result.append(prefix );
-				result.append("\t\t" + "field " + i + ": " + field.tagInfo );
-				result.append(newline );
+				TiffOutputField field = (TiffOutputField) fields.get(j);
+				result.append(prefix);
+				result.append("\t\t" + "field " + i + ": " + field.tagInfo);
+				result.append(newline);
 			}
 		}
 
 		result.append(prefix);
 		result.append("}");
-		result.append(newline );
+		result.append(newline);
 
 		return result.toString();
 	}

Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/icc/IccProfileParser.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/icc/IccProfileParser.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/icc/IccProfileParser.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/icc/IccProfileParser.java Sun Jan  6 19:45:20 2008
@@ -17,7 +17,6 @@
 package org.apache.sanselan.icc;
 
 import java.awt.color.ICC_Profile;
-import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;

Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/palette/MedianCutQuantizer.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/palette/MedianCutQuantizer.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/palette/MedianCutQuantizer.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/palette/MedianCutQuantizer.java Sun Jan  6 19:45:20 2008
@@ -17,11 +17,11 @@
 package org.apache.sanselan.palette;
 
 import java.awt.image.BufferedImage;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.ArrayList;
 
 import org.apache.sanselan.ImageWriteException;
 import org.apache.sanselan.util.Debug;
@@ -91,7 +91,8 @@
 		public final int max_diff;
 		public final int diff_total;
 
-		public ColorGroup(final ArrayList color_counts) throws ImageWriteException
+		public ColorGroup(final ArrayList color_counts)
+				throws ImageWriteException
 		{
 			this.color_counts = color_counts;
 
@@ -118,8 +119,8 @@
 			blue_diff = max_blue - min_blue;
 			max_diff = Math.max(ignoreAlpha ? red_diff : Math.max(alpha_diff,
 					red_diff), Math.max(green_diff, blue_diff));
-			diff_total = (ignoreAlpha ? 0 : alpha_diff) + red_diff
-					+ green_diff + blue_diff;
+			diff_total = (ignoreAlpha ? 0 : alpha_diff) + red_diff + green_diff
+					+ blue_diff;
 
 		}
 
@@ -417,10 +418,10 @@
 
 		color_groups.remove(color_group);
 		{
-			ArrayList color_counts1 = new ArrayList(color_group.color_counts.subList(
-					0, median_index + 1));
-			ArrayList color_counts2 = new ArrayList(color_group.color_counts.subList(
-					median_index + 1, color_group.color_counts.size()));
+			ArrayList color_counts1 = new ArrayList(color_group.color_counts
+					.subList(0, median_index + 1));
+			ArrayList color_counts2 = new ArrayList(color_group.color_counts
+					.subList(median_index + 1, color_group.color_counts.size()));
 
 			ColorGroup less, more;
 			{

Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/palette/PaletteFactory.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/palette/PaletteFactory.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/palette/PaletteFactory.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/palette/PaletteFactory.java Sun Jan  6 19:45:20 2008
@@ -19,10 +19,10 @@
 import java.awt.color.ColorSpace;
 import java.awt.image.BufferedImage;
 import java.awt.image.ColorModel;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.ArrayList;
 
 public class PaletteFactory
 {
@@ -94,10 +94,10 @@
 		if (debug)
 			System.out.println("mapsize: " + mapsize);
 
-//		for (int i = 0; i < colormap.length; i++)
-//		{
-//			int rgb = colormap[i];
-//		}
+		//		for (int i = 0; i < colormap.length; i++)
+		//		{
+		//			int rgb = colormap[i];
+		//		}
 
 	}
 

Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/sampleUsage/ImageReadExample.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/sampleUsage/ImageReadExample.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/sampleUsage/ImageReadExample.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/sampleUsage/ImageReadExample.java Sun Jan  6 19:45:20 2008
@@ -55,7 +55,8 @@
 				IBufferedImageFactory
 	{
 
-		public BufferedImage getColorBufferedImage(int width, int height, boolean hasAlpha)
+		public BufferedImage getColorBufferedImage(int width, int height,
+				boolean hasAlpha)
 		{
 			GraphicsEnvironment ge = GraphicsEnvironment
 					.getLocalGraphicsEnvironment();
@@ -65,7 +66,8 @@
 					Transparency.TRANSLUCENT);
 		}
 
-		public BufferedImage getGrayscaleBufferedImage(int width, int height, boolean hasAlpha)
+		public BufferedImage getGrayscaleBufferedImage(int width, int height,
+				boolean hasAlpha)
 		{
 			return getColorBufferedImage(width, height, hasAlpha);
 		}

Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/sampleUsage/MetadataExample.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/sampleUsage/MetadataExample.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/sampleUsage/MetadataExample.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/sampleUsage/MetadataExample.java Sun Jan  6 19:45:20 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -27,124 +26,121 @@
 import org.apache.sanselan.common.RationalNumber;
 import org.apache.sanselan.formats.jpeg.JpegImageMetadata;
 import org.apache.sanselan.formats.tiff.TiffField;
-import org.apache.sanselan.formats.tiff.constants.TagInfo2;
+import org.apache.sanselan.formats.tiff.constants.TagInfo;
 import org.apache.sanselan.formats.tiff.constants.TiffConstants;
 
 public class MetadataExample
 {
-    public static void metadataExample(File file) throws ImageReadException,
-            IOException
-    {
-        //        get all metadata stored in EXIF format (ie. from JPEG or TIFF).
-        //            org.w3c.dom.Node node = Sanselan.getMetadataObsolete(imageBytes);
-        IImageMetadata metadata = Sanselan.getMetadata(file);
-
-        //System.out.println(metadata);
-
-        if (metadata instanceof JpegImageMetadata)
-        {
-            JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata;
-
-            // Jpeg EXIF metadata is stored in a TIFF-based directory structure
-            // and is identified with TIFF tags.
-            // Here we look for the "x resolution" tag, but
-            // we could just as easily search for any other tag.
-            //
-            // see the TiffConstants file for a list of TIFF tags.
-
-            System.out.println("file: " + file.getPath());
-
-            // print out various interesting EXIF tags.
-            printTagValue(jpegMetadata, TiffConstants.TIFF_TAG_XRESOLUTION);
-            printTagValue(jpegMetadata, TiffConstants.TIFF_TAG_DATE_TIME);
-            printTagValue(jpegMetadata, TiffConstants.EXIF_TAG_DATE_TIME_ORIGINAL);
-            printTagValue(jpegMetadata,
-                    TiffConstants.EXIF_TAG_CREATE_DATE);
-            printTagValue(jpegMetadata, TiffConstants.EXIF_TAG_ISO);
-            printTagValue(jpegMetadata,
-                    TiffConstants.EXIF_TAG_SHUTTER_SPEED_VALUE);
-            printTagValue(jpegMetadata, TiffConstants.EXIF_TAG_APERTURE_VALUE);
-            printTagValue(jpegMetadata, TiffConstants.EXIF_TAG_BRIGHTNESS_VALUE);
-            printTagValue(jpegMetadata, TiffConstants.GPS_TAG_GPS_LATITUDE_REF);
-            printTagValue(jpegMetadata, TiffConstants.GPS_TAG_GPS_LATITUDE);
-            printTagValue(jpegMetadata, TiffConstants.GPS_TAG_GPS_LONGITUDE_REF);
-            printTagValue(jpegMetadata, TiffConstants.GPS_TAG_GPS_LONGITUDE);
-
-            System.out.println();
-
-            // more specific example of how to access GPS values.
-            TiffField gpsLatitudeRefField = jpegMetadata
-                    .findEXIFValue(TiffConstants.GPS_TAG_GPS_LATITUDE_REF);
-            TiffField gpsLatitudeField = jpegMetadata
-                    .findEXIFValue(TiffConstants.GPS_TAG_GPS_LATITUDE);
-            TiffField gpsLongitudeRefField = jpegMetadata
-                    .findEXIFValue(TiffConstants.GPS_TAG_GPS_LONGITUDE_REF);
-            TiffField gpsLongitudeField = jpegMetadata
-                    .findEXIFValue(TiffConstants.GPS_TAG_GPS_LONGITUDE);
-            if (gpsLatitudeRefField != null && gpsLatitudeField != null
-                    && gpsLongitudeRefField != null
-                    && gpsLongitudeField != null)
-            {
-                // all of these values are strings.
-                String gpsLatitudeRef = (String) gpsLatitudeRefField.getValue();
-                RationalNumber gpsLatitude[] = (RationalNumber[]) (gpsLatitudeField
-                        .getValue());
-                String gpsLongitudeRef = (String) gpsLongitudeRefField
-                        .getValue();
-                RationalNumber gpsLongitude[] = (RationalNumber[]) gpsLongitudeField
-                        .getValue();
-
-                RationalNumber gpsLatitudeDegrees = gpsLatitude[0];
-                RationalNumber gpsLatitudeMinutes = gpsLatitude[1];
-                RationalNumber gpsLatitudeSeconds = gpsLatitude[2];
-
-                RationalNumber gpsLongitudeDegrees = gpsLongitude[0];
-                RationalNumber gpsLongitudeMinutes = gpsLongitude[1];
-                RationalNumber gpsLongitudeSeconds = gpsLongitude[2];
-
-                // This will format the gps info like so:
-                //
-                // gpsLatitude: 8 degrees, 40 minutes, 42.2 seconds S
-                // gpsLongitude: 115 degrees, 26 minutes, 21.8 seconds E
-
-                System.out.println("	" + "GPS Latitude: "
-                        + gpsLatitudeDegrees.toDisplayString() + " degrees, "
-                        + gpsLatitudeMinutes.toDisplayString() + " minutes, "
-                        + gpsLatitudeSeconds.toDisplayString() + " seconds "
-                        + gpsLatitudeRef);
-                System.out.println("	" + "GPS Longitude: "
-                        + gpsLongitudeDegrees.toDisplayString() + " degrees, "
-                        + gpsLongitudeMinutes.toDisplayString() + " minutes, "
-                        + gpsLongitudeSeconds.toDisplayString() + " seconds "
-                        + gpsLongitudeRef);
-
-            }
-
-            System.out.println();
-
-            ArrayList items = jpegMetadata.getItems();
-            for (int i = 0; i < items.size(); i++)
-            {
-                Object item = items.get(i);
-                System.out.println("	" + "item: " + item);
-            }
-
-            System.out.println();
-        }
-    }
-
-    private static void printTagValue(JpegImageMetadata jpegMetadata,
-            TagInfo2 tagInfo) throws ImageReadException, IOException
-    {
-        TiffField field = jpegMetadata.findEXIFValue(tagInfo);
-        if (field == null)
-            System.out.println(tagInfo.name + ": " + "Not Found.");
-        else
-            System.out.println(tagInfo.name + ": "
-                    + field.getValueDescription());
-    }
+	public static void metadataExample(File file) throws ImageReadException,
+			IOException
+	{
+		//        get all metadata stored in EXIF format (ie. from JPEG or TIFF).
+		//            org.w3c.dom.Node node = Sanselan.getMetadataObsolete(imageBytes);
+		IImageMetadata metadata = Sanselan.getMetadata(file);
+
+		//System.out.println(metadata);
+
+		if (metadata instanceof JpegImageMetadata)
+		{
+			JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata;
+
+			// Jpeg EXIF metadata is stored in a TIFF-based directory structure
+			// and is identified with TIFF tags.
+			// Here we look for the "x resolution" tag, but
+			// we could just as easily search for any other tag.
+			//
+			// see the TiffConstants file for a list of TIFF tags.
+
+			System.out.println("file: " + file.getPath());
+
+			// print out various interesting EXIF tags.
+			printTagValue(jpegMetadata, TiffConstants.TIFF_TAG_XRESOLUTION);
+			printTagValue(jpegMetadata, TiffConstants.TIFF_TAG_DATE_TIME);
+			printTagValue(jpegMetadata,
+					TiffConstants.EXIF_TAG_DATE_TIME_ORIGINAL);
+			printTagValue(jpegMetadata, TiffConstants.EXIF_TAG_CREATE_DATE);
+			printTagValue(jpegMetadata, TiffConstants.EXIF_TAG_ISO);
+			printTagValue(jpegMetadata,
+					TiffConstants.EXIF_TAG_SHUTTER_SPEED_VALUE);
+			printTagValue(jpegMetadata, TiffConstants.EXIF_TAG_APERTURE_VALUE);
+			printTagValue(jpegMetadata, TiffConstants.EXIF_TAG_BRIGHTNESS_VALUE);
+			printTagValue(jpegMetadata, TiffConstants.GPS_TAG_GPS_LATITUDE_REF);
+			printTagValue(jpegMetadata, TiffConstants.GPS_TAG_GPS_LATITUDE);
+			printTagValue(jpegMetadata, TiffConstants.GPS_TAG_GPS_LONGITUDE_REF);
+			printTagValue(jpegMetadata, TiffConstants.GPS_TAG_GPS_LONGITUDE);
+
+			System.out.println();
+
+			// more specific example of how to access GPS values.
+			TiffField gpsLatitudeRefField = jpegMetadata
+					.findEXIFValue(TiffConstants.GPS_TAG_GPS_LATITUDE_REF);
+			TiffField gpsLatitudeField = jpegMetadata
+					.findEXIFValue(TiffConstants.GPS_TAG_GPS_LATITUDE);
+			TiffField gpsLongitudeRefField = jpegMetadata
+					.findEXIFValue(TiffConstants.GPS_TAG_GPS_LONGITUDE_REF);
+			TiffField gpsLongitudeField = jpegMetadata
+					.findEXIFValue(TiffConstants.GPS_TAG_GPS_LONGITUDE);
+			if (gpsLatitudeRefField != null && gpsLatitudeField != null
+					&& gpsLongitudeRefField != null
+					&& gpsLongitudeField != null)
+			{
+				// all of these values are strings.
+				String gpsLatitudeRef = (String) gpsLatitudeRefField.getValue();
+				RationalNumber gpsLatitude[] = (RationalNumber[]) (gpsLatitudeField
+						.getValue());
+				String gpsLongitudeRef = (String) gpsLongitudeRefField
+						.getValue();
+				RationalNumber gpsLongitude[] = (RationalNumber[]) gpsLongitudeField
+						.getValue();
+
+				RationalNumber gpsLatitudeDegrees = gpsLatitude[0];
+				RationalNumber gpsLatitudeMinutes = gpsLatitude[1];
+				RationalNumber gpsLatitudeSeconds = gpsLatitude[2];
+
+				RationalNumber gpsLongitudeDegrees = gpsLongitude[0];
+				RationalNumber gpsLongitudeMinutes = gpsLongitude[1];
+				RationalNumber gpsLongitudeSeconds = gpsLongitude[2];
+
+				// This will format the gps info like so:
+				//
+				// gpsLatitude: 8 degrees, 40 minutes, 42.2 seconds S
+				// gpsLongitude: 115 degrees, 26 minutes, 21.8 seconds E
+
+				System.out.println("	" + "GPS Latitude: "
+						+ gpsLatitudeDegrees.toDisplayString() + " degrees, "
+						+ gpsLatitudeMinutes.toDisplayString() + " minutes, "
+						+ gpsLatitudeSeconds.toDisplayString() + " seconds "
+						+ gpsLatitudeRef);
+				System.out.println("	" + "GPS Longitude: "
+						+ gpsLongitudeDegrees.toDisplayString() + " degrees, "
+						+ gpsLongitudeMinutes.toDisplayString() + " minutes, "
+						+ gpsLongitudeSeconds.toDisplayString() + " seconds "
+						+ gpsLongitudeRef);
+
+			}
+
+			System.out.println();
+
+			ArrayList items = jpegMetadata.getItems();
+			for (int i = 0; i < items.size(); i++)
+			{
+				Object item = items.get(i);
+				System.out.println("	" + "item: " + item);
+			}
+
+			System.out.println();
+		}
+	}
+
+	private static void printTagValue(JpegImageMetadata jpegMetadata,
+			TagInfo tagInfo) throws ImageReadException, IOException
+	{
+		TiffField field = jpegMetadata.findEXIFValue(tagInfo);
+		if (field == null)
+			System.out.println(tagInfo.name + ": " + "Not Found.");
+		else
+			System.out.println(tagInfo.name + ": "
+					+ field.getValueDescription());
+	}
 
 }
-
-
-

Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/util/CachingInputStream.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/util/CachingInputStream.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/util/CachingInputStream.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/util/CachingInputStream.java Sun Jan  6 19:45:20 2008
@@ -15,10 +15,11 @@
  * limitations under the License.
  */
 
-
 package org.apache.sanselan.util;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 
 public class CachingInputStream extends InputStream
 {

Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/util/Debug.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/util/Debug.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/util/Debug.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/util/Debug.java Sun Jan  6 19:45:20 2008
@@ -23,11 +23,11 @@
 import java.io.File;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
 import java.util.Map;
-import java.util.ArrayList;
 
 public final class Debug
 {
@@ -208,8 +208,8 @@
 			buffer.append(s + newline);
 	}
 
-	public static boolean compare(String prefix, Map a, Map b, ArrayList ignore,
-			StringBuffer buffer)
+	public static boolean compare(String prefix, Map a, Map b,
+			ArrayList ignore, StringBuffer buffer)
 	{
 		if ((a == null) && (b == null))
 		{

Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/util/DebugInputStream.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/util/DebugInputStream.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/util/DebugInputStream.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/util/DebugInputStream.java Sun Jan  6 19:45:20 2008
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-
 package org.apache.sanselan.util;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
 
 public class DebugInputStream extends InputStream
 {

Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/util/DebugOutputStream.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/util/DebugOutputStream.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/util/DebugOutputStream.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/util/DebugOutputStream.java Sun Jan  6 19:45:20 2008
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 package org.apache.sanselan.util;
 
 import java.io.IOException;

Modified: incubator/sanselan/trunk/src/test/java/org/apache/sanselan/common/byteSources/ByteSourceDataTest.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/test/java/org/apache/sanselan/common/byteSources/ByteSourceDataTest.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/test/java/org/apache/sanselan/common/byteSources/ByteSourceDataTest.java (original)
+++ incubator/sanselan/trunk/src/test/java/org/apache/sanselan/common/byteSources/ByteSourceDataTest.java Sun Jan  6 19:45:20 2008
@@ -26,7 +26,6 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.apache.sanselan.util.Debug;
 import org.apache.sanselan.util.IOUtils;
 
 public class ByteSourceDataTest extends ByteSourceTest

Modified: incubator/sanselan/trunk/src/test/java/org/apache/sanselan/common/byteSources/ByteSourceTest.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/test/java/org/apache/sanselan/common/byteSources/ByteSourceTest.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/test/java/org/apache/sanselan/common/byteSources/ByteSourceTest.java (original)
+++ incubator/sanselan/trunk/src/test/java/org/apache/sanselan/common/byteSources/ByteSourceTest.java Sun Jan  6 19:45:20 2008
@@ -33,8 +33,6 @@
 		super(name);
 	}
 
-
-
 	protected File createTempFile(byte src[]) throws IOException
 	{
 		// make temp file directory

Modified: incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/ExifBaseTest.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/ExifBaseTest.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/ExifBaseTest.java (original)
+++ incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/ExifBaseTest.java Sun Jan  6 19:45:20 2008
@@ -17,25 +17,14 @@
 
 package org.apache.sanselan.formats.jpeg;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
 import org.apache.sanselan.ImageFormat;
 import org.apache.sanselan.ImageReadException;
-import org.apache.sanselan.ImageWriteException;
 import org.apache.sanselan.Sanselan;
 import org.apache.sanselan.SanselanTest;
-import org.apache.sanselan.SanselanTest.ImageFilter;
-import org.apache.sanselan.common.byteSources.ByteSource;
-import org.apache.sanselan.common.byteSources.ByteSourceArray;
-import org.apache.sanselan.common.byteSources.ByteSourceFile;
-import org.apache.sanselan.formats.jpeg.JpegImageMetadata.Photoshop;
-import org.apache.sanselan.formats.jpeg.exifRewrite.ExifRewriter;
-import org.apache.sanselan.formats.tiff.TiffImageMetadata;
-import org.apache.sanselan.util.Debug;
-import org.apache.sanselan.util.IOUtils;
 
 public abstract class ExifBaseTest extends SanselanTest
 {

Modified: incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/ExifDumpTest.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/ExifDumpTest.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/ExifDumpTest.java (original)
+++ incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/ExifDumpTest.java Sun Jan  6 19:45:20 2008
@@ -17,24 +17,16 @@
 
 package org.apache.sanselan.formats.jpeg;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
-import org.apache.sanselan.ImageFormat;
 import org.apache.sanselan.ImageReadException;
 import org.apache.sanselan.ImageWriteException;
 import org.apache.sanselan.Sanselan;
-import org.apache.sanselan.SanselanTest;
 import org.apache.sanselan.common.byteSources.ByteSource;
-import org.apache.sanselan.common.byteSources.ByteSourceArray;
 import org.apache.sanselan.common.byteSources.ByteSourceFile;
-import org.apache.sanselan.formats.jpeg.JpegImageMetadata.Photoshop;
-import org.apache.sanselan.formats.jpeg.exifRewrite.ExifRewriter;
-import org.apache.sanselan.formats.tiff.TiffImageMetadata;
 import org.apache.sanselan.util.Debug;
-import org.apache.sanselan.util.IOUtils;
 
 public class ExifDumpTest extends ExifBaseTest
 {

Modified: incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/ExifRewriteTest.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/ExifRewriteTest.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/ExifRewriteTest.java (original)
+++ incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/ExifRewriteTest.java Sun Jan  6 19:45:20 2008
@@ -35,7 +35,6 @@
 import org.apache.sanselan.formats.tiff.TiffField;
 import org.apache.sanselan.formats.tiff.TiffImageMetadata;
 import org.apache.sanselan.formats.tiff.constants.AllTagConstants;
-import org.apache.sanselan.formats.tiff.write.TiffOutputField;
 import org.apache.sanselan.formats.tiff.write.TiffOutputSet;
 import org.apache.sanselan.util.Debug;
 import org.apache.sanselan.util.IOUtils;
@@ -183,7 +182,7 @@
 		{
 			Integer dirType = (Integer) oldDirectoryTypes.get(i);
 
-//			Debug.debug("dirType", dirType);
+			//			Debug.debug("dirType", dirType);
 
 			TiffImageMetadata.Directory oldDirectory = (TiffImageMetadata.Directory) oldDirectoryMap
 					.get(dirType);
@@ -217,7 +216,7 @@
 				TiffField oldField = (TiffField) oldFieldMap.get(fieldTag);
 				TiffField newField = (TiffField) newFieldMap.get(fieldTag);
 
-//				Debug.debug("fieldTag", fieldTag);
+				//				Debug.debug("fieldTag", fieldTag);
 
 				//				fieldTag.
 				assertNotNull(oldField);
@@ -229,8 +228,7 @@
 				assertEquals(oldField.length, newField.length);
 				assertEquals(oldField.isLocalValue(), newField.isLocalValue());
 
-
-				if(!oldField.tagInfo.isOffset())
+				if (!oldField.tagInfo.isOffset())
 				{
 					if (oldField.isLocalValue())
 					{
@@ -245,7 +243,7 @@
 
 			}
 
-//			Debug.debug();
+			//			Debug.debug();
 		}
 	}
 

Modified: incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/JpegBaseTest.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/JpegBaseTest.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/JpegBaseTest.java (original)
+++ incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/JpegBaseTest.java Sun Jan  6 19:45:20 2008
@@ -22,14 +22,9 @@
 import java.util.List;
 
 import org.apache.sanselan.ImageFormat;
-import org.apache.sanselan.ImageInfo;
 import org.apache.sanselan.ImageReadException;
-import org.apache.sanselan.ImageWriteException;
 import org.apache.sanselan.Sanselan;
 import org.apache.sanselan.SanselanTest;
-import org.apache.sanselan.SanselanTest.ImageFilter;
-import org.apache.sanselan.common.IImageMetadata;
-import org.apache.sanselan.util.Debug;
 
 public abstract class JpegBaseTest extends SanselanTest
 {
@@ -62,6 +57,5 @@
 	{
 		return getTestImages(imageFilter);
 	}
-
 
 }

Modified: incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/JpegReadTest.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/JpegReadTest.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/JpegReadTest.java (original)
+++ incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/JpegReadTest.java Sun Jan  6 19:45:20 2008
@@ -21,12 +21,10 @@
 import java.io.IOException;
 import java.util.List;
 
-import org.apache.sanselan.ImageFormat;
 import org.apache.sanselan.ImageInfo;
 import org.apache.sanselan.ImageReadException;
 import org.apache.sanselan.ImageWriteException;
 import org.apache.sanselan.Sanselan;
-import org.apache.sanselan.SanselanTest;
 import org.apache.sanselan.common.IImageMetadata;
 import org.apache.sanselan.util.Debug;
 

Modified: incubator/sanselan/trunk/src/test/java/org/apache/sanselan/test/util/FSTraversal.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/test/java/org/apache/sanselan/test/util/FSTraversal.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/test/java/org/apache/sanselan/test/util/FSTraversal.java (original)
+++ incubator/sanselan/trunk/src/test/java/org/apache/sanselan/test/util/FSTraversal.java Sun Jan  6 19:45:20 2008
@@ -179,9 +179,8 @@
 			if (root == null || !root.exists())
 				continue;
 
-			if (!traverse(roots[i], mode, visitor, estimate
-					+ estimateIncrement * i / roots.length, estimateIncrement
-					/ roots.length))
+			if (!traverse(roots[i], mode, visitor, estimate + estimateIncrement
+					* i / roots.length, estimateIncrement / roots.length))
 				return false;
 		}
 



Mime
View raw message