You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2014/01/30 19:54:17 UTC

svn commit: r1562920 - in /subversion/trunk: build/ac-macros/java.m4 subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteSession.java subversion/bindings/javahl/tests/org/apache/subversion/javahl/RunTests.java

Author: brane
Date: Thu Jan 30 18:54:16 2014
New Revision: 1562920

URL: http://svn.apache.org/r1562920
Log:
Silence the 'rawtypes' warning emitted in JavaHL by javac 1.7.x.

* build/ac-macros/java.m4 (SVN_FIND_JDK):
   Add '-Xlint:-rawtypes' to JAVAC_COMPAT_FLAGS for the org.tigris namespace.

[in subversion/bindings/javahl]
* src/org/apache/subversion/javahl/remote/RemoteSession.java
  (RemoteSession.maybe_clear): Make this a generic method.
* tests/org/apache/subversion/javahl/RunTests.java
  (RunTests.suite): Fix an anonymous Class construction.

Modified:
    subversion/trunk/build/ac-macros/java.m4
    subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteSession.java
    subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/RunTests.java

Modified: subversion/trunk/build/ac-macros/java.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/java.m4?rev=1562920&r1=1562919&r2=1562920&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/java.m4 (original)
+++ subversion/trunk/build/ac-macros/java.m4 Thu Jan 30 18:54:16 2014
@@ -194,7 +194,7 @@ AC_DEFUN(SVN_FIND_JDK,
       if test "$enable_debugging" = "yes"; then
         JAVAC_FLAGS="-g -Xlint -Xlint:unchecked -Xlint:serial -Xlint:path $JAVAC_FLAGS"
         if test -z "$JAVAC_COMPAT_FLAGS"; then
-          JAVAC_COMPAT_FLAGS="$JAVAC_FLAGS -Xlint:-unchecked -Xlint:-deprecation -Xlint:-dep-ann"
+          JAVAC_COMPAT_FLAGS="$JAVAC_FLAGS -Xlint:-unchecked -Xlint:-deprecation -Xlint:-dep-ann -Xlint:-rawtypes"
         fi
       fi
     fi

Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteSession.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteSession.java?rev=1562920&r1=1562919&r2=1562920&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteSession.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteSession.java Thu Jan 30 18:54:16 2014
@@ -405,7 +405,7 @@ public class RemoteSession extends JNIOb
     /*
      * Private helper methods.
      */
-    private final static void maybe_clear(Map clearable)
+    private final static<K,V> void maybe_clear(Map<K,V> clearable)
     {
         if (clearable != null && !clearable.isEmpty())
             try {

Modified: subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/RunTests.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/RunTests.java?rev=1562920&r1=1562919&r2=1562920&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/RunTests.java (original)
+++ subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/RunTests.java Thu Jan 30 18:54:16 2014
@@ -71,7 +71,7 @@ public class RunTests
                     try
                     {
                         Class<?> clazz = Class.forName(className);
-                        final Class<?>[] argTypes = new Class[] { String.class };
+                        final Class<?>[] argTypes = new Class<?>[] { String.class };
                         Constructor<?> ctor =
                             clazz.getDeclaredConstructor(argTypes);
                         methodName = methodName.substring(i + 1);