From 05667b65160623f45b5bb12039f1062336fd639c Mon Sep 17 00:00:00 2001
From: "ashuk%eng.sun.com" <ashuk%eng.sun.com>
Date: Tue, 7 Mar 2000 22:10:08 +0000
Subject: [PATCH] a=edburns r=edburns author=ashuk bug=28407

New java code for spec-compliant impl ported to solaris -- Ashu K.
---
 .../mozilla/webclient/wrapper_native/WindowControlImpl.java | 6 +++---
 .../webclient/wrapper_native/WrapperFactoryImpl.java        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/WindowControlImpl.java b/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/WindowControlImpl.java
index be22662a4ac..4a08120c1b9 100644
--- a/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/WindowControlImpl.java
+++ b/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/WindowControlImpl.java
@@ -113,7 +113,7 @@ public void createWindow(int nativeWindow, Rectangle bounds)
         synchronized(this) {
             nativeWebShell = nativeCreateInitContext(nativeWindow, bounds.x, 
                                                      bounds.y, bounds.width, 
-                                                     bounds.height);
+                                                     bounds.height, myBrowserControl);
             eventThread = new NativeEventThread("EventThread-" +
                                                 nativeWebShell,
                                                 myBrowserControl);
@@ -208,7 +208,7 @@ public native void nativeSetBounds(int webShellPtr, int x, int y,
  */
 
 public native int nativeCreateInitContext(int nativeWindow, 
-                                          int x, int y, int width, int height);
+                                          int x, int y, int width, int height, BrowserControl myBrowserControlImpl);
 
 public native void nativeMoveWindowTo(int webShellPtr, int x, int y);
 
@@ -233,7 +233,7 @@ public static void main(String [] args)
 
     Log.setApplicationName("WindowControlImpl");
     Log.setApplicationVersion("0.0");
-    Log.setApplicationVersionDate("$Id: WindowControlImpl.java,v 1.1 2000-03-04 01:10:56 edburns%acm.org Exp $");
+    Log.setApplicationVersionDate("$Id: WindowControlImpl.java,v 1.2 2000-03-07 22:10:06 ashuk%eng.sun.com Exp $");
 
     try {
         org.mozilla.webclient.BrowserControlFactory.setAppData(args[0]);
diff --git a/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/WrapperFactoryImpl.java b/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/WrapperFactoryImpl.java
index 7a9f7479af4..eab8a50dafb 100644
--- a/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/WrapperFactoryImpl.java
+++ b/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/WrapperFactoryImpl.java
@@ -149,7 +149,7 @@ public void initialize(String verifiedBinDirAbsolutePath) throws Exception
 {
     synchronized(this) {
         if (!hasBeenInitialized()) {
-            nativeInitialize(verifiedBinDirAbsolutePath);
+            nativeAppInitialize(verifiedBinDirAbsolutePath);
             initialized = true;
         }
     }
@@ -185,7 +185,7 @@ public boolean hasBeenInitialized()
 
  */
 
-private native void nativeInitialize (String verifiedBinDirAbsolutePath) throws Exception;
+private native void nativeAppInitialize (String verifiedBinDirAbsolutePath) throws Exception;
 
 /**
 
@@ -222,7 +222,7 @@ public static void main(String [] args)
     WrapperFactory me = new WrapperFactoryImpl();
     Log.setApplicationName("WrapperFactoryImpl");
     Log.setApplicationVersion("0.0");
-    Log.setApplicationVersionDate("$Id: WrapperFactoryImpl.java,v 1.1 2000-03-04 01:10:56 edburns%acm.org Exp $");
+    Log.setApplicationVersionDate("$Id: WrapperFactoryImpl.java,v 1.2 2000-03-07 22:10:08 ashuk%eng.sun.com Exp $");
 
     
 }