Merged branch JAVADEV_PR3_20001002 into trunk.

git-svn-id: svn://10.0.0.236/trunk@82247 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2000-11-02 23:33:21 +00:00
parent 19a05b26cb
commit aee4ebbf93
71 changed files with 1537 additions and 521 deletions

View File

@@ -76,9 +76,12 @@ ifneq ($(PACKAGE_BUILD),)
if test ! -d $(PACKAGE_LIB) ; then mkdir $(PACKAGE_LIB) ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/blackwood.$(VERSION_NUMBER).jar ; then rm -f $(PACKAGE_LIB)/blackwood.$(VERSION_NUMBER).jar ; else true ; fi ;
if test ! -d $(PACKAGE_LIB)/blackwood.jar ; then rm -f $(PACKAGE_LIB)/blackwood.jar ; else true ; fi ;
jar -xvf $(topsrcdir)/java/external/dom2.jar $(topsrcdir)/dist/classes/.
jar -cvf $(PACKAGE_LIB)/blackwood.$(VERSION_NUMBER).jar $(topsrcdir)/dist/classes/org
ln -s blackwood.$(VERSION_NUMBER).jar $(PACKAGE_LIB)/blackwood.jar
cd $(topsrcdir)/dist/classes ; \
jar -xvf ../../java/external/dom2.jar ; \
jar -cvfM0 blackwood.$(VERSION_NUMBER).jar org ; \
cp blackwood.$(VERSION_NUMBER).jar ../javadev/lib/blackwood.$(VERSION_NUMBER).jar ;
cd $(topsrcdir)/dist/javadev/lib ; \
ln -s blackwood.$(VERSION_NUMBER).jar $(PACKAGE_LIB)/blackwood.jar ;
endif
doc::

View File

@@ -20,6 +20,62 @@
* Contributor(s): Ed Burns <edburns@acm.org>
*/
/*
* W3C® IPR SOFTWARE NOTICE
* Copyright © 1994-2000 World Wide Web Consortium, (Massachusetts
* Institute of Technology, Institut National de Recherche en
* Informatique et en Automatique, Keio University). All Rights
* Reserved. http://www.w3.org/Consortium/Legal/
* This W3C work (including software, documents, or other related items) is
* being provided by the copyright holders under the following
* license. By obtaining, using and/or copying this work, you (the
* licensee) agree that you have read, understood, and will comply with
* the following terms and conditions:
* Permission to use, copy, and modify this software and its documentation,
* with or without modification, for any purpose and without fee or
* royalty is hereby granted, provided that you include the following on
* ALL copies of the software and documentation or portions thereof,
* including modifications, that you make:
* The full text of this NOTICE in a location viewable to users of the
* redistributed or derivative work.
* Any pre-existing intellectual property disclaimers, notices, or terms
* and conditions. If none exist, a short notice of the following form
* (hypertext is preferred, text is permitted) should be used within the
* body of any redistributed or derivative code: "Copyright ©
* [$date-of-software] World Wide Web Consortium, (Massachusetts
* Institute of Technology, Institut National de Recherche en
* Informatique et en Automatique, Keio University). All Rights
* Reserved. http://www.w3.org/Consortium/Legal/"
* Notice of any changes or modifications to the W3C files, including
* the date changes were made. (We recommend you provide URIs to the
* location from which the code is derived.)
* THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT
* HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
* INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR
* FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR
* DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
* TRADEMARKS OR OTHER RIGHTS.
* COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,
* SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE
* SOFTWARE OR DOCUMENTATION.
* The name and trademarks of copyright holders may NOT be used in
* advertising or publicity pertaining to the software without specific,
* written prior permission. Title to copyright in this software and any
* associated documentation will at all times remain with copyright
* holders.
*/
package org.mozilla.webclient;
import java.util.Properties;

View File

@@ -54,7 +54,7 @@ import org.w3c.dom.Document;
* This is a test application for using the BrowserControl.
*
* @version $Id: EMWindow.java,v 1.21 2000-09-20 21:53:01 edburns%acm.org Exp $
* @version $Id: EMWindow.java,v 1.22 2000-11-02 23:33:10 edburns%acm.org Exp $
*
* @see org.mozilla.webclient.BrowserControlFactory
@@ -113,34 +113,34 @@ public class EMWindow extends Frame implements DialogClient, ActionListener, Doc
// Create the Menu Bar
menuBar = new MenuBar();
this.setMenuBar(menuBar);
Menu fileMenu = new Menu("File");
// Menu fileMenu = new Menu("File");
Menu viewMenu = new Menu("View");
Menu searchMenu = new Menu("Search");
// Menu searchMenu = new Menu("Search");
Menu editMenu = new Menu("Edit");
MenuItem newItem = new MenuItem("New Window");
MenuItem closeItem = new MenuItem("Close");
MenuItem findItem = new MenuItem("Find");
MenuItem findNextItem = new MenuItem("Find Next");
// MenuItem newItem = new MenuItem("New Window");
// MenuItem closeItem = new MenuItem("Close");
// MenuItem findItem = new MenuItem("Find");
// MenuItem findNextItem = new MenuItem("Find Next");
MenuItem sourceItem = new MenuItem("View Page Source");
MenuItem pageInfoItem = new MenuItem("View Page Info");
MenuItem selectAllItem = new MenuItem("Select All");
MenuItem copyItem = new MenuItem("Copy");
menuBar.add(fileMenu);
// menuBar.add(fileMenu);
menuBar.add(viewMenu);
menuBar.add(searchMenu);
// menuBar.add(searchMenu);
menuBar.add(editMenu);
fileMenu.add(newItem);
newItem.addActionListener(this);
fileMenu.add(closeItem);
closeItem.addActionListener(this);
searchMenu.add(findItem);
findItem.addActionListener(this);
searchMenu.add(findNextItem);
findNextItem.addActionListener(this);
// fileMenu.add(newItem);
// newItem.addActionListener(this);
// fileMenu.add(closeItem);
// closeItem.addActionListener(this);
// searchMenu.add(findItem);
// findItem.addActionListener(this);
// searchMenu.add(findNextItem);
// findNextItem.addActionListener(this);
viewMenu.add(sourceItem);
sourceItem.addActionListener(this);
viewMenu.add(pageInfoItem);
pageInfoItem.addActionListener(this);
// viewMenu.add(pageInfoItem);
// pageInfoItem.addActionListener(this);
editMenu.add(selectAllItem);
selectAllItem.addActionListener(this);
editMenu.add(copyItem);
@@ -165,8 +165,8 @@ public class EMWindow extends Frame implements DialogClient, ActionListener, Doc
stopButton.setEnabled(false);
refreshButton = makeItem(buttonsPanel, "Refresh", 3, 0, 1, 1, 0.0, 0.0);
refreshButton.setEnabled(false);
makeItem(buttonsPanel, "Bookmarks", 4, 0, 1, 1, 0.0, 0.0);
makeItem(buttonsPanel, "DOMViewer", 5, 0, 1, 1, 0.0, 0.0);
// makeItem(buttonsPanel, "Bookmarks", 4, 0, 1, 1, 0.0, 0.0);
// makeItem(buttonsPanel, "DOMViewer", 5, 0, 1, 1, 0.0, 0.0);
// Create the control panel
controlPanel = new Panel();
@@ -312,7 +312,7 @@ public void delete()
domViewer.setVisible(false);
domViewer.dispose();
domViewer = null;
}
}
BrowserControlFactory.deleteBrowserControl(browserControl);
browserControl = null;
this.hide();

View File

@@ -103,18 +103,23 @@ public void findInPage(String stringToFind, boolean forward, boolean matchCase)
ParameterCheck.nonNull(stringToFind);
myFactory.throwExceptionIfNotInitialized();
synchronized(myBrowserControl) {
/* synchronized(myBrowserControl) {
nativeFindInPage(nativeWebShell, stringToFind, forward, matchCase);
}
}*/
throw new UnimplementedException("\nUnimplementedException -----\n API Function CurrentPage::findInPage is not implemented in Webclient release 0.9\n");
}
public void findNextInPage(boolean forward)
{
myFactory.throwExceptionIfNotInitialized();
synchronized(myBrowserControl) {
/* synchronized(myBrowserControl) {
nativeFindNextInPage(nativeWebShell, forward);
}
}*/
throw new UnimplementedException("\nUnimplementedException -----\n API Function CurrentPage::findNextInPage is not implemented in Webclient release 0.9\n");
}
public String getCurrentURL()
@@ -211,9 +216,11 @@ public void resetFind()
{
myFactory.throwExceptionIfNotInitialized();
synchronized(myBrowserControl) {
/* synchronized(myBrowserControl) {
nativeResetFind(nativeWebShell);
}
}*/
throw new UnimplementedException("\nUnimplementedException -----\n API Function CurrentPage::resetFind is not implemented in Webclient release 0.9\n");
}
public void selectAll()
@@ -261,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.8 2000-07-22 02:48:25 edburns%acm.org Exp $");
Log.setApplicationVersionDate("$Id: CurrentPageImpl.java,v 1.9 2000-11-02 23:33:12 edburns%acm.org Exp $");
}

View File

@@ -146,7 +146,7 @@ WindowControlImpl.java
public void delete()
{
nativeWebShell = -1;
System.out.println("debug: edburns: ImplObjectNative.delete()");
System.out.println("ImplObjectNative.delete()");
super.delete();
}

View File

@@ -114,7 +114,7 @@ public Object newImpl(String interfaceName,
interfaceName +
": not implemented.");
}
System.out.println("debug: edburns: native library does implement " +
System.out.println("native library does implement " +
interfaceName);
if (BrowserControl.WINDOW_CONTROL_NAME == interfaceName) {
result = new WindowControlImpl(this, browserControl);
@@ -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.2 2000-03-07 22:10:08 ashuk%eng.sun.com Exp $");
Log.setApplicationVersionDate("$Id: WrapperFactoryImpl.java,v 1.3 2000-11-02 23:33:13 edburns%acm.org Exp $");
}