You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by da...@apache.org on 2012/10/01 08:01:55 UTC
svn commit: r1392215 - in
/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants:
AllTagConstants.java TagConstantsUtils.java
Author: damjan
Date: Mon Oct 1 06:01:55 2012
New Revision: 1392215
URL: http://svn.apache.org/viewvc?rev=1392215&view=rev
Log:
Fix a variadic generics warning.
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AllTagConstants.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TagConstantsUtils.java
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AllTagConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AllTagConstants.java?rev=1392215&r1=1392214&r2=1392215&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AllTagConstants.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AllTagConstants.java Mon Oct 1 06:01:55 2012
@@ -41,25 +41,25 @@ public interface AllTagConstants extends
TiffEpTagConstants,
TiffTagConstants,
WangTagConstants {
- public static final List<TagInfo> ALL_TAGS = Collections.unmodifiableList(
- TagConstantsUtils.mergeTagLists(
- AdobePageMaker6TagConstants.ALL_ADOBE_PAGEMAKER_6_TAGS,
- AdobePhotoshopTagConstants.ALL_ADOBE_PHOTOSHOP_TAGS,
- AliasSketchbookProTagConstants.ALL_ALIAS_SKETCHBOOK_PRO_TAGS,
- DcfTagConstants.ALL_DCF_TAGS,
- DngTagConstants.ALL_DNG_TAGS,
- ExifTagConstants.ALL_EXIF_TAGS,
- GeoTiffTagConstants.ALL_GEO_TIFF_TAGS,
- GdalLibraryTagConstants.ALL_GDAL_LIBRARY_TAGS,
- GpsTagConstants.ALL_GPS_TAGS,
- HylaFaxTagConstants.ALL_HYLAFAX_TAGS,
- MicrosoftTagConstants.ALL_MICROSOFT_TAGS,
- MicrosoftHdPhotoTagConstants.ALL_MICROSOFT_HD_PHOTO_TAGS,
- MolecularDynamicsGelTagConstants.ALL_MOLECULAR_DYNAMICS_GEL_TAGS,
- OceScanjobTagConstants.ALL_OCE_SCANJOB_TAGS,
- Rfc2301TagConstants.ALL_RFC_2301_TAGS,
- Tiff4TagConstants.ALL_TIFF_4_TAGS,
- TiffEpTagConstants.ALL_TIFF_EP_TAGS,
- TiffTagConstants.ALL_TIFF_TAGS,
- WangTagConstants.ALL_WANG_TAGS));
+
+ public static final List<TagInfo> ALL_TAGS = Collections.unmodifiableList(TagConstantsUtils.mergeTagLists(
+ AdobePageMaker6TagConstants.ALL_ADOBE_PAGEMAKER_6_TAGS,
+ AdobePhotoshopTagConstants.ALL_ADOBE_PHOTOSHOP_TAGS,
+ AliasSketchbookProTagConstants.ALL_ALIAS_SKETCHBOOK_PRO_TAGS,
+ DcfTagConstants.ALL_DCF_TAGS,
+ DngTagConstants.ALL_DNG_TAGS,
+ ExifTagConstants.ALL_EXIF_TAGS,
+ GeoTiffTagConstants.ALL_GEO_TIFF_TAGS,
+ GdalLibraryTagConstants.ALL_GDAL_LIBRARY_TAGS,
+ GpsTagConstants.ALL_GPS_TAGS,
+ HylaFaxTagConstants.ALL_HYLAFAX_TAGS,
+ MicrosoftTagConstants.ALL_MICROSOFT_TAGS,
+ MicrosoftHdPhotoTagConstants.ALL_MICROSOFT_HD_PHOTO_TAGS,
+ MolecularDynamicsGelTagConstants.ALL_MOLECULAR_DYNAMICS_GEL_TAGS,
+ OceScanjobTagConstants.ALL_OCE_SCANJOB_TAGS,
+ Rfc2301TagConstants.ALL_RFC_2301_TAGS,
+ Tiff4TagConstants.ALL_TIFF_4_TAGS,
+ TiffEpTagConstants.ALL_TIFF_EP_TAGS,
+ TiffTagConstants.ALL_TIFF_TAGS,
+ WangTagConstants.ALL_WANG_TAGS));
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TagConstantsUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TagConstantsUtils.java?rev=1392215&r1=1392214&r2=1392215&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TagConstantsUtils.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TagConstantsUtils.java Mon Oct 1 06:01:55 2012
@@ -26,7 +26,7 @@ public class TagConstantsUtils implement
private static final TiffDirectoryType[] tiffDirectoryTypes = TiffDirectoryType
.values();
- public static List<TagInfo> mergeTagLists(List<TagInfo>... tagLists) {
+ public static List<TagInfo> mergeTagLists(List<?>... tagLists) {
int count = 0;
for (int i = 0; i < tagLists.length; i++) {
count += tagLists[i].size();
@@ -36,7 +36,7 @@ public class TagConstantsUtils implement
for (int i = 0; i < tagLists.length; i++) {
for (int j = 0; j < tagLists[i].size(); j++) {
- result.add(tagLists[i].get(j));
+ result.add((TagInfo)tagLists[i].get(j));
}
}