Hi All,
Find the attached patch and log.
With regards
Kamesh Jayachandran
[[[
Replace tabs with spaces.
* subversion/bindings/java/javahl/native/SVNBase.cpp
* subversion/bindings/java/javahl/native/JNIThreadData.cpp
* subversion/bindings/java/javahl/native/SVNClient.cpp
* subversion/bindings/java/javahl/native/libsvnjavahl.la.c
* subversion/bindings/java/javahl/native/SVNAdmin.cpp
* subversion/bindings/java/javahl/native/JNIStackElement.cpp
* subversion/bindings/java/javahl/native/JNIUtil.h
* subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp
* subversion/bindings/java/javahl/native/JNIThreadData.h
* subversion/bindings/java/javahl/native/SVNClient.h
* subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNAdmin.cpp
* subversion/bindings/java/javahl/native/JNIUtil.cpp
* subversion/bindings/java/javahl/native/SVNAdmin.h
* subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/DirEntry.java
* subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Notify.java
* subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/NodeKind.java
Replace tabs with spaces.
Patch by: Kamesh Jayachandran <kamesh@collab.net>
]]]
Index: subversion/bindings/java/javahl/native/SVNBase.cpp
===================================================================
--- subversion/bindings/java/javahl/native/SVNBase.cpp (revision 22657)
+++ subversion/bindings/java/javahl/native/SVNBase.cpp (working copy)
@@ -74,7 +74,7 @@
SVNBase::findCppAddrFieldID(fid, className, env);
if (*fid == 0)
{
- return;
+ return;
}
env->SetLongField(jthis, *fid, 0);
if (JNIUtil::isJavaExceptionThrown())
Index: subversion/bindings/java/javahl/native/JNIThreadData.cpp
===================================================================
--- subversion/bindings/java/javahl/native/JNIThreadData.cpp (revision 22657)
+++ subversion/bindings/java/javahl/native/JNIThreadData.cpp (working copy)
@@ -37,7 +37,7 @@
m_env = NULL;
m_exceptionThrown = false;
m_requestPool = NULL;
- m_previous = NULL;
+ m_previous = NULL;
}
/**
* destroy an object
@@ -120,8 +120,8 @@
JNIUtil::handleAPRError(apr_err, "apr_threadkey_private_get");
return;
}
- JNIThreadData *newData = new JNIThreadData();
- newData->m_previous =data;
+ JNIThreadData *newData = new JNIThreadData();
+ newData->m_previous =data;
apr_err = apr_threadkey_private_set (newData, g_key);
if(apr_err)
{
@@ -142,12 +142,12 @@
JNIUtil::handleAPRError(apr_err, "apr_threadkey_private_get");
return;
}
- if(data == NULL)
- {
- return;
- }
- JNIThreadData *oldData = data->m_previous;
- delete data;
+ if(data == NULL)
+ {
+ return;
+ }
+ JNIThreadData *oldData = data->m_previous;
+ delete data;
apr_err = apr_threadkey_private_set (oldData, g_key);
if(apr_err)
{
Index: subversion/bindings/java/javahl/native/SVNClient.cpp
===================================================================
--- subversion/bindings/java/javahl/native/SVNClient.cpp (revision 22657)
+++ subversion/bindings/java/javahl/native/SVNClient.cpp (working copy)
@@ -77,7 +77,7 @@
{
static jfieldID fid = 0;
jlong cppAddr = SVNBase::findCppAddrForJObject(jthis, &fid,
- JAVA_PACKAGE"/SVNClient");
+ JAVA_PACKAGE"/SVNClient");
return (cppAddr == 0 ? NULL : reinterpret_cast<SVNClient *>(cppAddr));
}
@@ -637,7 +637,7 @@
return;
}
Err = svn_client_add3 (intPath.c_str (), recurse, force, FALSE,
- ctx, apr_pool);
+ ctx, apr_pool);
if(Err != NULL)
JNIUtil::handleSVNError(Err);
@@ -1520,7 +1520,7 @@
// we don't use any options
apr_array_header_t *options = svn_cstring_split("", " \t\n\r", TRUE,
- requestPool.pool());
+ requestPool.pool());
err = svn_client_diff2 (options,
intTarget1.c_str(),
@@ -1541,7 +1541,7 @@
if (rv != APR_SUCCESS)
{
err = svn_error_create(rv, NULL,_("Cannot close file."));
- JNIUtil::handleSVNError(err);
+ JNIUtil::handleSVNError(err);
return;
}
@@ -1598,7 +1598,7 @@
// we don't use any options
apr_array_header_t *options = svn_cstring_split("", " \t\n\r", TRUE,
- requestPool.pool());
+ requestPool.pool());
err = svn_client_diff_peg2(
options,
@@ -1620,7 +1620,7 @@
if (rv != APR_SUCCESS)
{
err = svn_error_create(rv, NULL,_("Cannot close file."));
- JNIUtil::handleSVNError(err);
+ JNIUtil::handleSVNError(err);
return;
}
@@ -2332,8 +2332,8 @@
size_t size = 0;
svn_stream_t *read_stream = createReadStream(requestPool.pool(),
- intPath.c_str(), revision,
- pegRevision, size);
+ intPath.c_str(), revision,
+ pegRevision, size);
if (read_stream == NULL)
{
return NULL;
@@ -2368,8 +2368,8 @@
}
void SVNClient::streamFileContent(const char *path, Revision &revision,
- Revision &pegRevision, jobject outputStream,
- size_t bufSize)
+ Revision &pegRevision, jobject outputStream,
+ size_t bufSize)
{
Pool requestPool;
if (path == NULL)
@@ -2392,7 +2392,7 @@
return;
}
jmethodID writeMethod = env->GetMethodID(outputStreamClass, "write",
- "([BII)V");
+ "([BII)V");
if (writeMethod == NULL)
{
return;
@@ -2412,8 +2412,8 @@
size_t contentSize = 0;
svn_stream_t* read_stream = createReadStream(requestPool.pool(), path,
- revision, pegRevision,
- contentSize);
+ revision, pegRevision,
+ contentSize);
if (read_stream == NULL)
{
return;
@@ -2447,15 +2447,15 @@
}
svn_stream_t* SVNClient::createReadStream(apr_pool_t* pool, const char *path,
- Revision& revision,
- Revision &pegRevision, size_t& size)
+ Revision& revision,
+ Revision &pegRevision, size_t& size)
{
svn_stream_t *read_stream = NULL;
if (revision.revision()->kind == svn_opt_revision_working)
{
- // We want the working copy. Going back to the server returns
- // base instead (which is not what we want).
+ // We want the working copy. Going back to the server returns
+ // base instead (which is not what we want).
apr_file_t *file = NULL;
apr_finfo_t finfo;
apr_status_t apr_err = apr_stat(&finfo, path,
@@ -2802,8 +2802,8 @@
return;
}
Err = svn_client_blame2 (intPath.c_str(), pegRevision.revision(),
- revisionStart.revision(), revisionEnd.revision(),
- blame_receiver2, callback, ctx, apr_pool);
+ revisionStart.revision(), revisionEnd.revision(),
+ blame_receiver2, callback, ctx, apr_pool);
if(Err != SVN_NO_ERROR)
{
JNIUtil::handleSVNError(Err);
@@ -2819,7 +2819,7 @@
svn_error_t *err = svn_config_ensure(configDir, requestPool.pool());
if (err)
{
- JNIUtil::handleSVNError(err);
+ JNIUtil::handleSVNError(err);
}
else
{
Index: subversion/bindings/java/javahl/native/libsvnjavahl.la.c
===================================================================
--- subversion/bindings/java/javahl/native/libsvnjavahl.la.c (revision 22657)
+++ subversion/bindings/java/javahl/native/libsvnjavahl.la.c (working copy)
@@ -23,5 +23,5 @@
JNIEXPORT jint JNICALL
JNI_OnLoad(JavaVM *vm, void *reserved)
{
- return JNI_VERSION_1_2;
+ return JNI_VERSION_1_2;
}
Index: subversion/bindings/java/javahl/native/SVNAdmin.cpp
===================================================================
--- subversion/bindings/java/javahl/native/SVNAdmin.cpp (revision 22657)
+++ subversion/bindings/java/javahl/native/SVNAdmin.cpp (working copy)
@@ -47,7 +47,7 @@
{
static jfieldID fid = 0;
jlong cppAddr = SVNBase::findCppAddrForJObject(jthis, &fid,
- JAVA_PACKAGE"/SVNAdmin");
+ JAVA_PACKAGE"/SVNAdmin");
return (cppAddr == 0 ? NULL : reinterpret_cast<SVNAdmin *>(cppAddr));
}
@@ -513,9 +513,9 @@
}
void SVNAdmin::setRevProp(const char *path, Revision &revision,
- const char *propName, const char *propValue,
- bool usePreRevPropChangeHook,
- bool usePostRevPropChangeHook)
+ const char *propName, const char *propValue,
+ bool usePreRevPropChangeHook,
+ bool usePostRevPropChangeHook)
{
Pool requestPool;
if (path == NULL)
@@ -553,14 +553,13 @@
/* If we are bypassing the hooks system, we just hit the filesystem
directly. */
- svn_string_t *propValStr = svn_string_create(propValue,
- requestPool.pool());
+ svn_string_t *propValStr = svn_string_create(propValue, requestPool.pool());
if (usePreRevPropChangeHook || usePostRevPropChangeHook)
{
err = svn_repos_fs_change_rev_prop3
(repos, revision.revision()->value.number, NULL,
propName, propValStr, usePreRevPropChangeHook,
- usePostRevPropChangeHook, NULL, NULL, requestPool.pool());
+ usePostRevPropChangeHook, NULL, NULL, requestPool.pool());
}
else
{
Index: subversion/bindings/java/javahl/native/JNIStackElement.cpp
===================================================================
--- subversion/bindings/java/javahl/native/JNIStackElement.cpp (revision 22657)
+++ subversion/bindings/java/javahl/native/JNIStackElement.cpp (working copy)
@@ -113,5 +113,5 @@
apr_snprintf(buffer, JNIUtil::formatBufferSize, "exit class %s method %s object %s", m_clazz, m_method, m_objectID);
JNIUtil::logMessage(buffer);
}
- JNIThreadData::popThreadData();
+ JNIThreadData::popThreadData();
}
Index: subversion/bindings/java/javahl/native/JNIUtil.h
===================================================================
--- subversion/bindings/java/javahl/native/JNIUtil.h (revision 22657)
+++ subversion/bindings/java/javahl/native/JNIUtil.h (working copy)
@@ -108,7 +108,7 @@
{ raiseThrowable(JAVA_PACKAGE"/JNIError", message); }
static apr_pool_t * getPool();
- static bool JNIGlobalInit(JNIEnv *env);
+ static bool JNIGlobalInit(JNIEnv *env);
static bool JNIInit(JNIEnv *env);
static JNIMutex *getGlobalPoolMutex();
enum { formatBufferSize = 2048 };
Index: subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp
===================================================================
--- subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp (revision 22657)
+++ subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp (working copy)
@@ -275,7 +275,7 @@
if (jpassword == NULL)
{
JNIUtil::raiseThrowable("java/lang/IllegalArgumentException",
- _("Provide a password (null is not supported)"));
+ _("Provide a password (null is not supported)"));
return;
}
JNIStringHolder password(jpassword);
@@ -1922,6 +1922,6 @@
JNIEXPORT void JNICALL Java_org_tigris_subversion_javahl_SVNClient_initNative
(JNIEnv *env, jclass jclazz)
{
- // No standard JNIEntry here, because this call initializes everthing
- JNIUtil::JNIGlobalInit(env);
+ // No standard JNIEntry here, because this call initializes everthing
+ JNIUtil::JNIGlobalInit(env);
}
Index: subversion/bindings/java/javahl/native/JNIThreadData.h
===================================================================
--- subversion/bindings/java/javahl/native/JNIThreadData.h (revision 22657)
+++ subversion/bindings/java/javahl/native/JNIThreadData.h (working copy)
@@ -38,8 +38,8 @@
static void del(void *);
static JNIThreadData * getThreadData();
static bool initThreadData();
- static void pushNewThreadData();
- static void popThreadData();
+ static void pushNewThreadData();
+ static void popThreadData();
JNIThreadData();
~JNIThreadData();
/**
@@ -59,10 +59,10 @@
*/
Pool *m_requestPool;
private:
- /**
- * pointer to previous thread information to enable reentrent calls
- */
- JNIThreadData *m_previous;
+ /**
+ * pointer to previous thread information to enable reentrent calls
+ */
+ JNIThreadData *m_previous;
/**
* the key to address this thread local storage
*/
Index: subversion/bindings/java/javahl/native/SVNClient.h
===================================================================
--- subversion/bindings/java/javahl/native/SVNClient.h (revision 22657)
+++ subversion/bindings/java/javahl/native/SVNClient.h (working copy)
@@ -45,10 +45,10 @@
{
public:
jobjectArray info2(const char *path, Revision &revision,
- Revision &pegRevision, bool recurse);
- void unlock(Targets &targets, bool force);
- void lock(Targets &targets, const char *comment, bool force);
- jobjectArray revProperties(jobject jthis, const char *path,
+ Revision &pegRevision, bool recurse);
+ void unlock(Targets &targets, bool force);
+ void lock(Targets &targets, const char *comment, bool force);
+ jobjectArray revProperties(jobject jthis, const char *path,
Revision &revision);
void cancelOperation();
void commitMessageHandler(CommitMessage *commitMessage);
Index: subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNAdmin.cpp
===================================================================
--- subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNAdmin.cpp (revision 22657)
+++ subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNAdmin.cpp (working copy)
@@ -441,9 +441,9 @@
/* A helper function for setRevProp() and setLog(). */
static void
setRevProp(jobject jthis, jstring jpath, jobject jrevision,
- jstring jpropName, jstring jpropValue,
- jboolean jusePreRevPropChangeHook,
- jboolean jusePostRevPropChangeHook)
+ jstring jpropName, jstring jpropValue,
+ jboolean jusePreRevPropChangeHook,
+ jboolean jusePostRevPropChangeHook)
{
SVNAdmin *cl = SVNAdmin::getCppObject(jthis);
if (cl == NULL)
@@ -477,8 +477,8 @@
}
cl->setRevProp(path, revision, propName, propValue,
- jusePreRevPropChangeHook ? true : false,
- jusePostRevPropChangeHook ? true : false);
+ jusePreRevPropChangeHook ? true : false,
+ jusePostRevPropChangeHook ? true : false);
}
/*
@@ -494,7 +494,7 @@
JNIEntry(SVNAdmin, setLog);
jstring jlogPropName = env->NewStringUTF(SVN_PROP_REVISION_LOG);
setRevProp(jthis, jpath, jrevision, jlogPropName, jmessage,
- !jbypassHooks, !jbypassHooks);
+ !jbypassHooks, !jbypassHooks);
env->DeleteLocalRef(jlogPropName);
if (JNIUtil::isJavaExceptionThrown())
{
@@ -515,7 +515,7 @@
{
JNIEntry(SVNAdmin, setRevProp);
setRevProp(jthis, jpath, jrevision, jpropName, jpropValue,
- jusePreRevPropChangeHook, jusePostRevPropChangeHook);
+ jusePreRevPropChangeHook, jusePostRevPropChangeHook);
}
/*
Index: subversion/bindings/java/javahl/native/JNIUtil.cpp
===================================================================
--- subversion/bindings/java/javahl/native/JNIUtil.cpp (revision 22657)
+++ subversion/bindings/java/javahl/native/JNIUtil.cpp (working copy)
@@ -95,12 +95,12 @@
*/
bool JNIUtil::JNIGlobalInit(JNIEnv *env)
{
- // this method has to be run only once during the run a
+ // this method has to be run only once during the run a
// programm
static bool run = false;
if(run) // already run
{
- return true;
+ return true;
}
run = true;
// do not run this part more than one time.
@@ -439,7 +439,7 @@
*/
void JNIUtil::setEnv(JNIEnv *env)
{
- JNIThreadData::pushNewThreadData();
+ JNIThreadData::pushNewThreadData();
JNIThreadData *data = JNIThreadData::getThreadData();
data->m_env = env;
data->m_exceptionThrown = false;
Index: subversion/bindings/java/javahl/native/SVNAdmin.h
===================================================================
--- subversion/bindings/java/javahl/native/SVNAdmin.h (revision 22657)
+++ subversion/bindings/java/javahl/native/SVNAdmin.h (working copy)
@@ -37,7 +37,7 @@
{
public:
void rmlocks(const char *path, Targets &locks);
- jobjectArray lslocks(const char *path);
+ jobjectArray lslocks(const char *path);
void verify(const char *path, Outputer &messageOut,
Revision &revisionStart, Revision &revisionEnd);
void setRevProp(const char *path, Revision &revision,
Index: subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/DirEntry.java
===================================================================
--- subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/DirEntry.java (revision 22657)
+++ subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/DirEntry.java (working copy)
@@ -34,31 +34,31 @@
/**
* the date of the last change in nanoseconds since 01/01/1970
*/
- private long lastChanged;
+ private long lastChanged;
/**
* the revision number of the last change
*/
- private long lastChangedRevision;
+ private long lastChangedRevision;
/**
* flag if the item has properties managed by subversion
*/
- private boolean hasProps;
+ private boolean hasProps;
/**
* the name of the author of the last change
*/
- private String lastAuthor;
+ private String lastAuthor;
/**
* the kind of the node (directory or file)
*/
- private int nodeKind;
+ private int nodeKind;
/**
* the size of the file
*/
- private long size;
+ private long size;
/**
* the pathname of the entry
*/
- private String path;
+ private String path;
/**
* this constructor is only called from the JNI code
@@ -71,43 +71,43 @@
* @param lastChanged the date of the last change
* @param lastAuthor the author of the last change
*/
- DirEntry(String path, int nodeKind, long size, boolean hasProps, long lastChangedRevision, long lastChanged, String lastAuthor)
- {
- this.path = path;
- this.nodeKind = nodeKind;
- this.size = size;
- this.hasProps = hasProps;
- this.lastChangedRevision = lastChangedRevision;
- this.lastChanged = lastChanged;
- this.lastAuthor = lastAuthor;
- }
+ DirEntry(String path, int nodeKind, long size, boolean hasProps, long lastChangedRevision, long lastChanged, String lastAuthor)
+ {
+ this.path = path;
+ this.nodeKind = nodeKind;
+ this.size = size;
+ this.hasProps = hasProps;
+ this.lastChangedRevision = lastChangedRevision;
+ this.lastChanged = lastChanged;
+ this.lastAuthor = lastAuthor;
+ }
/**
* Returns the path of the entry.
* @return the path of the entry.
*/
- public String getPath()
- {
- return path;
- }
+ public String getPath()
+ {
+ return path;
+ }
- /**
+ /**
* Returns the last time the file was changed.
- * @return the last time the file was changed.
- */
- public Date getLastChanged()
- {
- return new Date(lastChanged/1000);
- }
+ * @return the last time the file was changed.
+ */
+ public Date getLastChanged()
+ {
+ return new Date(lastChanged/1000);
+ }
- /**
+ /**
* Returns the revision of the last change.
- * @return revision of the last change as a Revision object.
- */
- public Revision.Number getLastChangedRevision()
- {
+ * @return revision of the last change as a Revision object.
+ */
+ public Revision.Number getLastChangedRevision()
+ {
return Revision.createNumber(lastChangedRevision);
- }
+ }
/**
* Returns the revision number of the last change.
@@ -122,36 +122,36 @@
* Returns if the entry has properties managed by Subversion.
* @return if the entry has properties managed by subversion.
*/
- public boolean getHasProps()
- {
- return hasProps;
- }
+ public boolean getHasProps()
+ {
+ return hasProps;
+ }
/**
* Returns the author of the last change.
* @return the author of the last change.
*/
- public String getLastAuthor()
- {
- return lastAuthor;
- }
+ public String getLastAuthor()
+ {
+ return lastAuthor;
+ }
/**
* Return the kind of entry (file or directory)
* @return the kind of the entry (file or directory) see NodeKind class
*/
- public int getNodeKind()
- {
- return nodeKind;
- }
+ public int getNodeKind()
+ {
+ return nodeKind;
+ }
- /**
+ /**
* Return the length of file test or 0 for directories
- * @return length of file text, or 0 for directories
- */
- public long getSize()
- {
- return size;
- }
+ * @return length of file text, or 0 for directories
+ */
+ public long getSize()
+ {
+ return size;
+ }
}
Index: subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Notify.java
===================================================================
--- subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Notify.java (revision 22657)
+++ subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Notify.java (working copy)
@@ -55,10 +55,10 @@
* @param action kind of action
* @return english text
*/
- public static final String getActionName(int action)
- {
- return NotifyAction.actionNames[action];
- }
+ public static final String getActionName(int action)
+ {
+ return NotifyAction.actionNames[action];
+ }
}
/**
@@ -72,9 +72,9 @@
* @param status type of the notification
* @return english text
*/
- public static final String getStatusName(int status)
- {
- return NotifyStatus.statusNames[status];
- }
+ public static final String getStatusName(int status)
+ {
+ return NotifyStatus.statusNames[status];
+ }
}
}
Index: subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/NodeKind.java
===================================================================
--- subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/NodeKind.java (revision 22657)
+++ subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/NodeKind.java (working copy)
@@ -37,20 +37,20 @@
/**
* mapping for the constants to text
*/
- private static final String[] statusNames =
- {
- "none",
- "file",
- "dir ",
- "unknown",
- };
+private static final String[] statusNames =
+{
+ "none",
+ "file",
+ "dir ",
+ "unknown",
+};
/**
* Returns the textual representation for a NodeKind
* @param kind kind of node
* @return english text
*/
- public static final String getNodeKindName(int kind)
- {
- return statusNames[kind];
- }
+ public static final String getNodeKindName(int kind)
+ {
+ return statusNames[kind];
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Dec 12 08:26:53 2006