You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by ga...@apache.org on 2016/02/23 02:13:36 UTC

svn commit: r1731775 - in /xmlgraphics/commons/branches/maven: ./ src/main/java/org/apache/xmlgraphics/image/loader/ src/main/java/org/apache/xmlgraphics/util/io/

Author: gadams
Date: Tue Feb 23 01:13:36 2016
New Revision: 1731775

URL: http://svn.apache.org/viewvc?rev=1731775&view=rev
Log:
Treat checkstyle warning as violation; improve checkstyle/findbugs configuration; change artifact id to commons-xmlgraphics to prevent name conflict with Apache Commons.

Modified:
    xmlgraphics/commons/branches/maven/pom.xml
    xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/loader/MimeEnabledImageFlavor.java
    xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/loader/XMLNamespaceEnabledImageFlavor.java
    xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/util/io/Base64DecodeStream.java

Modified: xmlgraphics/commons/branches/maven/pom.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/maven/pom.xml?rev=1731775&r1=1731774&r2=1731775&view=diff
==============================================================================
--- xmlgraphics/commons/branches/maven/pom.xml (original)
+++ xmlgraphics/commons/branches/maven/pom.xml Tue Feb 23 01:13:36 2016
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.xmlgraphics</groupId>
-  <artifactId>commons</artifactId>
+  <artifactId>commons-xmlgraphics</artifactId>
   <version>2.2.0-SNAPSHOT</version>
   <name>${project.groupId}:${project.artifactId}</name>
   <description>XML Graphics Commons</description>
@@ -100,6 +100,7 @@
           <linkXRef>false</linkXRef>
           <logViolationsToConsole>true</logViolationsToConsole>
           <suppressionsLocation>${project.baseUri}src/tools/resources/checkstyle/suppressions.xml</suppressionsLocation>
+          <violationSeverity>warning</violationSeverity>
         </configuration>
       </plugin>
       <plugin>
@@ -169,6 +170,7 @@
           <includeResources>false</includeResources>
           <includeTestResources>false</includeTestResources>
           <linkXRef>false</linkXRef>
+          <suppressionsLocation>${project.baseUri}src/tools/resources/checkstyle/suppressions.xml</suppressionsLocation>
         </configuration>
       </plugin>
       <plugin>
@@ -178,7 +180,10 @@
         <configuration>
           <excludeFilterFile>src/tools/resources/findbugs/exclusions.xml</excludeFilterFile>
           <effort>Max</effort>
+          <findBugsXmlOutput>true</findBugsXmlOutput>
+          <findBugsXmlWithMessages>true</findBugsXmlWithMessages>
           <threshold>Low</threshold>
+          <xmlOutput>true</xmlOutput>
         </configuration>
       </plugin>
     </plugins>

Modified: xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/loader/MimeEnabledImageFlavor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/loader/MimeEnabledImageFlavor.java?rev=1731775&r1=1731774&r2=1731775&view=diff
==============================================================================
--- xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/loader/MimeEnabledImageFlavor.java (original)
+++ xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/loader/MimeEnabledImageFlavor.java Tue Feb 23 01:13:36 2016
@@ -43,13 +43,21 @@ public class MimeEnabledImageFlavor exte
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) { return true; }
-        if (o == null || getClass() != o.getClass()) { return false; }
-        if (!super.equals(o)) { return false; }
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
 
         MimeEnabledImageFlavor that = (MimeEnabledImageFlavor) o;
 
-        if (mime != null ? !mime.equals(that.mime) : that.mime != null) { return false; }
+        if (mime != null ? !mime.equals(that.mime) : that.mime != null) {
+            return false;
+        }
 
         return true;
     }

Modified: xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/loader/XMLNamespaceEnabledImageFlavor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/loader/XMLNamespaceEnabledImageFlavor.java?rev=1731775&r1=1731774&r2=1731775&view=diff
==============================================================================
--- xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/loader/XMLNamespaceEnabledImageFlavor.java (original)
+++ xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/image/loader/XMLNamespaceEnabledImageFlavor.java Tue Feb 23 01:13:36 2016
@@ -47,13 +47,21 @@ public class XMLNamespaceEnabledImageFla
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) { return true; }
-        if (o == null || getClass() != o.getClass()) { return false; }
-        if (!super.equals(o)) { return false; }
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
 
         XMLNamespaceEnabledImageFlavor that = (XMLNamespaceEnabledImageFlavor) o;
 
-        if (namespace != null ? !namespace.equals(that.namespace) : that.namespace != null) { return false; }
+        if (namespace != null ? !namespace.equals(that.namespace) : that.namespace != null) {
+            return false;
+        }
 
         return true;
     }

Modified: xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/util/io/Base64DecodeStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/util/io/Base64DecodeStream.java?rev=1731775&r1=1731774&r2=1731775&view=diff
==============================================================================
--- xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/util/io/Base64DecodeStream.java (original)
+++ xmlgraphics/commons/branches/maven/src/main/java/org/apache/xmlgraphics/util/io/Base64DecodeStream.java Tue Feb 23 01:13:36 2016
@@ -84,7 +84,9 @@ public class Base64DecodeStream extends
         PEM_ARRAY['/'] = (byte)idx++;
     }
 
-    public boolean markSupported() { return false; }
+    public boolean markSupported() {
+        return false;
+    }
 
     public void close()
         throws IOException {



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org