Author: markphip
Date: Mon Mar  8 15:14:01 2010
New Revision: 920351

URL: http://svn.apache.org/viewvc?rev=920351&view=rev
Log:
JavaHL: Change NativeResources.version to private and add a public
getVersion()  method to retrieve it.  This was suggested by SVNKit to
facilitate supporting our new and old namespace in their implementation.

Patch by: Alexander Kitaev

[ in subversion/bindings/javahl/ ]
* src/org/apache/subversion/javahl/NativeResources.java:
  Make version private and add public getVersion method.

* src/org/apache/subversion/javahl/SVNAdmin.java:
* src/org/apache/subversion/javahl/SVNClient.java:
* src/org/tigris/subversion/javahl/SVNAdmin.java:
* src/org/tigris/subversion/javahl/SVNClient.java:
  Use NativeResources.getVersion() instead of accessing field
  directly.

Modified:
    
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
    
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNAdmin.java
    
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
    
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
    
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java

Modified: 
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java?rev=920351&r1=920350&r2=920351&view=diff
==============================================================================
--- 
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
 (original)
+++ 
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
 Mon Mar  8 15:14:01 2010
@@ -33,9 +33,19 @@
 public class NativeResources
 {
     /**
-     * Version information about the underlying native libraries.
+     * @return Version information about the underlying native libraries.
      */
-    static public Version version;
+    private static Version version;
+    
+    /**
+     * Returns version information about the underlying native libraries.
+     * 
+     * @return version
+     * 
+     */
+    public static Version getVersion() {
+        return version;
+    }
 
     /**
      * Load the required native library whose path is specified by the

Modified: 
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNAdmin.java
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNAdmin.java?rev=920351&r1=920350&r2=920351&view=diff
==============================================================================
--- 
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNAdmin.java
 (original)
+++ 
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNAdmin.java
 Mon Mar  8 15:14:01 2010
@@ -83,7 +83,7 @@
      */
     public Version getVersion()
     {
-        return NativeResources.version;
+        return NativeResources.getVersion();
     }
 
     /**

Modified: 
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java?rev=920351&r1=920350&r2=920351&view=diff
==============================================================================
--- 
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
 (original)
+++ 
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
 Mon Mar  8 15:14:01 2010
@@ -99,7 +99,7 @@
      */
     public Version getVersion()
     {
-        return NativeResources.version;
+        return NativeResources.getVersion();
     }
 
     /**

Modified: 
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java?rev=920351&r1=920350&r2=920351&view=diff
==============================================================================
--- 
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
 (original)
+++ 
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
 Mon Mar  8 15:14:01 2010
@@ -80,7 +80,7 @@
     public Version getVersion()
     {
         return new Version(
-                    org.apache.subversion.javahl.NativeResources.version);
+                    org.apache.subversion.javahl.NativeResources.getVersion());
     }
 
     /**

Modified: 
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java?rev=920351&r1=920350&r2=920351&view=diff
==============================================================================
--- 
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
 (original)
+++ 
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
 Mon Mar  8 15:14:01 2010
@@ -85,7 +85,7 @@
     public Version getVersion()
     {
         return new Version(
-                        org.apache.subversion.javahl.NativeResources.version);
+                        
org.apache.subversion.javahl.NativeResources.getVersion());
     }
 
     /**


Reply via email to