Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Files in this Checkin:

Browse Source 
M classes_spec/org/mozilla/webclient/test/EMWindow.java
M classes_spec/org/mozilla/webclient/wrapper_native/CurrentPageImpl.java
M src_moz/CBrowserContainer.cpp
M src_moz/CBrowserContainer.h
M src_moz/NativeEventThreadActionEvents.cpp
M src_moz/WindowControlActionEvents.cpp

bug:  79278

This checkin makes webclient work with the trunk as of 7 May 2001 AM PDT.

It also adds support for PROGRESS_URL_LOAD and STATUS_URL_LOAD events.


git-svn-id: svn://10.0.0.236/trunk@94216 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2001-05-08 04:50:33 +00:00
parent d71d986cb3
commit 97942650a0
6 changed files with 241 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mozilla/java/webclient/classes_spec/org/mozilla/webclient/test/EMWindow.java
View File

@@ -57,7 +57,7 @@ import java.io.FileInputStream;
* This is a test application for using the BrowserControl.
*
* @version $Id: EMWindow.java,v 1.25 2001-04-02 21:13:48 ashuk%eng.sun.com Exp $
* @version $Id: EMWindow.java,v 1.26 2001-05-08 04:50:27 edburns%acm.org Exp $
*
* @see org.mozilla.webclient.BrowserControlFactory
@@ -641,6 +641,7 @@ private Component makeItem (Panel p, Object arg, int x, int y, int w, int h, dou
public void eventDispatched(WebclientEvent event)
{
boolean enabledState;
String status;
if (event instanceof DocumentLoadEvent) {
switch ((int) event.getType()) {
@@ -662,12 +663,20 @@ public void eventDispatched(WebclientEvent event)
forwardMenuItem.setEnabled(history.canForward());
populateHistoryMenu();
statusLabel.setText("Done.");
currentDocument = currentPage.getDOM();
// currentDocument = currentPage.getDOM();
// add the new document to the domViewer
if (null != currentDocument && null != domViewer) {
domViewer.setDocument(currentDocument);
}
// if (null != currentDocument && null != domViewer) {
// domViewer.setDocument(currentDocument);
// }
break;
case ((int) DocumentLoadEvent.PROGRESS_URL_LOAD_EVENT_MASK):
status = "Status: " + (String) event.getEventData();
statusLabel.setText(status);
break;
case ((int) DocumentLoadEvent.STATUS_URL_LOAD_EVENT_MASK):
status = "Status: " + (String) event.getEventData();
statusLabel.setText(status);
break;
}
}

4
mozilla/java/webclient/classes_spec/org/mozilla/webclient/wrapper_native/CurrentPageImpl.java
View File

@@ -72,7 +72,7 @@ public CurrentPageImpl(WrapperFactory yourFactory,
super(yourFactory, yourBrowserControl);
// force the class to be loaded, thus loading the JNI library
if (!domInitialized) {
DOMAccessor.initialize();
// DOMAccessor.initialize();
}
}
@@ -268,7 +268,7 @@ public static void main(String [] args)
Assert.setEnabled(true);
Log.setApplicationName("CurrentPageImpl");
Log.setApplicationVersion("0.0");
Log.setApplicationVersionDate("$Id: CurrentPageImpl.java,v 1.11 2001-04-02 21:13:57 ashuk%eng.sun.com Exp $");
Log.setApplicationVersionDate("$Id: CurrentPageImpl.java,v 1.12 2001-05-08 04:50:29 edburns%acm.org Exp $");
}