Author: damjan
Date: Wed Mar 21 09:10:56 2012
New Revision: 1303319
URL: http://svn.apache.org/viewvc?rev=1303319&view=rev
Log:
Factor out Molecular Dynamics GEL tags.
Added:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/MolecularDynamicsGelTagConstants.java
(with props)
Modified:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AllTagConstants.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/ExifTagConstants.java
commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/tiff/TiffTagIntegrityTest.java
Modified:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AllTagConstants.java
URL:
http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AllTagConstants.java?rev=1303319&r1=1303318&r2=1303319&view=diff
==============================================================================
---
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AllTagConstants.java
(original)
+++
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AllTagConstants.java
Wed Mar 21 09:10:56 2012
@@ -28,6 +28,7 @@ public interface AllTagConstants extends
ExifTagConstants,
GpsTagConstants,
HylaFaxTagConstants,
+ MolecularDynamicsGelTagConstants,
MicrosoftTagConstants,
Rfc2301TagConstants,
Tiff4TagConstants,
@@ -43,6 +44,7 @@ public interface AllTagConstants extends
ExifTagConstants.ALL_EXIF_TAGS,
GpsTagConstants.ALL_GPS_TAGS,
HylaFaxTagConstants.ALL_HYLAFAX_TAGS,
+
MolecularDynamicsGelTagConstants.ALL_MOLECULAR_DYNAMICS_GEL_TAGS,
MicrosoftTagConstants.ALL_MICROSOFT_TAGS,
Rfc2301TagConstants.ALL_RFC_2301_TAGS,
Tiff4TagConstants.ALL_TIFF_4_TAGS,
Modified:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/ExifTagConstants.java
URL:
http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/ExifTagConstants.java?rev=1303319&r1=1303318&r2=1303319&view=diff
==============================================================================
---
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/ExifTagConstants.java
(original)
+++
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/ExifTagConstants.java
Wed Mar 21 09:10:56 2012
@@ -127,28 +127,6 @@ public interface ExifTagConstants
public static final TagInfoRational EXIF_TAG_FNUMBER = new TagInfoRational(
"FNumber", 0x829d, -1,
TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD);
- public static final TagInfoLong EXIF_TAG_MDFILE_TAG = new
TagInfoLong("MDFile Tag",
- 0x82a5, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoRational EXIF_TAG_MDSCALE_PIXEL = new
TagInfoRational(
- "MDScale Pixel", 0x82a6, 1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoShort EXIF_TAG_MDCOLOR_TABLE = new TagInfoShort(
- "MDColor Table", 0x82a7, -1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoAscii EXIF_TAG_MDLAB_NAME = new
TagInfoAscii("MDLab Name",
- 0x82a8, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoAscii EXIF_TAG_MDSAMPLE_INFO = new TagInfoAscii(
- "MDSample Info", 0x82a9, -1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoAscii EXIF_TAG_MDPREP_DATE = new TagInfoAscii(
- "MDPrep Date", 0x82aa, -1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoAscii EXIF_TAG_MDPREP_TIME = new TagInfoAscii(
- "MDPrep Time", 0x82ab, -1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoAscii EXIF_TAG_MDFILE_UNITS = new TagInfoAscii(
- "MDFile Units", 0x82ac, -1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
public static final TagInfoDouble EXIF_TAG_PIXEL_SCALE = new TagInfoDouble(
"Pixel Scale", 0x830e, 3,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
@@ -909,10 +887,7 @@ public interface ExifTagConstants
EXIF_TAG_MATTEING, EXIF_TAG_DATA_TYPE,
EXIF_TAG_IMAGE_DEPTH, EXIF_TAG_TILE_DEPTH,
EXIF_TAG_MODEL_2,
EXIF_TAG_EXPOSURE_TIME,
- EXIF_TAG_FNUMBER, EXIF_TAG_MDFILE_TAG,
EXIF_TAG_MDSCALE_PIXEL,
- EXIF_TAG_MDCOLOR_TABLE, EXIF_TAG_MDLAB_NAME,
- EXIF_TAG_MDSAMPLE_INFO, EXIF_TAG_MDPREP_DATE,
EXIF_TAG_MDPREP_TIME,
- EXIF_TAG_MDFILE_UNITS, EXIF_TAG_PIXEL_SCALE,
EXIF_TAG_IPTC_NAA,
+ EXIF_TAG_FNUMBER, EXIF_TAG_PIXEL_SCALE, EXIF_TAG_IPTC_NAA,
EXIF_TAG_INTERGRAPH_PACKET_DATA,
EXIF_TAG_INTERGRAPH_FLAG_REGISTERS,
EXIF_TAG_INTERGRAPH_MATRIX,
EXIF_TAG_MODEL_TIE_POINT, EXIF_TAG_SITE,
EXIF_TAG_COLOR_SEQUENCE,
Added:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/MolecularDynamicsGelTagConstants.java
URL:
http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/MolecularDynamicsGelTagConstants.java?rev=1303319&view=auto
==============================================================================
---
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/MolecularDynamicsGelTagConstants.java
(added)
+++
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/MolecularDynamicsGelTagConstants.java
Wed Mar 21 09:10:56 2012
@@ -0,0 +1,56 @@
+package org.apache.commons.sanselan.formats.tiff.constants;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfo;
+import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfoAscii;
+import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfoLong;
+import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfoRational;
+import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfoShort;
+
+public interface MolecularDynamicsGelTagConstants extends
TiffFieldTypeConstants {
+ public static final TagInfoLong EXIF_TAG_MDFILE_TAG = new TagInfoLong(
+ "MDFile Tag", 0x82a5, 1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoRational EXIF_TAG_MDSCALE_PIXEL = new
TagInfoRational(
+ "MDScale Pixel", 0x82a6, 1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoShort EXIF_TAG_MDCOLOR_TABLE = new TagInfoShort(
+ "MDColor Table", 0x82a7, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoAscii EXIF_TAG_MDLAB_NAME = new TagInfoAscii(
+ "MDLab Name", 0x82a8, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoAscii EXIF_TAG_MDSAMPLE_INFO = new TagInfoAscii(
+ "MDSample Info", 0x82a9, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoAscii EXIF_TAG_MDPREP_DATE = new TagInfoAscii(
+ "MDPrep Date", 0x82aa, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoAscii EXIF_TAG_MDPREP_TIME = new TagInfoAscii(
+ "MDPrep Time", 0x82ab, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoAscii EXIF_TAG_MDFILE_UNITS = new TagInfoAscii(
+ "MDFile Units", 0x82ac, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final List<TagInfo> ALL_MOLECULAR_DYNAMICS_GEL_TAGS =
+ Collections.unmodifiableList(Arrays.asList(
+ EXIF_TAG_MDFILE_TAG,
+ EXIF_TAG_MDSCALE_PIXEL,
+ EXIF_TAG_MDCOLOR_TABLE,
+ EXIF_TAG_MDLAB_NAME,
+ EXIF_TAG_MDSAMPLE_INFO,
+ EXIF_TAG_MDPREP_DATE,
+ EXIF_TAG_MDPREP_TIME,
+ EXIF_TAG_MDFILE_UNITS));
+}
Propchange:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/MolecularDynamicsGelTagConstants.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/tiff/TiffTagIntegrityTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/tiff/TiffTagIntegrityTest.java?rev=1303319&r1=1303318&r2=1303319&view=diff
==============================================================================
---
commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/tiff/TiffTagIntegrityTest.java
(original)
+++
commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/tiff/TiffTagIntegrityTest.java
Wed Mar 21 09:10:56 2012
@@ -26,6 +26,7 @@ import org.apache.commons.sanselan.forma
import org.apache.commons.sanselan.formats.tiff.constants.ExifTagConstants;
import org.apache.commons.sanselan.formats.tiff.constants.GpsTagConstants;
import
org.apache.commons.sanselan.formats.tiff.constants.MicrosoftTagConstants;
+import
org.apache.commons.sanselan.formats.tiff.constants.MolecularDynamicsGelTagConstants;
import org.apache.commons.sanselan.formats.tiff.constants.Rfc2301TagConstants;
import org.apache.commons.sanselan.formats.tiff.constants.Tiff4TagConstants;
import org.apache.commons.sanselan.formats.tiff.constants.TiffEpTagConstants;
@@ -40,6 +41,7 @@ public class TiffTagIntegrityTest extend
verifyFields(DcfTagConstants.class, DcfTagConstants.ALL_DCF_TAGS);
verifyFields(ExifTagConstants.class, ExifTagConstants.ALL_EXIF_TAGS);
verifyFields(GpsTagConstants.class, GpsTagConstants.ALL_GPS_TAGS);
+ verifyFields(MolecularDynamicsGelTagConstants.class,
MolecularDynamicsGelTagConstants.ALL_MOLECULAR_DYNAMICS_GEL_TAGS);
verifyFields(MicrosoftTagConstants.class,
MicrosoftTagConstants.ALL_MICROSOFT_TAGS);
verifyFields(Rfc2301TagConstants.class,
Rfc2301TagConstants.ALL_RFC_2301_TAGS);
verifyFields(Tiff4TagConstants.class,
Tiff4TagConstants.ALL_TIFF_4_TAGS);
