388 Commits

Author SHA1 Message Date
edburns%acm.org
18536df439 SECTION: Changes
M build-tests.xml

- changes to make unit tests run again.

M build.xml

- updated version

- create the services definition for the webclient implementation

M classes_spec/org/mozilla/webclient/BrowserControlCanvas.java
M classes_spec/org/mozilla/webclient/BrowserControlImpl.java

- temporary hacks until we have everything migrated to the new package
  structure.

M classes_spec/org/mozilla/webclient/BrowserControlFactory.java

- Make this class be a shim to the implementation specific instance.

A classes_spec/org/mozilla/webclient/BrowserControlFactoryInterface.java

- Interface to be implemented by the webclient implementor

A classes_spec/org/mozilla/webclient/impl/BrowserControlFactoryImpl.java

- concrete implementation of BrowserControlFactoryInterface

A test/automated/src/classes/org/mozilla/webclient/BrowserControlFactoryTest.java

- test that the factory can be instantiated.

M test/automated/src/classes/org/mozilla/webclient/WebclientTestCase.java

- Make sure we have our bin dir set.


Index: build-tests.xml
===================================================================
RCS file: /cvsroot/mozilla/java/webclient/build-tests.xml,v
retrieving revision 1.1
diff -u -r1.1 build-tests.xml
--- build-tests.xml	1 Oct 2002 00:39:18 -0000	1.1
+++ build-tests.xml	6 Sep 2003 06:22:05 -0000
@@ -3,7 +3,7 @@
  SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
 -->
 
-<project name="Webclient Unit Tests" default="test.local" basedir=".">
+<project name="Webclient Unit Tests" default="run.test" basedir=".">
 
 <!--
         This is a generic build.xml file for Ant that is used to run the
@@ -75,7 +75,7 @@
 
     <path id="test.classpath">
       <pathelement location="${junit.jar}"/>
-      <pathelement location="${build.home}/classes"/>
+      <pathelement location="${build.home}"/>
       <pathelement location="${out.test.dir}/classes"/>
     </path>
 
@@ -87,6 +87,8 @@
 -->
     <target name="compile.test">
 
+        <echo message="${build.home}"/>
+
         <mkdir  dir="${out.test.dir}/classes"/>
 
         <javac srcdir="${src.test.dir}"
@@ -125,6 +127,7 @@
             <jvmarg value="-Djava.library.path=${myenv.MOZILLA_FIVE_HOME}:${myenv.MOZILLA_FIVE_HOME}/components"/>
             <jvmarg value="-DNSPR_LOG_MODULES=${myenv.NSPR_LOG_MODULES}"/>
             <jvmarg value="-DNSPR_LOG_FILE=${myenv.NSPR_LOG_FILE}"/>
+            <jvmarg value="-DBROWSER_BIN_DIR=${myenv.MOZILLA_FIVE_HOME}"/>
             <jvmarg line="${debug.jvm.args}"/>
 
 
@@ -132,7 +135,11 @@
 
             <formatter type="plain" usefile="false"/>
 
+            <test name="org.mozilla.webclient.BrowserControlFactoryTest"/>
+<!-- non-running tests 
+
             <test name="org.mozilla.webclient.wrapper_native.gtk.TestGtkBrowserControlCanvas"/>
+-->
 
         </junit>
 
Index: build.xml
===================================================================
RCS file: /cvsroot/mozilla/java/webclient/build.xml,v
retrieving revision 1.15
diff -u -r1.15 build.xml
--- build.xml	9 Jun 2003 20:05:33 -0000	1.15
+++ build.xml	6 Sep 2003 06:22:06 -0000
@@ -30,7 +30,7 @@

   <property name="Name" value="webclient"/>
   <property name="name" value="webclient"/>
-  <property name="version" value="20020916"/>
+  <property name="version" value="20030906"/>

 <!-- ************ Per user local properties ******************************* -->

@@ -85,8 +85,12 @@

       <include name="org/mozilla/webclient/*"/>
       <include name="org/mozilla/webclient/wrapper_native/*"/>
+      <include name="org/mozilla/webclient/impl/**"/>
       <include name="org/mozilla/webclient/test/*"/>
     </javac>
+
+    <mkdir dir="${build.home}/META-INF/services"/>
+    <echo file="${build.home}/META-INF/services/org.mozilla.webclient.BrowserControlFactoryInterface">org.mozilla.webclient.impl.BrowserControlFactoryImpl</echo>

   </target>

Index: classes_spec/org/mozilla/webclient/BrowserControlCanvas.java
===================================================================
RCS file: /cvsroot/mozilla/java/webclient/classes_spec/org/mozilla/webclient/BrowserControlCanvas.java,v
retrieving revision 1.5
diff -u -r1.5 BrowserControlCanvas.java
--- classes_spec/org/mozilla/webclient/BrowserControlCanvas.java	9 Apr 2003 17:42:30 -0000	1.5
+++ classes_spec/org/mozilla/webclient/BrowserControlCanvas.java	6 Sep 2003 06:22:06 -0000
@@ -114,7 +114,8 @@

 } // BrowserControlCanvas() ctor

-protected void initialize(BrowserControl controlImpl)
+// PENDING(edburns): make this protected again
+public void initialize(BrowserControl controlImpl)
 {
     ParameterCheck.nonNull(controlImpl);
     webShell = controlImpl;
Index: classes_spec/org/mozilla/webclient/BrowserControlFactory.java
===================================================================
RCS file: /cvsroot/mozilla/java/webclient/classes_spec/org/mozilla/webclient/BrowserControlFactory.java,v
retrieving revision 1.7
diff -u -r1.7 BrowserControlFactory.java
--- classes_spec/org/mozilla/webclient/BrowserControlFactory.java	1 Oct 2002 00:39:20 -0000	1.7
+++ classes_spec/org/mozilla/webclient/BrowserControlFactory.java	6 Sep 2003 06:22:06 -0000
@@ -35,22 +35,38 @@
 import java.io.File;
 import java.io.FileNotFoundException;

-/**
- *
- *  <B>BrowserControlFactory</B> creates concrete instances of BrowserControl
-
- * <B>Lifetime And Scope</B> <P>
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.HashMap;
+import java.util.Properties;

- * This is a static class, it is neven instantiated.

+/**
+ *
+ *  <p><B>BrowserControlFactory</B> uses a discovery algorithm to find
+ *  an implementation of {@link BrowserControlFactoryInterface}.  All of
+ *  the public static methods in this class simply call through to this
+ *  implemenatation instance.</p>
+ *
+ * <p>The discovery mechanism used is to look try to load a resource
+ * called
+ * <code>META-INF/services/org.mozilla.webclient.BrowserControlFactoryInterface</code>.
+ * If the resource is found, interpret it as a <code>Properties</code>
+ * file and read out its first line.  Interpret the first line as the
+ * fully qualified class name of a class that implements {@link
+ * BrowserControlFactoryInterface}.  The named class must have a public
+ * no-arg constructor.</p>
+ *
  *
  * @version $Id: BrowserControlFactory.java,v 1.7 2002/10/01 00:39:20 edburns%acm.org Exp $
  *
- * @see	org.mozilla.webclient.test.EmbeddedMozilla
-
+ *
  */

-public class BrowserControlFactory extends Object
+public class BrowserControlFactory extends Object
 {
 //
 // Protected Constants
@@ -60,24 +76,13 @@
 // Class Variables
 //

-    private static boolean appDataHasBeenSet = false;
-    private static Class browserControlCanvasClass = null;
-    private static String platformCanvasClassName = null;
-    private static String browserType = null;
-
-//
-// Instance Variables
-//
-
-// Attribute Instance Variables
-
-// Relationship Instance Variables
+private static BrowserControlFactoryInterface instance = null;

 //
 // Constructors and Initializers
 //

-public BrowserControlFactory()
+private BrowserControlFactory()
 {
     Assert.assert_it(false, "This class shouldn't be constructed.");
 }
@@ -88,179 +93,97 @@

 public static void setAppData(String absolutePathToNativeBrowserBinDir) throws FileNotFoundException, ClassNotFoundException
 {
-    BrowserControlFactory.setAppData(BrowserControl.BROWSER_TYPE_NATIVE, absolutePathToNativeBrowserBinDir);
+    getInstance().setAppData(BrowserControl.BROWSER_TYPE_NATIVE, absolutePathToNativeBrowserBinDir);
 }

-
-    /**
-
-     * This method is used to set per-application instance data, such as
-     * the location of the browser binary.
-
-     * @param myBrowserType.  Either "native" or "nonnative"
-
-     * @param absolutePathToNativeBrowserBinDir the path to the bin dir
-     * of the native browser, including the bin.  ie:
-     * "D:\Projects\mozilla\dist\win32_d.obj\bin"
-
-     */
-
 public static void setAppData(String myBrowserType, String absolutePathToNativeBrowserBinDir) throws FileNotFoundException, ClassNotFoundException
 {
-    browserType = myBrowserType;
-    if (!appDataHasBeenSet) {
-        // figure out the correct value for platformCanvasClassName
-        if (browserType.equals(BrowserControl.BROWSER_TYPE_NON_NATIVE)) {
-            platformCanvasClassName = "org.mozilla.webclient.wrapper_nonnative.JavaBrowserControlCanvas";
-        }
-        else {
-            ParameterCheck.nonNull(absolutePathToNativeBrowserBinDir);
-
-            // verify that the directory exists:
-            File binDir = new File(absolutePathToNativeBrowserBinDir);
-            if (!binDir.exists()) {
-                throw new FileNotFoundException("Directory " + absolutePathToNativeBrowserBinDir + " is not found.");
-            }
-
-            // This hack is necessary for Sun Bug #4303996
-            java.awt.Canvas c = new java.awt.Canvas();
-            platformCanvasClassName = determinePlatformCanvasClassName();
-        }
-        // end of figuring out the correct value for platformCanvasClassName
-        if (platformCanvasClassName != null) {
-            browserControlCanvasClass = Class.forName(platformCanvasClassName);
-        }
-        else {
-            throw new ClassNotFoundException("Could not determine BrowserControlCanvas class to load\n");
-        }
-
-        try {
-            BrowserControlImpl.appInitialize(browserType, absolutePathToNativeBrowserBinDir);
-        }
-        catch (Exception e) {
-            throw new ClassNotFoundException("Can't initialize native browser: " +
-                                             e.getMessage());
-        }
-        appDataHasBeenSet = true;
-    }
+    getInstance().setAppData(myBrowserType, absolutePathToNativeBrowserBinDir);
 }

 public static void appTerminate() throws Exception
 {
-    BrowserControlImpl.appTerminate();
+    getInstance().appTerminate();
 }

 public static BrowserControl newBrowserControl() throws InstantiationException, IllegalAccessException, IllegalStateException
 {
-    if (!appDataHasBeenSet) {
-        throw new IllegalStateException("Can't create BrowserControl instance: setAppData() has not been called.");
-    }
-    Assert.assert_it(null != browserControlCanvasClass);
-
-    BrowserControlCanvas newCanvas = null;
-    BrowserControl result = null;
-    newCanvas = (BrowserControlCanvas) browserControlCanvasClass.newInstance();
-    if (null != newCanvas &&
-        null != (result = new BrowserControlImpl(browserType, newCanvas))) {
-        newCanvas.initialize(result);
-    }
-
+    BrowserControl result = null;
+    result = getInstance().newBrowserControl();
     return result;
 }

-/**
-
- * BrowserControlFactory.deleteBrowserControl is called with a
- * BrowserControl instance obtained from
- * BrowserControlFactory.newBrowserControl.  This method renders the
- * argument instance completely un-usable.  It should be called when the
- * BrowserControl instance is no longer needed.  This method simply
- * calls through to the non-public BrowserControlImpl.delete() method.
-
- * @see org.mozilla.webclient.ImplObject#delete
-
- */
-
 public static void deleteBrowserControl(BrowserControl toDelete)
 {
-    ParameterCheck.nonNull(toDelete);
-    ((BrowserControlImpl)toDelete).delete();
+    getInstance().deleteBrowserControl(toDelete);
 }

 //
-// General Methods
-//
-
-/**
+// helper methods
+//

- * Called from setAppData() in the native case.  This method simply
- * figures out the proper name for the class that is the
- * BrowserControlCanvas.
-
- * @return  "org.mozilla.webclient.wrapper_native.win32.Win32BrowserControlCanvas" or "org.mozilla.webclient.wrapper_native.gtk.GtkBrowserControlCanvas"
-
- */
-
-private static String determinePlatformCanvasClassName()
+protected static BrowserControlFactoryInterface getInstance()
 {
-    String result = null;
-    // cause the native library to be loaded
-    // PENDING(edburns): do some magic to determine the right kind of
-    // MozWebShellCanvas to instantiate
-
-    // How about this:
-    // I try loading sun.awt.windows.WDrawingSurfaceInfo. If it doesn't
-    // load, then I try loading sun.awt.motif.MDrawingSufaceInfo. If
-    // none loads, then I return a error message.
-    // If you think up of a better way, let me know.
-    // -- Mark
-    // Here is what I think is a better way: query the os.name property.
-    // This works in JDK1.4, as well.
-    // -- edburns
+    if (null != instance) {
+        return instance;
+    }

-    String osName = System.getProperty("os.name");
-
-    if (null != osName) {
-       if (-1 != osName.indexOf("indows")) {
-           result = "org.mozilla.webclient.wrapper_native.win32.Win32BrowserControlCanvas";
-       }
-       else {
-           result = "org.mozilla.webclient.wrapper_native.gtk.GtkBrowserControlCanvas";
-       }
+    ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+    if (classLoader == null) {
+        throw new RuntimeException("Context ClassLoader");
     }

-    return result;
-}
-
-// ----UNIT_TEST_START
-
-//
-// Test methods
-//
-
-public static void main(String [] args)
-{
-    System.out.println("doing asserts");
-    Assert.setEnabled(true);
-    Log.setApplicationName("BrowserControlFactory");
-    Log.setApplicationVersion("0.0");
-    Log.setApplicationVersionDate("$Id: BrowserControlFactory.java,v 1.7 2002/10/01 00:39:20 edburns%acm.org Exp $");
-
-    BrowserControlCanvas canvas = null;
-    BrowserControl control = null;
+    BufferedReader reader = null;
+    InputStream stream = null;
+    String
+        className = null,
+        resourceName = "META-INF/services/org.mozilla.webclient.BrowserControlFactoryInterface";
     try {
-        BrowserControlFactory.setAppData("nonnative", args[0]);
-        control = BrowserControlFactory.newBrowserControl();
-        Assert.assert_it(control != null);
-        canvas = (BrowserControlCanvas) control.queryInterface("webclient.BrowserControlCanvas");
-        Assert.assert_it(canvas != null);
+        stream = classLoader.getResourceAsStream(resourceName);
+        if (stream != null) {
+            // Deal with systems whose native encoding is possibly
+            // different from the way that the services entry was created
+            try {
+                reader =
+                    new BufferedReader(new InputStreamReader(stream,
+                                                             "UTF-8"));
+            } catch (UnsupportedEncodingException e) {
+                reader = new BufferedReader(new InputStreamReader(stream));
+            }
+            className = reader.readLine();
+            reader.close();
+            reader = null;
+            stream = null;
+        }
+    } catch (IOException e) {
+    } catch (SecurityException e) {
+    } finally {
+        if (reader != null) {
+            try {
+                reader.close();
+            } catch (Throwable t) {
+                ;
+            }
+            reader = null;
+            stream = null;
+        }
+        if (stream != null) {
+            try {
+                stream.close();
+            } catch (Throwable t) {
+                ;
+            }
+            stream = null;
+        }
     }
-    catch (Exception e) {
-        System.out.println("\n BrowserControl not getting created \n");
-        System.out.println(e.getMessage());
+    if (null != className) {
+        try {
+            Class clazz = classLoader.loadClass(className);
+            instance = (BrowserControlFactoryInterface) (clazz.newInstance());
+        } catch (Exception e) {
+        }
     }
+    return instance;
 }
-
-// ----UNIT_TEST_END

 } // end of class BrowserControlFactory
Index: classes_spec/org/mozilla/webclient/BrowserControlImpl.java
===================================================================
RCS file: /cvsroot/mozilla/java/webclient/classes_spec/org/mozilla/webclient/BrowserControlImpl.java,v
retrieving revision 1.7
diff -u -r1.7 BrowserControlImpl.java
--- classes_spec/org/mozilla/webclient/BrowserControlImpl.java	27 Jul 2001 20:57:52 -0000	1.7
+++ classes_spec/org/mozilla/webclient/BrowserControlImpl.java	6 Sep 2003 06:22:07 -0000
@@ -30,8 +30,8 @@
 import org.mozilla.util.Utilities;


-
-class BrowserControlImpl extends Object implements BrowserControl
+// PENDING(edburns); move this inside impl package
+public class BrowserControlImpl extends Object implements BrowserControl
 {
 //
 // Protected Constants
@@ -145,8 +145,8 @@
 //
 // Class methods
 //
-
-static void appInitialize(String myBrowserType, String verifiedBinDirAbsolutePath) throws Exception
+// PENDING(edburns): make this package private again
+public static void appInitialize(String myBrowserType, String verifiedBinDirAbsolutePath) throws Exception
 {
     browserType = myBrowserType;
     if (null == wrapperFactory) {
@@ -157,7 +157,8 @@
     wrapperFactory.initialize(verifiedBinDirAbsolutePath);
 }

-static void appTerminate() throws Exception
+// PENDING(edburns): make this package private again
+public static void appTerminate() throws Exception
 {
     Assert.assert_it(null != wrapperFactory);

Index: test/automated/src/classes/org/mozilla/webclient/WebclientTestCase.java
===================================================================
RCS file: /cvsroot/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/WebclientTestCase.java,v
retrieving revision 1.1
diff -u -r1.1 WebclientTestCase.java
--- test/automated/src/classes/org/mozilla/webclient/WebclientTestCase.java	1 Oct 2002 00:39:28 -0000	1.1
+++ test/automated/src/classes/org/mozilla/webclient/WebclientTestCase.java	6 Sep 2003 06:22:08 -0000
@@ -133,6 +133,16 @@
 	
 }
 
+protected void verifyBinDirSet()
+{
+    assertTrue("BROWSER_BIN_DIR is not set",
+	       null != System.getProperty("BROWSER_BIN_DIR"));
+}
+
+protected String getBrowserBinDir() {
+    return System.getProperty("BROWSER_BIN_DIR");
+}
+
 /**
 
 * assertTrue that NSPR_LOG_FILE is set.
@@ -162,6 +172,7 @@
     // make sure we have at least PR_LOG_DEBUG set
     verifyLogModuleValueIsAtLeastN(WEBCLIENTSTUB_LOG_MODULE, 4);
     verifyLogModuleValueIsAtLeastN(WEBCLIENT_LOG_MODULE, 4);
+    verifyBinDirSet();
     if (sendOutputToFile()) {
 	verifyOutputFileIsSet();
     }


git-svn-id: svn://10.0.0.236/trunk@146592 18797224-902f-48f8-a5cc-f745e15eee43
2003-09-06 06:26:50 +00:00
edburns%acm.org
a1a59f9eb7 r=edburns
Author: Ron Capelli

These changes make webclient run with Mozilla 1.4.

Summary of changes:

  src_moz/rdf_util.cpp

    reason:  API change to RDFServiceImpl::GetResource()

  src_moz/RDFActionEvents.cpp

    reason:  API change to RDFServiceImpl::GetUnicodeResource()

  src_moz/wsRDFObserver.cpp

    reason:  member name changes to inherited nsIRDFObserver

  src_moz/CBrowserContainer.cpp

    reasons:
      - replaced obsolete/deleted nsFileSpec.h with nsCRT.h
        (to access only required/referenced function)
      - added new SetBlurSuppression and GetBlurSuppression methods
        required by change to inherited nsIBaseWindow (implementation
        copied from mozilla/xpfe/appshell/src/nsXULWindow.cpp).

  src_moz/CBrowserContainer.h

    reason:  added mBlurSuppressionLevel member variable for
             SetBlurSuppression and GetBlurSuppression methods.


The changes were relatively straightforward to identify from errors
attempting to build with Mozilla 1.4.  Testing so far indicates no
new problems have been introduced...


git-svn-id: svn://10.0.0.236/trunk@144789 18797224-902f-48f8-a5cc-f745e15eee43
2003-07-13 04:23:49 +00:00
caillon%returnzero.com
1c1e0c7bb4 Bug 209852. Remove |dont_QueryInterface|.
r=dbaron, sr=jag


git-svn-id: svn://10.0.0.236/trunk@144011 18797224-902f-48f8-a5cc-f745e15eee43
2003-06-21 00:15:41 +00:00
edburns%acm.org
8d6c06c635 Author: ron capelli
r=edburns
Enable progress notifications in IE webclient
Fix bug where history got out of synch between webclient and
native browser.


git-svn-id: svn://10.0.0.236/trunk@143516 18797224-902f-48f8-a5cc-f745e15eee43
2003-06-10 18:53:00 +00:00
edburns%acm.org
48384d7e6c author=ron capelli
r=edburns

Call clobber_all in src_ie.


git-svn-id: svn://10.0.0.236/trunk@143472 18797224-902f-48f8-a5cc-f745e15eee43
2003-06-09 20:05:36 +00:00
edburns%acm.org
a91359c022 Author: Kyle Yuan
r=edburns

bugfix from Kyle.  Prep for future work.


git-svn-id: svn://10.0.0.236/trunk@142439 18797224-902f-48f8-a5cc-f745e15eee43
2003-05-14 15:54:45 +00:00
edburns%acm.org
3d7dee72f2 r=edburns
Author: Ron Capelli <capelli@acm.org>

The following files are updated to allow use of IBM Java 1.3.x
JVMs on Linux.  Instead of statically linking libjawt.lib, the
code now dynamically links libjawt.so and then libawt.so only
if needed (similar to previous change for win32).  It should
work on Solaris, but we couldn't test that here.

    mozilla/java/webclient/src_moz/Makefile.in
    mozilla/java/webclient/src_moz/gtk/GtkBrowserControlCanvas.cpp

The following files are changed to support the ant 'clean'
target for src_ie.

    mozilla/java/webclient/build.xml
    mozilla/java/webclient/src_ie/Makefile.in

The following files are changed to disable the CurrentPage(2)
interface for IE, since it will be a while before that can be
made to work.  With these changes, IE embeds smoothly with
Navigation and History interfaces working nicely to some degree.

    mozilla/java/webclient/src_ie/WrapperFactoryImpl.cpp

mozilla/java/webclient/classes_spec/org/mozilla/webclient/test/EMWindow.java

The following file is changed so that it does not depend on
Mozilla, allowing it to be shared cleanly for IE.

    mozilla/java/webclient/src_moz/win32/Win32BrowserControlCanvas.cpp

The following file is changed to correct the list of makefiles
that need to be configured for Webclient.

    mozilla/java/makefiles

Finally, please delete the following files from CVS.

    mozilla/java/webclient/src_ie/build.xml
    mozilla/java/webclient/src_ie/Makefile.win


git-svn-id: svn://10.0.0.236/trunk@142382 18797224-902f-48f8-a5cc-f745e15eee43
2003-05-13 20:22:13 +00:00
edburns%acm.org
954ff3b7bf buildRunems_no_longer_exists
git-svn-id: svn://10.0.0.236/trunk@142380 18797224-902f-48f8-a5cc-f745e15eee43
2003-05-13 19:21:12 +00:00
edburns%acm.org
7a173a6e45 M webclient/build.xml
- src_ie has no clobber, clobber_all, or clean target.  Comment this out
  for now.

M webclient/classes_spec/org/mozilla/webclient/Prompt.java
M webclient/classes_spec/org/mozilla/webclient/test/EMWindow.java
M webclient/classes_spec/org/mozilla/webclient/test/UniversalDialog.java
M webclient/src_moz/CBrowserContainer.cpp
M webclient/src_moz/CBrowserContainer.h
M webclient/src_moz/Makefile.in
M webclient/src_moz/NativeEventThread.cpp
M webclient/src_moz/NativeEventThreadActionEvents.cpp
M webclient/src_moz/PromptActionEvents.cpp
M webclient/src_moz/PromptActionEvents.h
M webclient/src_share/jni_util.cpp
M webclient/src_share/jni_util.h

- Roll back Kyle Yuan's 20030509 change for nsIPrompt, since it seems to
  break events between the browser and the app.

R webclient/src_moz/PromptService.h
R webclient/classes_spec/org/mozilla/webclient/test/UniversalDialogData.java
R webclient/src_moz/AppComponents.cpp
R webclient/src_moz/AppComponents.h
R webclient/src_moz/PromptService.cpp

- These are new files that Kyle added.


git-svn-id: svn://10.0.0.236/trunk@142372 18797224-902f-48f8-a5cc-f745e15eee43
2003-05-13 15:22:04 +00:00
kyle.yuan%sun.com
83dadb0ac1 missing } at line 698 (the end of Java_org_mozilla_webclient_wrapper_1native_CurrentPageImpl_nativeClearAllSelections)
git-svn-id: svn://10.0.0.236/trunk@142263 18797224-902f-48f8-a5cc-f745e15eee43
2003-05-09 10:56:07 +00:00
kyle.yuan%sun.com
9308c0a46d Bug 201275 [Webclient] move Prompt code from CBrowserContainer to PromptService
r=edburns


git-svn-id: svn://10.0.0.236/trunk@142148 18797224-902f-48f8-a5cc-f745e15eee43
2003-05-06 01:50:06 +00:00
kyle.yuan%sun.com
45f77efde0 Bug 201308
Forgot to check in this new file.


git-svn-id: svn://10.0.0.236/trunk@141739 18797224-902f-48f8-a5cc-f745e15eee43
2003-04-24 06:53:03 +00:00
kyle.yuan%sun.com
c9e6faa6c0 Bug 201308 [Webclient] support nsIWindowCreator::CreateChromeWindow
r=edburns


git-svn-id: svn://10.0.0.236/trunk@141733 18797224-902f-48f8-a5cc-f745e15eee43
2003-04-24 05:55:22 +00:00
kyle.yuan%sun.com
27fd66e0c1 Bug 201273 [Webclient] add Print/Print Preview function
r=edburns


git-svn-id: svn://10.0.0.236/trunk@141350 18797224-902f-48f8-a5cc-f745e15eee43
2003-04-18 01:07:54 +00:00
edburns%acm.org
01f52fbd60 Author=Ronald Capelli <capelli@us.ibm.com>
r=edburns

This checkin makes Webclient run with IE!

Thanks Ron!

Ed


git-svn-id: svn://10.0.0.236/trunk@141070 18797224-902f-48f8-a5cc-f745e15eee43
2003-04-12 21:40:35 +00:00
edburns%acm.org
ed7795ffac Author= Daniel Park
r=edburns

SECTION: classes changes

M build.xml

- Removed spurious linebreak on Kyle's create.webclient.scripts.

M classes_spec/org/mozilla/webclient/BrowserControlCanvas.java

- Bugfix from Daniel Park

M classes_spec/org/mozilla/webclient/test/EMWindow.java

- Leverage new CurrentPage2 interface to display the Selection object.

M classes_spec/org/mozilla/webclient/wrapper_native/CurrentPageImpl.java
M classes_spec/org/mozilla/webclient/wrapper_nonnative/CurrentPageImpl.java

- Implement new methods from CurrentPage2.

M src_moz/CurrentPageActionEvents.cpp
M src_moz/CurrentPageActionEvents.h
M src_moz/CurrentPageImpl.cpp
M src_moz/gtk/GtkBrowserControlCanvasStub.cpp
M src_moz/gtk/StubFunctions.h

Native details for CurrentPage2.

SECTION: New files

A classes_spec/org/mozilla/webclient/Selection.java
A classes_spec/org/mozilla/webclient/CurrentPage2.java
A classes_spec/org/mozilla/webclient/wrapper_native/SelectionImpl.java


git-svn-id: svn://10.0.0.236/trunk@140912 18797224-902f-48f8-a5cc-f745e15eee43
2003-04-09 17:42:41 +00:00
kyle.yuan%sun.com
bf1e485891 Bug 156712 Webclient can't do File->New Window on Unix
r=edburns


git-svn-id: svn://10.0.0.236/trunk@140891 18797224-902f-48f8-a5cc-f745e15eee43
2003-04-09 01:36:03 +00:00
edburns%acm.org
ad58aa9f79 author=kyle.yuan@sun.com
r=edburns

Remove the dependency on perl for generating the runem script.


git-svn-id: svn://10.0.0.236/trunk@140843 18797224-902f-48f8-a5cc-f745e15eee43
2003-04-08 15:21:28 +00:00
kyle.yuan%sun.com
01337f4f00 Clean the old Makefile.win
git-svn-id: svn://10.0.0.236/trunk@140682 18797224-902f-48f8-a5cc-f745e15eee43
2003-04-04 06:34:30 +00:00
edburns%acm.org
1ffd35f4dc Ronald Capelli contributed this fix to make it work with Mozilla
1.3b.


git-svn-id: svn://10.0.0.236/trunk@139282 18797224-902f-48f8-a5cc-f745e15eee43
2003-03-11 18:13:22 +00:00
edburns%acm.org
54f7dceb01 Make Webclient compile and link on win32
git-svn-id: svn://10.0.0.236/trunk@136242 18797224-902f-48f8-a5cc-f745e15eee43
2003-01-13 16:36:05 +00:00
edburns%acm.org
76b8fbb022 Webclient compiles with 1.3A but does not yet link.
git-svn-id: svn://10.0.0.236/trunk@136229 18797224-902f-48f8-a5cc-f745e15eee43
2003-01-13 07:41:00 +00:00
edburns%acm.org
041819738b Checkpoint for getting webclient to build with 1.3a.
git-svn-id: svn://10.0.0.236/trunk@136193 18797224-902f-48f8-a5cc-f745e15eee43
2003-01-11 09:01:20 +00:00
edburns%acm.org
f2a2f5ed08 ra=edburns
Author: Tor Norbye <tor@eng.sun.com>

Changes to make it build on Solaris.


git-svn-id: svn://10.0.0.236/trunk@135977 18797224-902f-48f8-a5cc-f745e15eee43
2003-01-08 05:21:31 +00:00
edburns%acm.org
10769a25c7 Changes to produce proper XPI on GNU/Linux
git-svn-id: svn://10.0.0.236/trunk@135787 18797224-902f-48f8-a5cc-f745e15eee43
2003-01-02 20:37:53 +00:00
edburns%acm.org
733478e13d Set the path.
git-svn-id: svn://10.0.0.236/trunk@135761 18797224-902f-48f8-a5cc-f745e15eee43
2003-01-02 01:42:40 +00:00
edburns%acm.org
34f27d9ded Uncomment the find component changes.
git-svn-id: svn://10.0.0.236/trunk@135528 18797224-902f-48f8-a5cc-f745e15eee43
2002-12-20 22:01:44 +00:00
edburns%acm.org
c5cf4d6a65 Make it work on win32.
git-svn-id: svn://10.0.0.236/trunk@133504 18797224-902f-48f8-a5cc-f745e15eee43
2002-11-09 21:10:09 +00:00
edburns%acm.org
1a84f84b00 Make it build on win32.
git-svn-id: svn://10.0.0.236/trunk@133133 18797224-902f-48f8-a5cc-f745e15eee43
2002-11-06 07:08:30 +00:00
edburns%acm.org
92c1171044 build_with_ant
git-svn-id: svn://10.0.0.236/trunk@131027 18797224-902f-48f8-a5cc-f745e15eee43
2002-10-02 22:23:47 +00:00
edburns%acm.org
ca91238f57 Make Webclient compile and run on GNU/Linux with Mozilla 1.0.1.
Continue migration to ant.

Start out some JUnit tests.


git-svn-id: svn://10.0.0.236/trunk@130858 18797224-902f-48f8-a5cc-f745e15eee43
2002-10-01 00:39:31 +00:00
edburns%acm.org
72d64b501f Checkpoint checkin for converting webclient to building with ant.
Currently builds java classes, javah headers, and compiles src_share, src_moz,
and src_moz/gtk.


git-svn-id: svn://10.0.0.236/trunk@129922 18797224-902f-48f8-a5cc-f745e15eee43
2002-09-18 18:25:29 +00:00
edburns%acm.org
b90b9a5fa0 Force wc_share to be static
git-svn-id: svn://10.0.0.236/trunk@128675 18797224-902f-48f8-a5cc-f745e15eee43
2002-09-02 20:33:54 +00:00
edburns%acm.org
96fbcc7ad8 remove these until the can be replaced with JUnit tests
git-svn-id: svn://10.0.0.236/trunk@128624 18797224-902f-48f8-a5cc-f745e15eee43
2002-08-31 18:13:17 +00:00
edburns%acm.org
167b5b8e79 comment_out_Meta
git-svn-id: svn://10.0.0.236/trunk@128605 18797224-902f-48f8-a5cc-f745e15eee43
2002-08-31 02:09:12 +00:00
edburns%acm.org
9ad9ff18de debug_options
git-svn-id: svn://10.0.0.236/trunk@125045 18797224-902f-48f8-a5cc-f745e15eee43
2002-07-11 22:19:59 +00:00
edburns%acm.org
d2d0482cb1 debug_options
git-svn-id: svn://10.0.0.236/trunk@125044 18797224-902f-48f8-a5cc-f745e15eee43
2002-07-11 22:15:46 +00:00
edburns%acm.org
89ce8241d1 debug_options
git-svn-id: svn://10.0.0.236/trunk@125043 18797224-902f-48f8-a5cc-f745e15eee43
2002-07-11 22:12:10 +00:00
edburns%acm.org
dca1ac3c28 Patch contributed by Michal Ceresna and verified by John Marmion.
This patch makes the webclient trunk work with the MOZILLA_0_9_9_BRANCH
on linux.


git-svn-id: svn://10.0.0.236/trunk@122500 18797224-902f-48f8-a5cc-f745e15eee43
2002-06-01 19:11:44 +00:00
edburns%acm.org
08b3c4ef3a I now have webclient mostly working on win32. The following features have been tested and work well.
File->New Window

File->Close

View->View Page Source as String

Search->Find

Search->Find Next

Edit->Select All

Edit->Copy

History->Back

History->Forward

History-> <Navigation Number>

Bookmarks->Manage Bookmarks

The bookmarks window pops up and you can double click on bookmarks to
cause webclient to go to that page.

Stream->Load Stream From File...

Stream->Load Random HTML InputStream

Mouse over events work

The DOMViewer works

Navigation buttons work.

This leaves Bookmarks->Add Current Page, Bookmarks->Add Current Page in New Folder,
Profile->Create Profile, and Profile->Delete Profile. The first two should be easy,
the second two, I'll probably just take out, since their implementation was based in
BlackConnect, which is currently quite dead.

When I'm happy with the state of Webclient on win32, I'll get it working on linux.


git-svn-id: svn://10.0.0.236/trunk@121103 18797224-902f-48f8-a5cc-f745e15eee43
2002-05-08 21:55:14 +00:00
edburns%acm.org
62ce0ecc33 Manage Bookmarks now works. You can click on links and the browser will go there.
git-svn-id: svn://10.0.0.236/trunk@121042 18797224-902f-48f8-a5cc-f745e15eee43
2002-05-08 05:17:41 +00:00
edburns%acm.org
603de46e8a Make it possible to render the bookmarks tree, but you can't click on a
bookmark to open it in the browser due to a Java side deadlock.


git-svn-id: svn://10.0.0.236/trunk@120762 18797224-902f-48f8-a5cc-f745e15eee43
2002-05-04 00:30:01 +00:00
edburns%acm.org
abbf4da054 comment
git-svn-id: svn://10.0.0.236/trunk@119292 18797224-902f-48f8-a5cc-f745e15eee43
2002-04-18 19:58:58 +00:00
edburns%acm.org
739f828b40 Webclient compiles and runs with MOZILLA_0_9_9_BRANCH.
git-svn-id: svn://10.0.0.236/trunk@119082 18797224-902f-48f8-a5cc-f745e15eee43
2002-04-16 06:12:28 +00:00
edburns%acm.org
579dbe6ec7 M Makefile.win
M dom/jni/javaDOMEventsGlobals.cpp
M dom/jni/makefile.win
M dom/jni/nativeDOMProxyListener.cpp
M dom/jni/nativeDOMProxyListener.h
M dom/jni/org_mozilla_dom_events_EventImpl.cpp
M dom/src/makefile.win
M dom/src/nsJavaDOMImpl.cpp
M webclient/Makefile.win
M webclient/classes_spec/Makefile.win
M webclient/classes_spec/org/mozilla/webclient/wrapper_native/ProfileManagerImpl.java
M webclient/src_moz/CBrowserContainer.cpp
M webclient/src_moz/CurrentPageActionEvents.cpp
M webclient/src_moz/HistoryActionEvents.cpp
M webclient/src_moz/HistoryImpl.cpp
M webclient/src_moz/InputStreamShim.cpp
M webclient/src_moz/Makefile.win
M webclient/src_moz/NativeEventThread.cpp
M webclient/src_moz/NativeEventThreadActionEvents.cpp
M webclient/src_moz/NavigationActionEvents.cpp
M webclient/src_moz/NavigationImpl.cpp
M webclient/src_moz/PreferencesActionEvents.cpp
M webclient/src_moz/PromptActionEvents.cpp
M webclient/src_moz/RDFActionEvents.cpp
M webclient/src_moz/win32/Makefile.win

Changes to make webclient compile and run with MOZILLA_0_9_9_BRANCH.


git-svn-id: svn://10.0.0.236/trunk@118989 18797224-902f-48f8-a5cc-f745e15eee43
2002-04-15 17:38:52 +00:00
edburns%acm.org
33493ef450 bug: 119680
Changes to make webclient compile and minimally run with
Netscape 6.2.1.


git-svn-id: svn://10.0.0.236/trunk@112073 18797224-902f-48f8-a5cc-f745e15eee43
2002-01-14 18:04:48 +00:00
timeless%mac.com
21c081c8bc Bugzilla Bug 106386 rid source of these misspellings: persistant persistance priviledge protocal editting editted targetted targetting
r='s from many people. sr=jst


git-svn-id: svn://10.0.0.236/trunk@111049 18797224-902f-48f8-a5cc-f745e15eee43
2001-12-23 23:23:41 +00:00
edburns%acm.org
05e81fc36e 99188
r=ashuk
a=edburns

re-implement prompt for cookies.

Modified Files:
 	CBrowserContainer.cpp PromptActionEvents.cpp ns_util.cpp
 	ns_util.h


git-svn-id: svn://10.0.0.236/trunk@102852 18797224-902f-48f8-a5cc-f745e15eee43
2001-09-12 23:45:37 +00:00
edburns%acm.org
0e646abf4f 99099
r=ashuk
a=edburns
This bug fix uses os.name as the way to tell platform.


git-svn-id: svn://10.0.0.236/trunk@102676 18797224-902f-48f8-a5cc-f745e15eee43
2001-09-10 22:02:05 +00:00
edburns%acm.org
fa528e8dd7 Defining WEBCLIENT_ICE=1 will cause the ICE implemenation to be built in addition to the mozila one.
git-svn-id: svn://10.0.0.236/trunk@99995 18797224-902f-48f8-a5cc-f745e15eee43
2001-07-28 01:14:12 +00:00