You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2009/07/03 15:01:55 UTC
svn commit: r790893 - in /commons/sandbox/runtime/trunk/src/main:
java/org/apache/commons/runtime/ native/shared/ native/test/
Author: mturk
Date: Fri Jul 3 13:01:54 2009
New Revision: 790893
URL: http://svn.apache.org/viewvc?rev=790893&view=rev
Log:
rename NativePointer - part2
Modified:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/AbstractPointer.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Pointer.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Pointer32.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Pointer64.java
commons/sandbox/runtime/trunk/src/main/native/shared/clazz.c
commons/sandbox/runtime/trunk/src/main/native/shared/pointer.c
commons/sandbox/runtime/trunk/src/main/native/test/testcase.c
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/AbstractPointer.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/AbstractPointer.java?rev=790893&r1=790892&r2=790893&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/AbstractPointer.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/AbstractPointer.java Fri Jul 3 13:01:54 2009
@@ -22,7 +22,7 @@
* </p>
* @since Runtime 1.0
*/
-abstract class NativePointer implements Pointer
+abstract class AbstractPointer implements Pointer
{
/**
@@ -50,7 +50,7 @@
* Pointer can only be created from the native code.
* Suppress any instantiation except from internal classes.
*/
- protected NativePointer()
+ protected AbstractPointer()
{
// No Instance
}
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Pointer.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Pointer.java?rev=790893&r1=790892&r2=790893&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Pointer.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Pointer.java Fri Jul 3 13:01:54 2009
@@ -28,7 +28,7 @@
/**
* Represents a C/C++ NULL {@code pointer}.
*/
- public static final Pointer NULL = NativePointer.NULL;
+ public static final Pointer NULL = AbstractPointer.NULL;
/**
* Address of the internal pointer.
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Pointer32.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Pointer32.java?rev=790893&r1=790892&r2=790893&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Pointer32.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Pointer32.java Fri Jul 3 13:01:54 2009
@@ -25,7 +25,7 @@
* </p>
* @since Runtime 1.0
*/
-class Pointer32 extends NativePointer {
+class Pointer32 extends AbstractPointer {
protected int CLEANUP;
protected int POINTER;
Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Pointer64.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Pointer64.java?rev=790893&r1=790892&r2=790893&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Pointer64.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Pointer64.java Fri Jul 3 13:01:54 2009
@@ -24,7 +24,7 @@
* </p>
* @since Runtime 1.0
*/
-class Pointer64 extends NativePointer {
+class Pointer64 extends AbstractPointer {
protected long CLEANUP;
protected long POINTER;
Modified: commons/sandbox/runtime/trunk/src/main/native/shared/clazz.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/clazz.c?rev=790893&r1=790892&r2=790893&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/clazz.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/clazz.c Fri Jul 3 13:01:54 2009
@@ -371,7 +371,7 @@
/* Forward class loading declarations */
ACR_CLASS_LDEC(Descriptor);
-ACR_CLASS_LDEC(NativePointer);
+ACR_CLASS_LDEC(AbstractPointer);
ACR_CLASS_LDEC(DirectBuffer);
ACR_CLASS_LDEC(MbString);
ACR_CLASS_LDEC(Group);
@@ -382,7 +382,7 @@
{
ACR_CLASS_LRUN(Descriptor);
- ACR_CLASS_LRUN(NativePointer);
+ ACR_CLASS_LRUN(AbstractPointer);
ACR_CLASS_LRUN(DirectBuffer);
ACR_CLASS_LRUN(MbString);
ACR_CLASS_LRUN(Group);
@@ -399,7 +399,7 @@
{
ACR_CLASS_URUN(Descriptor);
- ACR_CLASS_URUN(NativePointer);
+ ACR_CLASS_URUN(AbstractPointer);
ACR_CLASS_URUN(DirectBuffer);
ACR_CLASS_URUN(MbString);
ACR_CLASS_URUN(Group);
Modified: commons/sandbox/runtime/trunk/src/main/native/shared/pointer.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/pointer.c?rev=790893&r1=790892&r2=790893&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/pointer.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/pointer.c Fri Jul 3 13:01:54 2009
@@ -82,7 +82,7 @@
};
-ACR_CLASS_LDEF(NativePointer)
+ACR_CLASS_LDEF(AbstractPointer)
{
int rv;
@@ -96,7 +96,7 @@
return ACR_SUCCESS;
}
-ACR_CLASS_UDEF(NativePointer)
+ACR_CLASS_UDEF(AbstractPointer)
{
ACR_UnloadClass(_E, &_clazzn);
}
@@ -111,7 +111,7 @@
static int initp0(JNIEnv *_E)
{
- ACR_CLASS_LRUN(NativePointer);
+ ACR_CLASS_LRUN(AbstractPointer);
return 0;
}
@@ -123,7 +123,7 @@
}
#endif
-ACR_JNI_EXPORT_DECLARE(jobject, NativePointer, nullp0)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(jobject, AbstractPointer, nullp0)(ACR_JNISTDARGS)
{
UNREFERENCED_O;
if (!_clazzn.i) {
@@ -132,7 +132,7 @@
return ACR_NewPointer(_E, 0, 0, NULL);
}
-ACR_JNI_EXPORT_DECLARE(void, NativePointer, cleanup0)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(void, AbstractPointer, cleanup0)(ACR_JNISTDARGS)
{
if (_clazzn.i && J4MID(0000)) {
acr_pointer_cleanup_fn_t *cleanup;
@@ -157,7 +157,7 @@
}
-ACR_JNI_EXPORT_DECLARE(void, NativePointer, cleanup1)(ACR_JNISTDARGS)
+ACR_JNI_EXPORT_DECLARE(void, AbstractPointer, cleanup1)(ACR_JNISTDARGS)
{
if (_clazzn.i && J4MID(0000)) {
acr_pointer_cleanup_fn_t *cleanup;
Modified: commons/sandbox/runtime/trunk/src/main/native/test/testcase.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/test/testcase.c?rev=790893&r1=790892&r2=790893&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/test/testcase.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/test/testcase.c Fri Jul 3 13:01:54 2009
@@ -205,11 +205,11 @@
return a;
}
-ACR_CLASS_LDEC(NativePointer);
+ACR_CLASS_LDEC(AbstractPointer);
ACR_JNI_EXPORT_DECLARE(jint, TestPrivate, test016)(ACR_JNISTDARGS, jint d)
{
- ACR_CLASS_LRUN(NativePointer);
+ ACR_CLASS_LRUN(AbstractPointer);
return 0;
}