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/05/27 09:29:55 UTC
svn commit: r1343007 - in /commons/proper/imaging/trunk: checkstyle.xml
pom.xml src/main/java/org/apache/commons/imaging/ImagingConstants.java
src/main/java/org/apache/commons/imaging/formats/tiff/constants/ExifTagConstants.java
Author: damjan
Date: Sun May 27 07:29:54 2012
New Revision: 1343007
URL: http://svn.apache.org/viewvc?rev=1343007&view=rev
Log:
Configure Checkstyle better.
Added:
commons/proper/imaging/trunk/checkstyle.xml (with props)
Modified:
commons/proper/imaging/trunk/pom.xml
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImagingConstants.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/ExifTagConstants.java
Added: commons/proper/imaging/trunk/checkstyle.xml
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/checkstyle.xml?rev=1343007&view=auto
==============================================================================
--- commons/proper/imaging/trunk/checkstyle.xml (added)
+++ commons/proper/imaging/trunk/checkstyle.xml Sun May 27 07:29:54 2012
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<!DOCTYPE module PUBLIC
+ "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+
+<!-- Commons Imaging customization of default Checkstyle behavior -->
+
+<module name="Checker">
+ <module name="FileTabCharacter">
+ <property name="eachLine" value="true"/>
+ <property name="fileExtensions" value="java, xml"/>
+ </module>
+ <module name="NewlineAtEndOfFile">
+ <property name="fileExtensions" value="java, xml"/>
+ </module>
+ <module name="TreeWalker">
+ <property name="cacheFile" value="target/cachefile"/>
+ <module name="AvoidStarImport"/>
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+ </module>
+</module>
+
Propchange: commons/proper/imaging/trunk/checkstyle.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: commons/proper/imaging/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/pom.xml?rev=1343007&r1=1343006&r2=1343007&view=diff
==============================================================================
--- commons/proper/imaging/trunk/pom.xml (original)
+++ commons/proper/imaging/trunk/pom.xml Sun May 27 07:29:54 2012
@@ -221,6 +221,18 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.9.1</version>
+ <inherited>false</inherited>
+ <configuration>
+ <configLocation>${basedir}/checkstyle.xml</configLocation>
+ </configuration>
+ <!-- Work around CHECKSTYLE-172 -->
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>checkstyle</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImagingConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImagingConstants.java?rev=1343007&r1=1343006&r2=1343007&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImagingConstants.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImagingConstants.java Sun May 27 07:29:54 2012
@@ -16,10 +16,6 @@
*/
package org.apache.commons.imaging;
-import java.io.InputStream;
-
-import org.apache.commons.imaging.formats.tiff.constants.TiffConstants;
-
public interface ImagingConstants {
/**
* Parameter key. Applies to read and write operations.
@@ -38,7 +34,7 @@ public interface ImagingConstants {
* Valid values: filename as string
* <p>
*
- * @see InputStream
+ * @see java.io.InputStream
*/
public static final String PARAM_KEY_FILENAME = "FILENAME";
@@ -49,7 +45,7 @@ public interface ImagingConstants {
* ImageFormat.IMAGE_FORMAT_PNG.
* <p>
*
- * @see ImageFormat
+ * @see org.apache.commons.imaging.ImageFormat
*/
public static final String PARAM_KEY_FORMAT = "FORMAT";
@@ -65,7 +61,7 @@ public interface ImagingConstants {
* TiffConstants.TIFF_COMPRESSION_PACKBITS.
* <p>
*
- * @see TiffConstants
+ * @see org.apache.commons.imaging.formats.tiff.constants.TiffConstants
*/
public static final String PARAM_KEY_COMPRESSION = "COMPRESSION";
@@ -79,7 +75,7 @@ public interface ImagingConstants {
* Valid values: Boolean.TRUE and Boolean.FALSE.
* <p>
*
- * @see TiffConstants
+ * @see org.apache.commons.imaging.formats.tiff.constants.TiffConstants
*/
public static final String PARAM_KEY_READ_THUMBNAILS = "READ_THUMBNAILS";
@@ -91,7 +87,7 @@ public interface ImagingConstants {
* Boolean.FALSE.
* <p>
*
- * @see TiffConstants
+ * @see org.apache.commons.imaging.formats.tiff.constants.TiffConstants
*/
public static final String PARAM_KEY_STRICT = "STRICT";
@@ -102,6 +98,8 @@ public interface ImagingConstants {
* <p>
* Valid values: TiffOutputSet to write into the image's EXIF metadata.
* <p>
+ *
+ * @see org.apache.commons.imaging.formats.tiff.write.TiffOutputSet
*/
public static final String PARAM_KEY_EXIF = "EXIF";
@@ -120,6 +118,9 @@ public interface ImagingConstants {
* density (DPI), and/or aspect ratio.
* <p>
* Valid values: PixelDensity
+ * <p>
+ *
+ * @see org.apache.commons.imaging.PixelDensity
*/
public static final String PARAM_KEY_PIXEL_DENSITY = "PIXEL_DENSITY";
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/ExifTagConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/ExifTagConstants.java?rev=1343007&r1=1343006&r2=1343007&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/ExifTagConstants.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/ExifTagConstants.java Sun May 27 07:29:54 2012
@@ -57,8 +57,8 @@ public interface ExifTagConstants
public static final TagInfoAscii EXIF_TAG_PROCESSING_SOFTWARE = new TagInfoAscii(
"Processing Software", 0x000b, 1,
TiffDirectoryType.EXIF_DIRECTORY_IFD0);
- public static final TagInfoAscii EXIF_TAG_SOFTWARE = new TagInfoAscii("Software",
- 0x0131, 1,
+ public static final TagInfoAscii EXIF_TAG_SOFTWARE = new TagInfoAscii(
+ "Software", 0x0131, 1,
TiffDirectoryType.EXIF_DIRECTORY_IFD0);
public static final TagInfoLong EXIF_TAG_PREVIEW_IMAGE_START_IFD0 = new TagInfoLong(
"Preview Image Start", 0x0111, 1,