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/02/11 13:54:31 UTC
svn commit: r1567096 - in
/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl: ./
native/ native/jniwrapper/ src/org/apache/subversion/javahl/
src/org/tigris/subversion/javahl/ tests/org/apache/subversion/javahl/
tests/org/tigris/subv...
Author: brane
Date: Tue Feb 11 12:54:31 2014
New Revision: 1567096
URL: http://svn.apache.org/r1567096
Log:
On the javahl-1.8-extensions branch: Sync JavaHL from trunk up to r1567087.
Modified:
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/ (props changed)
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/JNICriticalSection.h
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/JNIUtil.cpp
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/NativeStream.cpp
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/NativeStream.hpp
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_base.cpp
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_env.hpp
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_string.hpp
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_string_map.cpp
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_string_map.hpp
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java
Propchange: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/
------------------------------------------------------------------------------
Merged /subversion/trunk/subversion/bindings/javahl:r1564613-1567087
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/JNICriticalSection.h
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/JNICriticalSection.h?rev=1567096&r1=1567095&r2=1567096&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/JNICriticalSection.h (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/JNICriticalSection.h Tue Feb 11 12:54:31 2014
@@ -32,7 +32,7 @@ class JNIMutex;
/**
* This class holds a mutex which will be locked during the constructor and
* released during the destructor. If the object is created on the stack, this
- * garanties that the mutex will be released all the time if the block is left.
+ * guaranties that the mutex will be released all the time if the block is left.
* Only one thread can enter all the critrical sections secured by the same
* mutex.
*/
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/JNIUtil.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/JNIUtil.cpp?rev=1567096&r1=1567095&r2=1567096&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/JNIUtil.cpp (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/JNIUtil.cpp Tue Feb 11 12:54:31 2014
@@ -202,7 +202,7 @@ bool JNIUtil::JNIGlobalInit(JNIEnv *env)
}
/* We shouldn't fill the JVMs memory with FS cache data unless
- explictly requested. And we don't either, because the caches get
+ explicitly requested. And we don't either, because the caches get
allocated outside the JVM heap. Duh. */
{
svn_cache_config_t settings = *svn_cache_config_get();
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/NativeStream.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/NativeStream.cpp?rev=1567096&r1=1567095&r2=1567096&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/NativeStream.cpp (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/NativeStream.cpp Tue Feb 11 12:54:31 2014
@@ -37,6 +37,13 @@ const char* const NativeInputStream::m_c
NativeInputStream::~NativeInputStream() {}
+void NativeInputStream::set_stream(svn_stream_t* stream)
+{
+ if (m_stream)
+ throw std::logic_error(_("Native input stream is already bound"));
+ m_stream = stream;
+}
+
NativeInputStream*
NativeInputStream::get_self(::Java::Env env, jobject jthis)
{
@@ -129,6 +136,13 @@ const char* const NativeOutputStream::m_
NativeOutputStream::~NativeOutputStream() {}
+void NativeOutputStream::set_stream(svn_stream_t* stream)
+{
+ if (m_stream)
+ throw std::logic_error(_("Native output stream is already bound"));
+ m_stream = stream;
+}
+
NativeOutputStream*
NativeOutputStream::get_self(::Java::Env env, jobject jthis)
{
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/NativeStream.hpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/NativeStream.hpp?rev=1567096&r1=1567095&r2=1567096&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/NativeStream.hpp (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/NativeStream.hpp Tue Feb 11 12:54:31 2014
@@ -31,7 +31,6 @@
#include "SVNBase.h"
#include "svn_io.h"
-#include "svn_private_config.h"
namespace JavaHL {
@@ -67,12 +66,7 @@ public:
* Sets the @a stream that this object will own.
* Do not call this function if a stream was passed to the constructor.
*/
- void set_stream(svn_stream_t* stream)
- {
- if (m_stream)
- throw std::logic_error(_("Native input stream is already bound"));
- m_stream = stream;
- }
+ void set_stream(svn_stream_t* stream);
/**
* Create the Java object that binds to this native object.
@@ -83,7 +77,7 @@ public:
}
/**
- * Retreive the address of the native object from the bound Java object.
+ * Retrieve the address of the native object from the bound Java object.
*/
static NativeInputStream* get_self(::Java::Env env, jobject jthis);
@@ -167,12 +161,7 @@ public:
* Sets the @a stream that this object will own.
* Do not call this function if a stream was passed to the constructor.
*/
- void set_stream(svn_stream_t* stream)
- {
- if (m_stream)
- throw std::logic_error(_("Native output stream is already bound"));
- m_stream = stream;
- }
+ void set_stream(svn_stream_t* stream);
/**
* Create the Java object that binds to this native object.
@@ -183,7 +172,7 @@ public:
}
/**
- * Retreive the address of the native object from the bound Java object.
+ * Retrieve the address of the native object from the bound Java object.
*/
static NativeOutputStream* get_self(::Java::Env env, jobject jthis);
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_base.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_base.cpp?rev=1567096&r1=1567095&r2=1567096&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_base.cpp (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_base.cpp Tue Feb 11 12:54:31 2014
@@ -22,6 +22,7 @@
*/
#include <cstring>
+#include <memory>
#include <apr.h>
#include "jni_env.hpp"
@@ -35,6 +36,9 @@
#include "../JNIUtil.h"
bool initialize_jni_util(JNIEnv *env);
+#include "svn_private_config.h"
+
+
// Global library initializaiton
/**
@@ -92,6 +96,55 @@ void Env::static_init(::JavaVM* jvm)
m_jvm = jvm;
}
+const char* Env::error_create_global_reference() throw()
+{
+ return _("Could not create global reference");
+}
+
+const char* Env::error_get_contents_string() throw()
+{
+ return _("Could not get contents of Java String");
+}
+
+const char* Env::error_release_null_string() throw()
+{
+ return _("Could not release contents of a null String");
+}
+
+const char* Env::error_create_object_array() throw()
+{
+ return _("Could not create Object array");
+}
+
+namespace {
+// The typed array error messages are always fatal, so allocating
+// the buffer on the heap and never releasing it does not really
+// constitute a memory leak.
+const char* make_typed_error(const char* fmt, const char* type) throw()
+{
+ const apr_size_t bufsize = 512;
+ char *msg = new(std::nothrow) char[bufsize];
+ apr_snprintf(msg, bufsize, fmt, type);
+ return msg;
+}
+} // anonymous namespace
+
+const char* Env::error_create_array(const char* type) throw()
+{
+ return make_typed_error(_("Could not create %sArray"), type);
+}
+
+const char* Env::error_get_contents_array(const char* type) throw()
+{
+ return make_typed_error(_("Could not get %s array contents"), type);
+}
+
+const char* Env::error_release_null_array(const char* type) throw()
+{
+ return make_typed_error(
+ _("Could not release contents of a null %sArray"), type);
+}
+
::JNIEnv* Env::env_from_jvm()
{
if (m_jvm)
@@ -201,9 +254,37 @@ jstring Class::get_name() const
const char* const String::m_class_name = "java/lang/String";
+void String::MutableContents::set_value(const char* new_text)
+{
+ if (!m_new_text)
+ throw std::invalid_argument(
+ _("Cannot set String contents to null"));
+ if (m_text)
+ {
+ m_new_text = new_text;
+ m_length = jsize(::std::strlen(new_text));
+ }
+ else
+ throw std::logic_error(
+ _("Cannot change the contents of a null String"));
+}
// class Java::Exception
+void Exception::throw_java_exception() const
+{
+ if (instantiated()
+ ? m_env.Throw(throwable())
+ : m_env.ThrowNew(m_class, NULL))
+ throw std::runtime_error(_("Could not throw Java exception"));
+}
+
+void Exception::throw_java_exception(const char* message) const
+{
+ if (m_env.ThrowNew(m_class, message))
+ throw std::runtime_error(_("Could not throw Java exception"));
+}
+
jstring Exception::get_message() const
{
if (instantiated())
@@ -269,4 +350,14 @@ void handle_svn_error(Env env, ::svn_err
throw SignalExceptionThrown();
}
+const char* unknown_cxx_exception_message() throw()
+{
+ return _("Caught unknown C++ exception");
+}
+
+svn_error_t* caught_java_exception_error(apr_status_t status) throw()
+{
+ return svn_error_create(status, NULL, _("Java exception"));
+}
+
} // namespace Java
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_env.hpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_env.hpp?rev=1567096&r1=1567095&r2=1567096&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_env.hpp (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_env.hpp Tue Feb 11 12:54:31 2014
@@ -28,8 +28,6 @@
#include <cstdarg>
#include <stdexcept>
-#include "svn_private_config.h"
-
#ifdef SVN_JAVAHL_DEBUG
# ifndef SVN_JAVAHL_JNIWRAPPER_LOG
# include <iostream>
@@ -150,8 +148,6 @@ private:
jfieldID m_fid;
};
-
-
/**
* Encapsulation of a JNI environment reference.
*
@@ -165,7 +161,7 @@ class Env
{
public:
/**
- * Constructs an environment object, retreiving the JNI environment
+ * Constructs an environment object, retrieving the JNI environment
* reference from the global JVM reference.
*/
explicit Env()
@@ -199,7 +195,7 @@ public:
jobject ret = m_env->NewGlobalRef(obj);
check_java_exception();
if (!ret)
- throw_java_out_of_memory(_("Could not create global reference"));
+ throw_java_out_of_memory(error_create_global_reference());
return ret;
}
@@ -346,8 +342,7 @@ public:
const char* text = m_env->GetStringUTFChars(str, is_copy);
check_java_exception();
if (!text)
- throw_java_out_of_memory(
- _("Could not get contents of Java String"));
+ throw_java_out_of_memory(error_get_contents_string());
return text;
}
@@ -355,8 +350,7 @@ public:
void ReleaseStringUTFChars(jstring str, const char* new_text) const
{
if (!str)
- throw std::logic_error(
- _("Can not release contents of a null String"));
+ throw std::logic_error(error_release_null_string());
m_env->ReleaseStringUTFChars(str, new_text);
}
@@ -479,7 +473,7 @@ public:
{
jobjectArray array = m_env->NewObjectArray(length, cls, init);
if (!array)
- throw_java_out_of_memory(_("Could not create Object array"));
+ throw_java_out_of_memory(error_create_object_array());
return array;
}
@@ -505,7 +499,7 @@ public:
{ \
T##Array array = m_env->New##N##Array(length); \
if (!array) \
- throw_java_out_of_memory(_("Could not create "#T" array")); \
+ throw_java_out_of_memory(error_create_array(#T)); \
return array; \
} \
T* Get##N##ArrayElements(T##Array array, jboolean* is_copy) const \
@@ -516,15 +510,13 @@ public:
T* data = m_env->Get##N##ArrayElements(array, is_copy); \
check_java_exception(); \
if (!data) \
- throw_java_out_of_memory( \
- _("Could not get "#N" array contents")); \
+ throw_java_out_of_memory(error_get_contents_array(#N)); \
return data; \
} \
void Release##N##ArrayElements(T##Array array, T* data, jint mode) const \
{ \
if (!array) \
- throw std::logic_error( \
- _("Can not release contents of a null "#T"Array")); \
+ throw std::logic_error(error_release_null_array(#T)); \
m_env->Release##N##ArrayElements(array, data, mode); \
}
@@ -564,8 +556,19 @@ private:
void throw_java_out_of_memory(const char* message) const;
+ // We cannont use svn_private_config.h in a header, so we move the
+ // actual message translations into the implementation file.
+ static const char* error_create_global_reference() throw();
+ static const char* error_get_contents_string() throw();
+ static const char* error_release_null_string() throw();
+
+ static const char* error_create_object_array() throw();
+ static const char* error_create_array(const char* type) throw();
+ static const char* error_get_contents_array(const char* type) throw();
+ static const char* error_release_null_array(const char* type) throw();
+
public:
- /* This static initializer must only be called by JNI_OnLoad */
+ // This static initializer must only be called by JNI_OnLoad
static void static_init(::JavaVM*);
};
@@ -585,7 +588,7 @@ class LocalFrame
public:
/**
- * Constructs a local frame, retreiving the JNI environment
+ * Constructs a local frame, retrieving the JNI environment
* reference from the global JVM reference.
*/
explicit LocalFrame()
@@ -605,7 +608,7 @@ public:
/**
* Constructs a local frame with the given initial @a capacity,
- * retreiving the JNI environment reference from the global JVM
+ * retrieving the JNI environment reference from the global JVM
* reference.
*/
explicit LocalFrame(jint capacity)
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp?rev=1567096&r1=1567095&r2=1567096&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_exception.hpp Tue Feb 11 12:54:31 2014
@@ -82,13 +82,7 @@ public:
* It is an error to call this method if an existing @c jthrowable
* object was wrapped.
*/
- void throw_java_exception() const
- {
- if (instantiated()
- ? m_env.Throw(throwable())
- : m_env.ThrowNew(m_class, NULL))
- throw std::runtime_error(_("Could not throw Java exception"));
- }
+ void throw_java_exception() const;
/**
* Raises a Java exception of the concrete class with the given
@@ -97,11 +91,7 @@ public:
* It is an error to call this method if an existing @c jthrowable
* object was wrapped.
*/
- void throw_java_exception(const char* message) const
- {
- if (m_env.ThrowNew(m_class, message))
- throw std::runtime_error(_("Could not throw Java exception"));
- }
+ void throw_java_exception(const char* message) const;
/**
* Checks if an existing @c jthrowable object was wrapped.
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp?rev=1567096&r1=1567095&r2=1567096&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_stack.hpp Tue Feb 11 12:54:31 2014
@@ -112,8 +112,8 @@
} \
catch (...) \
{ \
- X(::Java::Env(jenv)) \
- .throw_java_exception(_("Caught unknown C++ exception")); \
+ const char* const msg = Java::unknown_cxx_exception_message(); \
+ X(::Java::Env(jenv)).throw_java_exception(msg); \
}
/**
@@ -161,7 +161,7 @@
catch (const ::Java::SignalExceptionThrown&) \
{ \
SVN_JAVAHL_ASSERT_EXCEPTION_THROWN((E)); \
- return svn_error_create((C), NULL, _("Java exception")); \
+ return Java::caught_java_exception_error((C)); \
} \
catch (const ::std::exception& ex) \
{ \
@@ -171,7 +171,7 @@
} \
catch (...) \
{ \
- const char* const msg = _("Caught unknown C++ exception"); \
+ const char* const msg = Java::unknown_cxx_exception_message(); \
::Java::RuntimeException((E)).throw_java_exception(msg); \
return svn_error_create((C), NULL, msg); \
}
@@ -201,6 +201,20 @@ namespace Java {
*/
void handle_svn_error(Env env, svn_error_t* err);
+/**
+ * Return a localized error string for an unknown C++ exception.
+ *
+ * @since New in 1.9.
+ */
+const char* unknown_cxx_exception_message() throw();
+
+/**
+ * Create an svn_error_t for a caught Java exception.
+ *
+ * @since New in 1.9.
+ */
+svn_error_t* caught_java_exception_error(apr_status_t status) throw();
+
} // namespace Java
#endif // SVN_JAVAHL_JNIWRAPPER_STACK_HPP
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_string.hpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_string.hpp?rev=1567096&r1=1567095&r2=1567096&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_string.hpp (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_string.hpp Tue Feb 11 12:54:31 2014
@@ -196,20 +196,7 @@ public:
* @throw std::invalid_argument if the @a new_text is @c null
* @throw std::logic_error if this is a @c null or immutable string
*/
- void set_value(const char* new_text)
- {
- if (!m_new_text)
- throw std::invalid_argument(
- _("Cannot set String contents to null"));
- if (m_text)
- {
- m_new_text = new_text;
- m_length = jsize(::std::strlen(new_text));
- }
- else
- throw std::logic_error(
- _("Cannot change the contents of a null String"));
- }
+ void set_value(const char* new_text);
private:
const char* m_new_text;
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_string_map.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_string_map.cpp?rev=1567096&r1=1567095&r2=1567096&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_string_map.cpp (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_string_map.cpp Tue Feb 11 12:54:31 2014
@@ -26,6 +26,8 @@
#include "jni_string.hpp"
#include "jni_string_map.hpp"
+#include "svn_private_config.h"
+
namespace Java {
// Class Java::BaseMap
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_string_map.hpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_string_map.hpp?rev=1567096&r1=1567095&r2=1567096&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_string_map.hpp (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/jniwrapper/jni_string_map.hpp Tue Feb 11 12:54:31 2014
@@ -31,8 +31,6 @@
#include "jni_env.hpp"
#include "jni_object.hpp"
-#include "svn_private_config.h"
-
namespace Java {
/**
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java?rev=1567096&r1=1567095&r2=1567096&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java Tue Feb 11 12:54:31 2014
@@ -1281,9 +1281,9 @@ public interface ISVNClient
* @param revision the revision of the item to return
* @param pegRevision the revision to interpret pathOrUrl
* @param depth the depth to recurse
- * @param fetchExcluded when <code>true</code>, retreive
+ * @param fetchExcluded when <code>true</code>, retrieve
* information about nodes that are excluded from the working copy
- * @param fetchActualOnly when <code>true</code>, retreive
+ * @param fetchActualOnly when <code>true</code>, retrieve
* information about node that are not versioned, but are still
* tree conflicted.
* @param changelists if non-null, filter paths using changelists
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java?rev=1567096&r1=1567095&r2=1567096&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java Tue Feb 11 12:54:31 2014
@@ -255,7 +255,7 @@ public interface ISVNRemote
* The implementations of <code>contents</code> and
* <code>properties</code> may not perform any ISVNRemote
* operations using this session.
- * @return The revision of the file that was retreived.
+ * @return The revision of the file that was retrieved.
* @throws ClientException
*/
long getFile(long revision, String path,
@@ -295,7 +295,7 @@ public interface ISVNRemote
* The implementations of <code>dirents</code> and
* <code>properties</code> may not perform any ISVNRemote
* operations using this session.
- * @return The revision of the directory that was retreived.
+ * @return The revision of the directory that was retrieved.
* @throws ClientException
*/
long getDirectory(long revision, String path,
@@ -305,7 +305,7 @@ public interface ISVNRemote
throws ClientException;
/**
- * Retreive the merginfo for <code>paths</code>, whose elements
+ * Retrieve the merginfo for <code>paths</code>, whose elements
* are relative to the session's URL. The request will fail if any
* one of <code>paths</code> does not exist in the given
* <code>revision</code>.
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java?rev=1567096&r1=1567095&r2=1567096&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java Tue Feb 11 12:54:31 2014
@@ -97,7 +97,7 @@ public interface ISVNRepos {
* @param end the last revision to be dumped
* @param incremental the dump will be incremantal
* @param useDeltas the dump will contain deltas between nodes
- * @param callback the callback to recieve notifications
+ * @param callback the callback to receive notifications
* @throws ClientException throw in case of problem
*/
public abstract void dump(File path, OutputStream dataOut,
@@ -258,7 +258,7 @@ public interface ISVNRepos {
* @param path the path to the repository
* @param start the first revision
* @param end the last revision
- * @param callback the callback to recieve notifications
+ * @param callback the callback to receive notifications
* @throws ClientException If an error occurred.
*/
public abstract void verify(File path, Revision start, Revision end,
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java?rev=1567096&r1=1567095&r2=1567096&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java Tue Feb 11 12:54:31 2014
@@ -756,14 +756,14 @@ public class SVNClient implements SVNCli
}
public String getLogMessage(
- Set<org.apache.subversion.javahl.CommitItem> elementsToBeCommited)
+ Set<org.apache.subversion.javahl.CommitItem> elementsToBeCommitted)
{
CommitItem[] aElements =
- new CommitItem[elementsToBeCommited.size()];
+ new CommitItem[elementsToBeCommitted.size()];
int i = 0;
for (org.apache.subversion.javahl.CommitItem item
- : elementsToBeCommited)
+ : elementsToBeCommitted)
{
aElements[i] = new CommitItem(item);
i++;
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1567096&r1=1567095&r2=1567096&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java Tue Feb 11 12:54:31 2014
@@ -1427,7 +1427,7 @@ public class BasicTests extends SVNTests
/**
* Test the basic SVNClient.cleanup functionality.
* Without a way to force a lock, this test just verifies
- * the method can be called succesfully.
+ * the method can be called successfully.
* @throws Throwable
*/
public void testBasicCleanup() throws Throwable
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java?rev=1567096&r1=1567095&r2=1567096&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java Tue Feb 11 12:54:31 2014
@@ -184,7 +184,7 @@ class SVNTests extends TestCase
}
}
- // if not already set, get a usefull value for rootDir
+ // if not already set, get a useful value for rootDir
if (rootDirectoryName == null)
rootDirectoryName = System.getProperty("test.rootdir");
if (rootDirectoryName == null)
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java?rev=1567096&r1=1567095&r2=1567096&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java Tue Feb 11 12:54:31 2014
@@ -1250,7 +1250,7 @@ public class BasicTests extends SVNTests
/**
* Test the basic SVNClient.cleanup functionality.
* Without a way to force a lock, this test just verifies
- * the method can be called succesfully.
+ * the method can be called successfully.
* @throws Throwable
*/
public void testBasicCleanup() throws Throwable
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java?rev=1567096&r1=1567095&r2=1567096&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java Tue Feb 11 12:54:31 2014
@@ -158,7 +158,7 @@ class SVNTests extends TestCase
private void init()
{
- // if not already set, get a usefull value for rootDir
+ // if not already set, get a useful value for rootDir
if (rootDirectoryName == null)
rootDirectoryName = System.getProperty("test.rootdir");
if (rootDirectoryName == null)