From e53b7fb27efcc55c7839f2912a0fe5afccc223ab Mon Sep 17 00:00:00 2001 From: "akhil.arora%sun.com" Date: Thu, 2 Sep 1999 01:41:22 +0000 Subject: [PATCH] enable Notations git-svn-id: svn://10.0.0.236/trunk@45618 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/java/dom/jni/Makefile | 11 +++++------ mozilla/java/dom/jni/Makefile.in | 3 +-- mozilla/java/dom/jni/javaDOMGlobals.cpp | 10 ---------- mozilla/java/dom/jni/javaDOMGlobals.h | 2 -- mozilla/java/dom/jni/makefile.win | 8 +++----- 5 files changed, 9 insertions(+), 25 deletions(-) diff --git a/mozilla/java/dom/jni/Makefile b/mozilla/java/dom/jni/Makefile index ef4cbe244f4..01086b063ce 100644 --- a/mozilla/java/dom/jni/Makefile +++ b/mozilla/java/dom/jni/Makefile @@ -13,10 +13,10 @@ # Inc. Portions created by Sun are Copyright (C) 1999 Sun Microsystems, # Inc. All Rights Reserved. -DEPTH = /opt/mozilla -topsrcdir = $(DEPTH) -srcdir = . -VPATH = . +DEPTH = ../../.. +topsrcdir = /opt/mozilla +srcdir = /opt/mozilla/java/dom/jni +VPATH = /opt/mozilla/java/dom/jni include $(DEPTH)/config/autoconf.mk @@ -36,11 +36,10 @@ CPPSRCS = \ org_mozilla_dom_NamedNodeMapImpl.cpp \ org_mozilla_dom_NodeImpl.cpp \ org_mozilla_dom_NodeListImpl.cpp \ + org_mozilla_dom_NotationImpl.cpp \ org_mozilla_dom_ProcessingInstructionImpl.cpp \ org_mozilla_dom_TextImpl.cpp -# org_mozilla_dom_NotationImpl.cpp \ - include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk diff --git a/mozilla/java/dom/jni/Makefile.in b/mozilla/java/dom/jni/Makefile.in index 0c1a88cf3b7..a02334c67a8 100644 --- a/mozilla/java/dom/jni/Makefile.in +++ b/mozilla/java/dom/jni/Makefile.in @@ -36,11 +36,10 @@ CPPSRCS = \ org_mozilla_dom_NamedNodeMapImpl.cpp \ org_mozilla_dom_NodeImpl.cpp \ org_mozilla_dom_NodeListImpl.cpp \ + org_mozilla_dom_NotationImpl.cpp \ org_mozilla_dom_ProcessingInstructionImpl.cpp \ org_mozilla_dom_TextImpl.cpp -# org_mozilla_dom_NotationImpl.cpp \ - include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk diff --git a/mozilla/java/dom/jni/javaDOMGlobals.cpp b/mozilla/java/dom/jni/javaDOMGlobals.cpp index 02043baed60..e8b74cc39b8 100644 --- a/mozilla/java/dom/jni/javaDOMGlobals.cpp +++ b/mozilla/java/dom/jni/javaDOMGlobals.cpp @@ -33,9 +33,7 @@ jclass JavaDOMGlobals::entityReferenceClass = NULL; jclass JavaDOMGlobals::namedNodeMapClass = NULL; jclass JavaDOMGlobals::nodeClass = NULL; jclass JavaDOMGlobals::nodeListClass = NULL; -#if 0 jclass JavaDOMGlobals::notationClass = NULL; -#endif jclass JavaDOMGlobals::processingInstructionClass = NULL; jclass JavaDOMGlobals::textClass = NULL; @@ -186,12 +184,10 @@ void JavaDOMGlobals::Initialize(JNIEnv *env) env->GetStaticFieldID(nodeClass, "TEXT_NODE", "S"); if (!nodeTypeTextFID) return; -#if 0 notationClass = env->FindClass("org/mozilla/dom/NotationImpl"); if (!notationClass) return; notationClass = (jclass) env->NewGlobalRef(notationClass); if (!notationClass) return; -#endif processingInstructionClass = env->FindClass("org/mozilla/dom/ProcessingInstructionImpl"); if (!processingInstructionClass) return; @@ -323,7 +319,6 @@ void JavaDOMGlobals::Destroy(JNIEnv *env) } nodeClass = NULL; -#if 0 env->DeleteGlobalRef(notationClass); if (env->ExceptionOccurred()) { PR_LOG(log, PR_LOG_ERROR, @@ -332,7 +327,6 @@ void JavaDOMGlobals::Destroy(JNIEnv *env) return; } notationClass = NULL; -#endif env->DeleteGlobalRef(processingInstructionClass); if (env->ExceptionOccurred()) { @@ -401,11 +395,7 @@ jobject JavaDOMGlobals::CreateNodeSubtype(JNIEnv *env, break; case nsIDOMNode::NOTATION_NODE: - PR_LOG(log, PR_LOG_ERROR, - ("JavaDOMGlobals::CreateNodeSubtype: Unsupported: allocating Node of type Notation\n")); -#if 0 clazz = notationClass; -#endif break; case nsIDOMNode::PROCESSING_INSTRUCTION_NODE: diff --git a/mozilla/java/dom/jni/javaDOMGlobals.h b/mozilla/java/dom/jni/javaDOMGlobals.h index cfd0542a996..5f712729aee 100644 --- a/mozilla/java/dom/jni/javaDOMGlobals.h +++ b/mozilla/java/dom/jni/javaDOMGlobals.h @@ -41,9 +41,7 @@ class JavaDOMGlobals { static jclass namedNodeMapClass; static jclass nodeClass; static jclass nodeListClass; -#if 0 static jclass notationClass; -#endif static jclass processingInstructionClass; static jclass textClass; diff --git a/mozilla/java/dom/jni/makefile.win b/mozilla/java/dom/jni/makefile.win index 4d0544be916..ab5bdbbb7ab 100755 --- a/mozilla/java/dom/jni/makefile.win +++ b/mozilla/java/dom/jni/makefile.win @@ -34,12 +34,11 @@ CPPSRCS= \ org_mozilla_dom_NamedNodeMapImpl.cpp \ org_mozilla_dom_NodeImpl.cpp \ org_mozilla_dom_NodeListImpl.cpp \ + org_mozilla_dom_NotationImpl.cpp \ org_mozilla_dom_ProcessingInstructionImpl.cpp \ org_mozilla_dom_TextImpl.cpp \ $(NULL) -# org_mozilla_dom_NotationImpl.cpp \ - CPP_OBJS= \ .\$(OBJDIR)\javaDOMGlobals.obj \ .\$(OBJDIR)\org_mozilla_dom_DOMAccessorImpl.obj \ @@ -50,16 +49,15 @@ CPP_OBJS= \ .\$(OBJDIR)\org_mozilla_dom_DocumentTypeImpl.obj \ .\$(OBJDIR)\org_mozilla_dom_DOMImplementationImpl.obj \ .\$(OBJDIR)\org_mozilla_dom_ElementImpl.obj \ - .\$(OBJDIR)\org_mozilla_dom_EntityImpl.cpp \ + .\$(OBJDIR)\org_mozilla_dom_EntityImpl.obj \ .\$(OBJDIR)\org_mozilla_dom_NamedNodeMapImpl.obj \ .\$(OBJDIR)\org_mozilla_dom_NodeImpl.obj \ .\$(OBJDIR)\org_mozilla_dom_NodeListImpl.obj \ + .\$(OBJDIR)\org_mozilla_dom_NotationImpl.cpp \ .\$(OBJDIR)\org_mozilla_dom_ProcessingInstructionImpl.obj \ .\$(OBJDIR)\org_mozilla_dom_TextImpl.obj \ $(NULL) -# .\$(OBJDIR)\org_mozilla_dom_NotationImpl.cpp \ - LINCS= MAKE_OBJ_TYPE = DLL