Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrant Gayed2008-08-21 15:21:26 -0400
committerGrant Gayed2008-08-21 15:21:26 -0400
commita0da108b2e83cc0f19b1498864209f67b245f35e (patch)
tree18720ffa4e464744e47c451871f1e4e327479268
parentfa4dfef3c26d3ca87162170c85daacd89680beb9 (diff)
downloadeclipse.platform.swt-a0da108b2e83cc0f19b1498864209f67b245f35e.tar.gz
eclipse.platform.swt-a0da108b2e83cc0f19b1498864209f67b245f35e.tar.xz
eclipse.platform.swt-a0da108b2e83cc0f19b1498864209f67b245f35e.zip
revert nsID.toString()
-rw-r--r--bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties3
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp13
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp5
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsID.java10
6 files changed, 2 insertions, 31 deletions
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties
index 496175c137..d0ebcb280b 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties
@@ -1313,9 +1313,6 @@ XPCOM_nsID_Equals=flags=cpp
XPCOM_nsID_Equals_0=cast=(nsID *)
XPCOM_nsID_Equals_1=cast=(nsID *),flags=struct
-XPCOM_nsID_ToString=flags=cpp
-XPCOM_nsID_ToString_0=cast=(nsID *)
-
XPCOM_nsID_delete=flags=delete
XPCOM_nsID_delete_0=cast=(nsID *)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp
index de0eb98552..07b9dce31f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp
@@ -3246,19 +3246,6 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(nsID_1Equals)
}
#endif
-#ifndef NO_nsID_1ToString
-extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(nsID_1ToString)(JNIEnv *env, jclass that, jint arg0);
-JNIEXPORT jint JNICALL XPCOM_NATIVE(nsID_1ToString)
- (JNIEnv *env, jclass that, jint arg0)
-{
- jint rc = 0;
- XPCOM_NATIVE_ENTER(env, that, nsID_1ToString_FUNC);
- rc = (jint)((nsID *)arg0)->ToString();
- XPCOM_NATIVE_EXIT(env, that, nsID_1ToString_FUNC);
- return rc;
-}
-#endif
-
#ifndef NO_nsID_1delete
extern "C" JNIEXPORT void JNICALL XPCOM_NATIVE(nsID_1delete)(JNIEnv *env, jclass that, jint arg0);
JNIEXPORT void JNICALL XPCOM_NATIVE(nsID_1delete)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp
index 9792dcedef..b276290c48 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp
@@ -14,8 +14,8 @@
#ifdef NATIVE_STATS
-int XPCOM_nativeFunctionCount = 171;
-int XPCOM_nativeFunctionCallCount[171];
+int XPCOM_nativeFunctionCount = 170;
+int XPCOM_nativeFunctionCallCount[170];
char * XPCOM_nativeFunctionNames[] = {
"Call",
"NS_1GetComponentManager",
@@ -184,7 +184,6 @@ char * XPCOM_nativeFunctionNames[] = {
"nsEmbedString_1new__",
"nsEmbedString_1new___3C",
"nsID_1Equals",
- "nsID_1ToString",
"nsID_1delete",
"nsID_1new",
"strlen_1PRUnichar",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h
index 9096c24f45..11990c6ae7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h
@@ -192,7 +192,6 @@ typedef enum {
nsEmbedString_1new___FUNC,
nsEmbedString_1new___3C_FUNC,
nsID_1Equals_FUNC,
- nsID_1ToString_FUNC,
nsID_1delete_FUNC,
nsID_1new_FUNC,
strlen_1PRUnichar_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
index b072592c81..a2f889c443 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
@@ -140,7 +140,6 @@ public static final native int /*long*/ nsEmbedCString_get(int /*long*/ ptr);
public static final native void nsID_delete(int /*long*/ ptr);
public static final native int /*long*/ nsID_new();
public static final native int nsID_Equals(int /*long*/ ptr, int /*long*/ other);
-public static final native int /*long*/ nsID_ToString(int /*long*/ ptr);
public static final native int /*long*/ nsEmbedString_new();
public static final native int /*long*/ nsEmbedString_new(char[] aString);
public static final native void nsEmbedString_delete(int /*long*/ ptr);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsID.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsID.java
index 0dc566872d..6cb2dc0ec8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsID.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsID.java
@@ -73,14 +73,4 @@ public void Parse (String aIDStr) {
for (; i < 36; i++) m3[7] = (byte)((m3[7] << 4) + Integer.parseInt (aIDStr.substring (i, i + 1), 16));
}
-public String toString () {
- int /*long*/ ptr = XPCOM.nsID_new ();
- XPCOM.memmove (ptr, this, nsID.sizeof);
- int /*long*/ string = XPCOM.nsID_ToString (ptr);
- XPCOM.nsID_delete (ptr);
- int size = XPCOM.strlen (string);
- byte[] bytes = new byte[size];
- XPCOM.memmove (bytes, string, size);
- return new String (bytes);
-}
} \ No newline at end of file

Back to the top