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 2013/06/12 05:40:42 UTC
svn commit: r1492039 - in
/subversion/branches/javahl-ra/subversion/bindings/javahl:
native/ClientContext.cpp native/SVNBase.cpp native/SVNBase.h
src/org/apache/subversion/javahl/RaSharedContext.java
Author: brane
Date: Wed Jun 12 03:40:42 2013
New Revision: 1492039
URL: http://svn.apache.org/r1492039
Log:
On the javahl-ra branch:
Remove spurious whitespace changes compared to trunk; no functional change.
Modified:
subversion/branches/javahl-ra/subversion/bindings/javahl/native/ClientContext.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNBase.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNBase.h
subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/RaSharedContext.java
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/ClientContext.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/ClientContext.cpp?rev=1492039&r1=1492038&r2=1492039&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/ClientContext.cpp (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/ClientContext.cpp Wed Jun 12 03:40:42 2013
@@ -39,7 +39,7 @@
ClientContext::ClientContext(jobject jsvnclient, SVN::Pool &pool)
-: RaSharedContext(pool)
+ : RaSharedContext(pool)
{
static jfieldID ctxFieldID = 0;
attachJavaObject(jsvnclient, "L"JAVA_PACKAGE"/SVNClient$ClientContext;", "clientContext", &ctxFieldID);
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNBase.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNBase.cpp?rev=1492039&r1=1492038&r2=1492039&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNBase.cpp (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNBase.cpp Wed Jun 12 03:40:42 2013
@@ -42,7 +42,7 @@ jlong SVNBase::getCppAddr() const
}
jlong SVNBase::findCppAddrForJObject(jobject jthis, jfieldID *fid,
- const char *className)
+ const char *className)
{
JNIEnv *env = JNIUtil::getEnv();
@@ -50,7 +50,8 @@ jlong SVNBase::findCppAddrForJObject(job
if (*fid == 0)
{
return 0;
- } else
+ }
+ else
{
jlong cppAddr = env->GetLongField(jthis, *fid);
if (JNIUtil::isJavaExceptionThrown())
@@ -83,7 +84,7 @@ void SVNBase::dispose(jobject jthis, jfi
}
inline void SVNBase::findCppAddrFieldID(jfieldID *fid, const char *className,
- JNIEnv *env)
+ JNIEnv *env)
{
if (*fid == 0)
{
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNBase.h
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNBase.h?rev=1492039&r1=1492038&r2=1492039&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNBase.h (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNBase.h Wed Jun 12 03:40:42 2013
@@ -32,72 +32,72 @@
class SVNBase
{
- public:
- SVNBase();
- virtual ~SVNBase();
-
- /**
- * Return @c this as a @c jlong.
- *
- * @since 1.4.0
- */
- jlong getCppAddr() const;
-
- /**
- * Deletes this C++ peer object, and clears the memory address of
- * the corresponding Java object @a jthis which points to it.
- *
- * @since 1.4.0
- */
- virtual void dispose(jobject jthis) = 0;
-
- /**
- * This method should never be called, as @c dispose() should be
- * called explicitly. When @c dispose() fails to be called, this
- * method assures that this C++ peer object has been enqueued for
- * deletion.
- *
- * @since 1.4.0
- */
- void finalize();
-
- protected:
- /**
- * Return the value of the @c cppAddr instance field from the @a
- * jthis Java object, or @c 0 if an error occurs, or the address
- * otherwise can't be determined. @a fid is expected to point to
- * 0 if not already known, in which case it's looked up using @a
- * className.
- *
- * @since 1.4.0
- */
- static jlong findCppAddrForJObject(jobject jthis, jfieldID *fid,
- const char *className);
-
- /**
- * Deletes @c this, then attempts to null out the @c jthis.cppAddr
- * instance field on the corresponding Java object.
- *
- * @since 1.4.0
- */
- void dispose(jobject jthis, jfieldID *fid, const char *className);
-
- /**
- * Instantiates java object attached to this base object
- */
- jobject createCppBoundObject(const char *clazzName);
-
- private:
- /**
- * If the value pointed to by @a fid is zero, find the @c jfieldID
- * for the @c cppAddr instance field of @c className.
- *
- * @since 1.4.0
- */
- static void findCppAddrFieldID(jfieldID *fid, const char *className,
- JNIEnv *env);
+ public:
+ SVNBase();
+ virtual ~SVNBase();
+
+ /**
+ * Return @c this as a @c jlong.
+ *
+ * @since 1.4.0
+ */
+ jlong getCppAddr() const;
+
+ /**
+ * Deletes this C++ peer object, and clears the memory address of
+ * the corresponding Java object @a jthis which points to it.
+ *
+ * @since 1.4.0
+ */
+ virtual void dispose(jobject jthis) = 0;
+
+ /**
+ * This method should never be called, as @c dispose() should be
+ * called explicitly. When @c dispose() fails to be called, this
+ * method assures that this C++ peer object has been enqueued for
+ * deletion.
+ *
+ * @since 1.4.0
+ */
+ void finalize();
+
+ protected:
+ /**
+ * Return the value of the @c cppAddr instance field from the @a
+ * jthis Java object, or @c 0 if an error occurs, or the address
+ * otherwise can't be determined. @a fid is expected to point to
+ * 0 if not already known, in which case it's looked up using @a
+ * className.
+ *
+ * @since 1.4.0
+ */
+ static jlong findCppAddrForJObject(jobject jthis, jfieldID *fid,
+ const char *className);
+
+ /**
+ * Deletes @c this, then attempts to null out the @c jthis.cppAddr
+ * instance field on the corresponding Java object.
+ *
+ * @since 1.4.0
+ */
+ void dispose(jobject jthis, jfieldID *fid, const char *className);
+
+ /**
+ * Instantiates java object attached to this base object
+ */
+ jobject createCppBoundObject(const char *clazzName);
+
+ private:
+ /**
+ * If the value pointed to by @a fid is zero, find the @c jfieldID
+ * for the @c cppAddr instance field of @c className.
+ *
+ * @since 1.4.0
+ */
+ static void findCppAddrFieldID(jfieldID *fid, const char *className,
+ JNIEnv *env);
- protected:
+protected:
SVN::Pool pool;
};
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/RaSharedContext.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/RaSharedContext.java?rev=1492039&r1=1492038&r2=1492039&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/RaSharedContext.java (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/RaSharedContext.java Wed Jun 12 03:40:42 2013
@@ -49,4 +49,4 @@ public class RaSharedContext
{
this.listener = listener;
}
-}
\ No newline at end of file
+}