Author: jamessan
Date: Fri Dec 21 04:21:55 2018
New Revision: 1849449
URL: http://svn.apache.org/viewvc?rev=1849449&view=rev
Log:
Fix various warnings in javahl
[in subversion/bindings/javahl]
* src/org/apache/subversion/javahl/types/RevisionRange.java,
tests/org/apache/subversion/javahl/BasicTests.java,
tests/org/apache/subversion/javahl/SVNRemoteTests.java:
Use "Long.valueOf(long)" instead of deprecated "new Long(long)"
* native/RemoteSession.cpp, native/RemoteSession.h,
native/org_apache_subversion_javahl_remote_RemoteSession.cpp,
native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp,
native/org_apache_subversion_javahl_util_PropLib.cpp: Rename "jvalue"
variables to fix -Wshadow warnings for jvalue symbol in jni.h
Modified:
subversion/trunk/subversion/bindings/javahl/native/RemoteSession.cpp
subversion/trunk/subversion/bindings/javahl/native/RemoteSession.h
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.cpp
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
Modified: subversion/trunk/subversion/bindings/javahl/native/RemoteSession.cpp
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/RemoteSession.cpp?rev=1849449&r1=1849448&r2=1849449&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/RemoteSession.cpp
(original)
+++ subversion/trunk/subversion/bindings/javahl/native/RemoteSession.cpp Fri
Dec 21 04:21:55 2018
@@ -427,31 +427,31 @@ byte_array_to_svn_string(JNIByteArray& a
void
RemoteSession::changeRevisionProperty(
jlong jrevision, jstring jname,
- jbyteArray jold_value, jbyteArray jvalue)
+ jbyteArray jold_propval, jbyteArray jpropval)
{
JNIStringHolder name(jname);
if (JNIUtil::isExceptionThrown())
return;
- JNIByteArray old_value(jold_value);
+ JNIByteArray old_propval(jold_propval);
if (JNIUtil::isExceptionThrown())
return;
- JNIByteArray value(jvalue);
+ JNIByteArray propval(jpropval);
if (JNIUtil::isExceptionThrown())
return;
SVN::Pool subPool(pool);
- svn_string_t* const* p_old_value = NULL;
- svn_string_t* const str_old_value =
- byte_array_to_svn_string(old_value, subPool);
- if (str_old_value)
- p_old_value = &str_old_value;
+ svn_string_t* const* p_old_propval = NULL;
+ svn_string_t* const str_old_propval =
+ byte_array_to_svn_string(old_propval, subPool);
+ if (str_old_propval)
+ p_old_propval = &str_old_propval;
SVN_JNI_ERR(svn_ra_change_rev_prop2(m_session,
svn_revnum_t(jrevision),
- name, p_old_value,
- byte_array_to_svn_string(value, subPool),
+ name, p_old_propval,
+ byte_array_to_svn_string(propval,
subPool),
subPool.getPool()), );
}
Modified: subversion/trunk/subversion/bindings/javahl/native/RemoteSession.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/RemoteSession.h?rev=1849449&r1=1849448&r2=1849449&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/RemoteSession.h
(original)
+++ subversion/trunk/subversion/bindings/javahl/native/RemoteSession.h Fri Dec
21 04:21:55 2018
@@ -71,8 +71,8 @@ class RemoteSession : public SVNBase
jlong getLatestRevision();
jlong getRevisionByTimestamp(jlong jtimestamp);
void changeRevisionProperty(jlong jrevision, jstring jname,
- jbyteArray jold_value,
- jbyteArray jvalue);
+ jbyteArray jold_propval,
+ jbyteArray jpropval);
jobject getRevisionProperties(jlong jrevision);
jbyteArray getRevisionProperty(jlong jrevision, jstring jname);
jlong getFile(jlong jrevision, jstring jpath,
Modified:
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp?rev=1849449&r1=1849448&r2=1849449&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp
(original)
+++
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp
Fri Dec 21 04:21:55 2018
@@ -157,13 +157,13 @@ Java_org_apache_subversion_javahl_remote
JNIEXPORT void JNICALL
Java_org_apache_subversion_javahl_remote_RemoteSession_nativeChangeRevisionProperty(
JNIEnv *env, jobject jthis, jlong jrevision, jstring jname,
- jbyteArray jold_value, jbyteArray jvalue)
+ jbyteArray jold_propval, jbyteArray jpropval)
{
JNIEntry(RemoteSession, nativeChangeRevisionProperty);
RemoteSession *ras = RemoteSession::getCppObject(jthis);
CPPADDR_NULL_PTR(ras, );
- return ras->changeRevisionProperty(jrevision, jname, jold_value, jvalue);
+ return ras->changeRevisionProperty(jrevision, jname, jold_propval, jpropval);
}
JNIEXPORT jobject JNICALL
Modified:
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp?rev=1849449&r1=1849448&r2=1849449&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
(original)
+++
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
Fri Dec 21 04:21:55 2018
@@ -185,12 +185,12 @@ Java_org_apache_subversion_javahl_util_C
JNIEXPORT void JNICALL
Java_org_apache_subversion_javahl_util_ConfigImpl_00024Category_set_1str(
JNIEnv* env, jobject jthis, jstring jcategory, jlong jcontext,
- jstring jsection, jstring joption, jstring jvalue)
+ jstring jsection, jstring joption, jstring jconfigval)
{
JNIEntry(ConfigImpl$Category, set_str);
const ImplContext ctx(env, jthis, jcategory, jcontext, jsection, joption);
- JNIStringHolder value(jvalue);
+ JNIStringHolder value(jconfigval);
if (JNIUtil::isJavaExceptionThrown())
return;
@@ -202,27 +202,27 @@ Java_org_apache_subversion_javahl_util_C
JNIEXPORT void JNICALL
Java_org_apache_subversion_javahl_util_ConfigImpl_00024Category_set_1bool(
JNIEnv* env, jobject jthis, jstring jcategory, jlong jcontext,
- jstring jsection, jstring joption, jboolean jvalue)
+ jstring jsection, jstring joption, jboolean jconfigval)
{
JNIEntry(ConfigImpl$Category, set_bool);
const ImplContext ctx(env, jthis, jcategory, jcontext, jsection, joption);
svn_config_set_bool(ctx.m_config,
ctx.m_section.c_str(), ctx.m_option.c_str(),
- bool(jvalue));
+ bool(jconfigval));
}
JNIEXPORT void JNICALL
Java_org_apache_subversion_javahl_util_ConfigImpl_00024Category_set_1long(
JNIEnv* env, jobject jthis, jstring jcategory, jlong jcontext,
- jstring jsection, jstring joption, jlong jvalue)
+ jstring jsection, jstring joption, jlong jconfigval)
{
JNIEntry(ConfigImpl$Category, set_long);
const ImplContext ctx(env, jthis, jcategory, jcontext, jsection, joption);
svn_config_set_int64(ctx.m_config,
ctx.m_section.c_str(), ctx.m_option.c_str(),
- apr_int64_t(jvalue));
+ apr_int64_t(jconfigval));
}
JNIEXPORT jobject JNICALL
@@ -287,16 +287,16 @@ Java_org_apache_subversion_javahl_util_C
jstring jname = JNIUtil::makeJString(name);
if (JNIUtil::isJavaExceptionThrown())
return false;
- jstring jvalue = JNIUtil::makeJString(value);
+ jstring jconfigval = JNIUtil::makeJString(value);
if (JNIUtil::isJavaExceptionThrown())
return false;
- e->CallVoidMethod(jh, mid, jname, jvalue);
+ e->CallVoidMethod(jh, mid, jname, jconfigval);
if (JNIUtil::isJavaExceptionThrown())
return false;
e->DeleteLocalRef(jname);
- e->DeleteLocalRef(jvalue);
+ e->DeleteLocalRef(jconfigval);
return true;
}
Modified:
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.cpp
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.cpp?rev=1849449&r1=1849448&r2=1849449&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.cpp
(original)
+++
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.cpp
Fri Dec 21 04:21:55 2018
@@ -216,7 +216,7 @@ private:
JNIEXPORT jbyteArray JNICALL
Java_org_apache_subversion_javahl_util_PropLib_checkNodeProp(
JNIEnv* jenv, jobject jthis,
- jstring jname, jbyteArray jvalue, jstring jpath, jobject jkind,
+ jstring jname, jbyteArray jpropval, jstring jpath, jobject jkind,
jstring jmime_type, jobject jfile_contents,
jboolean jskip_some_checks)
{
@@ -228,7 +228,7 @@ Java_org_apache_subversion_javahl_util_P
SVN_JAVAHL_OLDSTYLE_EXCEPTION_CHECK(env);
const Java::String name_str(env, jname);
- const Java::ByteArray value(env, jvalue);
+ const Java::ByteArray value(env, jpropval);
const Java::String path_str(env, jpath);
const Java::String mime_type_str(env, jmime_type);
Java::InputStream file_contents(env, jfile_contents);
Modified:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java?rev=1849449&r1=1849448&r2=1849449&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java
Fri Dec 21 04:21:55 2018
@@ -160,7 +160,7 @@ public class RevisionRange implements Co
{
val = ((Revision.Number) rev).getNumber();
}
- return new Long(val);
+ return Long.valueOf(val);
}
public int hashCode()
Modified:
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1849449&r1=1849448&r2=1849449&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Fri Dec 21 04:21:55 2018
@@ -2736,7 +2736,7 @@ public class BasicTests extends SVNTests
public void singleMessage(Set<ChangePath> changedPaths,
long revision, Map<String, byte[]> revprops,
boolean hasChildren)
- { revList.add(new Long(revision)); }
+ { revList.add(Long.valueOf(revision)); }
});
long[] revisions = new long[revList.size()];
Modified:
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java?rev=1849449&r1=1849448&r2=1849449&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
Fri Dec 21 04:21:55 2018
@@ -1383,9 +1383,9 @@ public class SVNRemoteTests extends SVNT
{
ISVNRemote session = getSession();
- Long expected = new Long(1L);
+ Long expected = Long.valueOf(1L);
ArrayList<Long> revs = new ArrayList<Long>(3);
- revs.add(new Long(0L));
+ revs.add(Long.valueOf(0L));
revs.add(expected);
Map<Long, String> locs = session.getLocations("A", 1, revs);
