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/07/07 01:07:24 UTC
svn commit: r1500338 - in
/subversion/trunk/subversion/bindings/javahl/native: CommitEditor.cpp
PropertyTable.cpp PropertyTable.h RevpropTable.cpp RevpropTable.h
SVNClient.cpp SVNClient.h org_apache_subversion_javahl_SVNClient.cpp
Author: brane
Date: Sat Jul 6 23:07:23 2013
New Revision: 1500338
URL: http://svn.apache.org/r1500338
Log:
Rename the RevpropTable class in the JavaHL native implementation, since it's
no longer used only for revision properties.
[in subversion/bindings/javahl/native]
* PropertyTable.h: Renamed from RevpropTable.h.
Rename all instances of RevpropTable to PropertyTable.
* PropertyTable.cpp: Renamed from RevpropTable.cpp.
Rename all instances of RevpropTable to PropertyTable.
* CommitEditor.cpp, SVNClient.h, SVNClient.cpp,
org_apache_subversion_javahl_SVNClient.cpp:
Rename all instances of RevpropTable to PropertyTable.
Added:
subversion/trunk/subversion/bindings/javahl/native/PropertyTable.cpp
- copied, changed from r1500334, subversion/trunk/subversion/bindings/javahl/native/RevpropTable.cpp
subversion/trunk/subversion/bindings/javahl/native/PropertyTable.h
- copied, changed from r1500331, subversion/trunk/subversion/bindings/javahl/native/RevpropTable.h
Removed:
subversion/trunk/subversion/bindings/javahl/native/RevpropTable.cpp
subversion/trunk/subversion/bindings/javahl/native/RevpropTable.h
Modified:
subversion/trunk/subversion/bindings/javahl/native/CommitEditor.cpp
subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
subversion/trunk/subversion/bindings/javahl/native/SVNClient.h
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
Modified: subversion/trunk/subversion/bindings/javahl/native/CommitEditor.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CommitEditor.cpp?rev=1500338&r1=1500337&r2=1500338&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CommitEditor.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CommitEditor.cpp Sat Jul 6 23:07:23 2013
@@ -30,7 +30,7 @@
#include "Iterator.h"
#include "JNIByteArray.h"
#include "LockTokenTable.h"
-#include "RevpropTable.h"
+#include "PropertyTable.h"
#include "RemoteSession.h"
#include <apr_tables.h>
@@ -89,7 +89,7 @@ CommitEditor::CommitEditor(RemoteSession
&m_callback_session_uuid,
pool.getPool()),);
- RevpropTable revprops(jrevprops, true);
+ PropertyTable revprops(jrevprops, true);
if (JNIUtil::isJavaExceptionThrown())
return;
LockTokenTable lock_tokens(jlock_tokens);
@@ -264,7 +264,7 @@ void CommitEditor::addDirectory(jstring
Iterator children(jchildren);
if (JNIUtil::isJavaExceptionThrown())
return;
- RevpropTable properties(jproperties, true);
+ PropertyTable properties(jproperties, true);
if (JNIUtil::isJavaExceptionThrown())
return;
@@ -289,7 +289,7 @@ void CommitEditor::addFile(jstring jrelp
SVN_JNI_ERR(m_session->m_context->checkCancel(m_session->m_context),);
InputStream contents(jcontents);
- RevpropTable properties(jproperties, true);
+ PropertyTable properties(jproperties, true);
if (JNIUtil::isJavaExceptionThrown())
return;
@@ -341,7 +341,7 @@ void CommitEditor::alterDirectory(jstrin
Iterator children(jchildren);
if (JNIUtil::isJavaExceptionThrown())
return;
- RevpropTable properties(jproperties, true);
+ PropertyTable properties(jproperties, true);
if (JNIUtil::isJavaExceptionThrown())
return;
@@ -365,7 +365,7 @@ void CommitEditor::alterFile(jstring jre
SVN_JNI_ERR(m_session->m_context->checkCancel(m_session->m_context),);
InputStream contents(jcontents);
- RevpropTable properties(jproperties, true);
+ PropertyTable properties(jproperties, true);
if (JNIUtil::isJavaExceptionThrown())
return;
Copied: subversion/trunk/subversion/bindings/javahl/native/PropertyTable.cpp (from r1500334, subversion/trunk/subversion/bindings/javahl/native/RevpropTable.cpp)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/PropertyTable.cpp?p2=subversion/trunk/subversion/bindings/javahl/native/PropertyTable.cpp&p1=subversion/trunk/subversion/bindings/javahl/native/RevpropTable.cpp&r1=1500334&r2=1500338&rev=1500338&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/RevpropTable.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/PropertyTable.cpp Sat Jul 6 23:07:23 2013
@@ -20,11 +20,11 @@
* ====================================================================
* @endcopyright
*
- * @file RevpropTable.cpp
- * @brief Implementation of the class RevpropTable
+ * @file PropertyTable.cpp
+ * @brief Implementation of the class PropertyTable
*/
-#include "RevpropTable.h"
+#include "PropertyTable.h"
#include "JNIUtil.h"
#include "JNIStringHolder.h"
#include "JNIByteArray.h"
@@ -36,13 +36,13 @@
#include "svn_props.h"
#include <iostream>
-RevpropTable::~RevpropTable()
+PropertyTable::~PropertyTable()
{
if (m_revpropTable != NULL)
JNIUtil::getEnv()->DeleteLocalRef(m_revpropTable);
}
-apr_hash_t *RevpropTable::hash(const SVN::Pool &pool, bool nullIfEmpty)
+apr_hash_t *PropertyTable::hash(const SVN::Pool &pool, bool nullIfEmpty)
{
if (m_revprops.size() == 0 && nullIfEmpty)
return NULL;
@@ -73,7 +73,7 @@ apr_hash_t *RevpropTable::hash(const SVN
return revprop_table;
}
-RevpropTable::RevpropTable(jobject jrevpropTable, bool bytearray_values)
+PropertyTable::PropertyTable(jobject jrevpropTable, bool bytearray_values)
{
m_revpropTable = jrevpropTable;
Copied: subversion/trunk/subversion/bindings/javahl/native/PropertyTable.h (from r1500331, subversion/trunk/subversion/bindings/javahl/native/RevpropTable.h)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/PropertyTable.h?p2=subversion/trunk/subversion/bindings/javahl/native/PropertyTable.h&p1=subversion/trunk/subversion/bindings/javahl/native/RevpropTable.h&r1=1500331&r2=1500338&rev=1500338&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/RevpropTable.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/PropertyTable.h Sat Jul 6 23:07:23 2013
@@ -20,8 +20,8 @@
* ====================================================================
* @endcopyright
*
- * @file RevpropTable.h
- * @brief Interface of the class RevpropTable
+ * @file PropertyTable.h
+ * @brief Interface of the class PropertyTable
*/
#ifndef REVPROPTABLE_H
@@ -36,14 +36,14 @@ struct apr_hash_t;
#include <map>
#include <string>
-class RevpropTable
+class PropertyTable
{
private:
std::map<std::string, std::string> m_revprops;
jobject m_revpropTable;
public:
- RevpropTable(jobject jrevpropTable, bool bytearray_values=false);
- ~RevpropTable();
+ PropertyTable(jobject jrevpropTable, bool bytearray_values=false);
+ ~PropertyTable();
apr_hash_t *hash(const SVN::Pool &pool, bool nullIfEmpty = true);
};
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=1500338&r1=1500337&r2=1500338&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Sat Jul 6 23:07:23 2013
@@ -51,7 +51,7 @@
#include "CommitMessage.h"
#include "EnumMapper.h"
#include "StringArray.h"
-#include "RevpropTable.h"
+#include "PropertyTable.h"
#include "DiffOptions.h"
#include "CreateJ.h"
#include "svn_auth.h"
@@ -319,7 +319,7 @@ jlong SVNClient::checkout(const char *mo
}
void SVNClient::remove(Targets &targets, CommitMessage *message, bool force,
- bool keep_local, RevpropTable &revprops,
+ bool keep_local, PropertyTable &revprops,
CommitCallback *callback)
{
SVN::Pool subPool(pool);
@@ -419,7 +419,7 @@ jlongArray SVNClient::update(Targets &ta
void SVNClient::commit(Targets &targets, CommitMessage *message,
svn_depth_t depth, bool noUnlock, bool keepChangelist,
- StringArray &changelists, RevpropTable &revprops,
+ StringArray &changelists, PropertyTable &revprops,
CommitCallback *callback)
{
SVN::Pool subPool(pool);
@@ -444,7 +444,7 @@ void SVNClient::commit(Targets &targets,
void SVNClient::copy(CopySources ©Sources, const char *destPath,
CommitMessage *message, bool copyAsChild,
bool makeParents, bool ignoreExternals,
- RevpropTable &revprops, CommitCallback *callback)
+ PropertyTable &revprops, CommitCallback *callback)
{
SVN::Pool subPool(pool);
@@ -473,7 +473,7 @@ void SVNClient::copy(CopySources ©So
void SVNClient::move(Targets &srcPaths, const char *destPath,
CommitMessage *message, bool force, bool moveAsChild,
bool makeParents, bool metadataOnly, bool allowMixRev,
- RevpropTable &revprops, CommitCallback *callback)
+ PropertyTable &revprops, CommitCallback *callback)
{
SVN::Pool subPool(pool);
@@ -498,7 +498,7 @@ void SVNClient::move(Targets &srcPaths,
}
void SVNClient::mkdir(Targets &targets, CommitMessage *message,
- bool makeParents, RevpropTable &revprops,
+ bool makeParents, PropertyTable &revprops,
CommitCallback *callback)
{
SVN::Pool subPool(pool);
@@ -616,7 +616,7 @@ void SVNClient::doImport(const char *pat
CommitMessage *message, svn_depth_t depth,
bool noIgnore, bool noAutoProps,
bool ignoreUnknownNodeTypes,
- RevpropTable &revprops,
+ PropertyTable &revprops,
ImportFilterCallback *ifCallback,
CommitCallback *commitCallback)
{
@@ -905,7 +905,7 @@ void SVNClient::propertySetRemote(const
const char *name,
CommitMessage *message,
JNIByteArray &value, bool force,
- RevpropTable &revprops,
+ PropertyTable &revprops,
CommitCallback *callback)
{
SVN::Pool subPool(pool);
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.h?rev=1500338&r1=1500337&r2=1500338&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.h Sat Jul 6 23:07:23 2013
@@ -53,7 +53,7 @@ class PatchCallback;
class ChangelistCallback;
class CommitMessage;
class StringArray;
-class RevpropTable;
+class PropertyTable;
class DiffOptions;
#include "svn_types.h"
#include "svn_client.h"
@@ -87,7 +87,7 @@ class SVNClient :public SVNBase
void propertySetRemote(const char *path, long base_rev, const char *name,
CommitMessage *message,
JNIByteArray &value, bool force,
- RevpropTable &revprops, CommitCallback *callback);
+ PropertyTable &revprops, CommitCallback *callback);
void properties(const char *path, Revision &revision,
Revision &pegRevision, svn_depth_t depth,
StringArray &changelists, ProplistCallback *callback);
@@ -115,7 +115,7 @@ class SVNClient :public SVNBase
void doImport(const char *path, const char *url, CommitMessage *message,
svn_depth_t depth, bool noIgnore, bool noAutoProps,
bool ignoreUnknownNodeTypes,
- RevpropTable &revprops, ImportFilterCallback *ifCallback,
+ PropertyTable &revprops, ImportFilterCallback *ifCallback,
CommitCallback *commitCallback);
jlong doSwitch(const char *path, const char *url, Revision &revision,
Revision &pegRevision, svn_depth_t depth,
@@ -129,18 +129,18 @@ class SVNClient :public SVNBase
svn_wc_conflict_choice_t choice);
void cleanup(const char *path);
void mkdir(Targets &targets, CommitMessage *message, bool makeParents,
- RevpropTable &revprops, CommitCallback *callback);
+ PropertyTable &revprops, CommitCallback *callback);
void move(Targets &srcPaths, const char *destPath,
CommitMessage *message, bool force, bool moveAsChild,
bool makeParents, bool metadataOnly, bool allowMixRev,
- RevpropTable &revprops, CommitCallback *callback);
+ PropertyTable &revprops, CommitCallback *callback);
void copy(CopySources ©Sources, const char *destPath,
CommitMessage *message, bool copyAsChild, bool makeParents,
- bool ignoreExternals, RevpropTable &revprops,
+ bool ignoreExternals, PropertyTable &revprops,
CommitCallback *callback);
void commit(Targets &targets, CommitMessage *message, svn_depth_t depth,
bool noUnlock, bool keepChangelist,
- StringArray &changelists, RevpropTable &revprops,
+ StringArray &changelists, PropertyTable &revprops,
CommitCallback *callback);
jlongArray update(Targets &targets, Revision &revision, svn_depth_t depth,
bool depthIsSticky, bool makeParents, bool ignoreExternals,
@@ -149,7 +149,7 @@ class SVNClient :public SVNBase
bool no_ignore, bool no_autoprops, bool add_parents);
void revert(const char *path, svn_depth_t depth, StringArray &changelists);
void remove(Targets &targets, CommitMessage *message, bool force,
- bool keep_local, RevpropTable &revprops,
+ bool keep_local, PropertyTable &revprops,
CommitCallback *callback);
jlong checkout(const char *moduleName, const char *destPath,
Revision &revision, Revision &pegRevsion, svn_depth_t depth,
Modified: subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp?rev=1500338&r1=1500337&r2=1500338&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp Sat Jul 6 23:07:23 2013
@@ -50,7 +50,7 @@
#include "ImportFilterCallback.h"
#include "ChangelistCallback.h"
#include "StringArray.h"
-#include "RevpropTable.h"
+#include "PropertyTable.h"
#include "VersionExtended.h"
#include "DiffOptions.h"
#include "svn_version.h"
@@ -384,7 +384,7 @@ Java_org_apache_subversion_javahl_SVNCli
if (JNIUtil::isExceptionThrown())
return;
- RevpropTable revprops(jrevpropTable);
+ PropertyTable revprops(jrevpropTable);
if (JNIUtil::isExceptionThrown())
return;
@@ -498,7 +498,7 @@ Java_org_apache_subversion_javahl_SVNCli
if (JNIUtil::isExceptionThrown())
return;
- RevpropTable revprops(jrevpropTable);
+ PropertyTable revprops(jrevpropTable);
if (JNIUtil::isExceptionThrown())
return;
@@ -539,7 +539,7 @@ Java_org_apache_subversion_javahl_SVNCli
if (JNIUtil::isExceptionThrown())
return;
- RevpropTable revprops(jrevpropTable);
+ PropertyTable revprops(jrevpropTable);
if (JNIUtil::isExceptionThrown())
return;
@@ -577,7 +577,7 @@ Java_org_apache_subversion_javahl_SVNCli
if (JNIUtil::isExceptionThrown())
return;
- RevpropTable revprops(jrevpropTable);
+ PropertyTable revprops(jrevpropTable);
if (JNIUtil::isExceptionThrown())
return;
@@ -610,7 +610,7 @@ Java_org_apache_subversion_javahl_SVNCli
if (JNIUtil::isExceptionThrown())
return;
- RevpropTable revprops(jrevpropTable);
+ PropertyTable revprops(jrevpropTable);
if (JNIUtil::isExceptionThrown())
return;
@@ -761,7 +761,7 @@ Java_org_apache_subversion_javahl_SVNCli
if (JNIUtil::isExceptionThrown())
return;
- RevpropTable revprops(jrevpropTable);
+ PropertyTable revprops(jrevpropTable);
if (JNIUtil::isExceptionThrown())
return;
@@ -1012,7 +1012,7 @@ Java_org_apache_subversion_javahl_SVNCli
if (JNIUtil::isExceptionThrown())
return;
- RevpropTable revprops(jrevpropTable);
+ PropertyTable revprops(jrevpropTable);
if (JNIUtil::isExceptionThrown())
return;