46470 - webclient has hardcoded dependency on JDK 1.2

Status: VERIFIED FIXED

Description

[edburns]

From: Rajaram Ganeshan <[e-mail]>
To: "'Ed Burns'" <[e-mail]>
Subject: RE: Webclient in Java 1.1
Date: Wed, 17 May 2000 09:21:46 -0700
Content-Type: multipart/mixed;
	boundary="----_=_NextPart_000_01BFC01B.FECB0552"
MIME-Version: 1.0

I added a couple of defines to jni_util.h
#define JNI_VERSION_1_1 0x00010001
#define JNI_VERSION_1_2 0x00010002
(could use an environment variable setting 
that includes them or not depending on version of
Java).
The only other change (on the C++ side) was to 
jni_util.cpp in the JNU_CallMethodByNameV(..)
I have attached the file. 
On the java side I made the following changes:
1) I converted test package to use Swing.
2) Added a window to show event notifications in
EMWindow.java
3) Added an event queue to NativeEventThread.java
in nativeEventOccurred method. It is implemented
by NativeEventAdapter.java.
4) There were only a few places where you were
relying on 1.2 functionality - please search for
"Rajaram" in the code to find these changes.
I have attached a zip file - modified_classes.zip that has all the 
classes.

Rajaram.

Comment 1

[edburns]

I accept.

Comment 2

[edburns]

Created attachment 11925 [details]
Proposed fix.

Comment 3

[edburns]

Created attachment 11926 [details]
modified file with fix.

Comment 4

[Jason Mawsdsley]

Created attachment 14789 [details] [diff] [review]
Cleaner IMHO fix for the 1.2.x dependencies.

Comment 5

[Jason Mawsdsley]

Make sure you apply the patch in the $MOZILLA/java directory.

Hope this helps,
Jason Mawdsley ( [e-mail] )
Louis-Philippe Gagnon ( [e-mail] )

Comment 6

[edburns]

Created attachment 14803 [details]
tar.gz of fix for this bug, third iteration: applied to tree.

Comment 7

[edburns]

Created attachment 14804 [details] [diff] [review]
cvs diff -u of fix for this bug, third iteration.

Comment 8

[edburns]

Created attachment 14805 [details] [diff] [review]
cvs diff of fix for this bug, third iteration

Comment 9

[edburns]

Added CC.

Ashu, can you please unpack 
http://bugzilla.mozilla.org/showattachment.cgi?attach_id=14803 
into your mozilla java directory and test that this doesn't break Solaris 
(Sparc and Intel)?

You need to run dos2unix on each file after unpacking.  Just copy and past this 
into a command line while in the java directory:

dos2unix webclient/classes_spec/org/mozilla/webclient/test/DOMTreeModel.java  
webclient/classes_spec/org/mozilla/webclient/test/DOMTreeModel.java ;dos2unix 
webclient/classes_spec/org/mozilla/webclient/test/DOMViewerFrame.java  
webclient/classes_spec/org/mozilla/webclient/test/DOMViewerFrame.java ;dos2unix 
webclient/classes_spec/org/mozilla/webclient/test/EMWindow.java  
webclient/classes_spec/org/mozilla/webclient/test/EMWindow.java ;dos2unix 
webclient/classes_spec/org/mozilla/webclient/wrapper_native/BookmarksImpl.java  
webclient/classes_spec/org/mozilla/webclient/wrapper_native/BookmarksImpl.java ;
dos2unix 
webclient/classes_spec/org/mozilla/webclient/wrapper_native/NativeEventThread.ja
va  
webclient/classes_spec/org/mozilla/webclient/wrapper_native/NativeEventThread.ja
va ;dos2unix webclient/src_moz/CBrowserContainer.cpp  
webclient/src_moz/CBrowserContainer.cpp ;dos2unix 
webclient/src_moz/nsActions.cpp  webclient/src_moz/nsActions.cpp ;dos2unix 
webclient/src_share/jni_util.cpp  webclient/src_share/jni_util.cpp ;dos2unix 
webclient/src_share/jni_util.h webclient/src_share/jni_util_export.cpp 
webclient/src_share/jni_util.h webclient/src_share/jni_util_export.cpp;

Make sure it's ALL ON ONE LINE!

Comment 10

[Ashu Kulkarni]

Checked this on solaris Sparc & Intel. Compiles and run without any problems.

_Ashu

Comment 11

[edburns]

Ashu: thanks, I'll check this in, then tag the tree so we can proceed with 
getting up to the tip.

Comment 12

[edburns]

Fix checked in.

Comment 13

[Vladimir Strigun]

verified with mozilla branch NETSCAPE_6_2_RELEASE and blackwood sources from 
trunk.
Alexey, please change QA contact. I can't do this

Comment 14

[Alexei V. Mokeev]

Verified.