858 Commits

Author SHA1 Message Date
edburns%acm.org
65b19ae154 M build.xml
- Added copy.core.src target

M netbeans/build.xml

- added complie.core.src target 

M netbeans/nbproject/build-impl.xml
M netbeans/nbproject/genfiles.properties
M netbeans/nbproject/project.properties

- autogenerate changes

M netbeans/nbproject/project.xml

- rename source roots


git-svn-id: svn://10.0.0.236/trunk@221314 18797224-902f-48f8-a5cc-f745e15eee43
2007-03-05 16:35:47 +00:00
edburns%acm.org
562f0ecbca M build.xml
A mcp-test/src/main/java/cardemo/CarDemo.java
A mcp-test/src/test/java/cardemo/CarDemoTest.java

- include automated test to use MCP to test the Ajax cardemo


git-svn-id: svn://10.0.0.236/trunk@221273 18797224-902f-48f8-a5cc-f745e15eee43
2007-03-03 21:06:39 +00:00
edburns%acm.org
38884c477a M dist/netbeans/build.xml
- Add ability to debug a singe junit test

M webclient/build.xml
A webclient/classes_spec/org/mozilla/mcp/MCP.java
A webclient/classes_spec/org/mozilla/mcp/MCPLogStrings.properties

- add mcp package

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

- add getter for outputFileRoot.


git-svn-id: svn://10.0.0.236/trunk@221270 18797224-902f-48f8-a5cc-f745e15eee43
2007-03-03 20:35:14 +00:00
edburns%acm.org
b15b18becd M build.xml
A non-ide/README
A non-ide/build.properties.sample
A non-ide/build.xml
A non-ide/logging.properties
A non-ide/project.properties

- Add non-ide build file.


git-svn-id: svn://10.0.0.236/trunk@220977 18797224-902f-48f8-a5cc-f745e15eee43
2007-02-27 04:47:59 +00:00
edburns%acm.org
2844a28cb2 skip_testPrintPreview_on_XP
git-svn-id: svn://10.0.0.236/trunk@220957 18797224-902f-48f8-a5cc-f745e15eee43
2007-02-26 21:32:35 +00:00
edburns%acm.org
a39bcfd627 remove_relative_path
git-svn-id: svn://10.0.0.236/trunk@220838 18797224-902f-48f8-a5cc-f745e15eee43
2007-02-23 19:03:12 +00:00
edburns%acm.org
d74e28323c added_#
git-svn-id: svn://10.0.0.236/trunk@220836 18797224-902f-48f8-a5cc-f745e15eee43
2007-02-23 18:39:02 +00:00
edburns%acm.org
80bdfe17ce add_javadocs
git-svn-id: svn://10.0.0.236/trunk@220827 18797224-902f-48f8-a5cc-f745e15eee43
2007-02-23 17:32:11 +00:00
edburns%acm.org
4b0552e239 comment_out_browser_bin_dir
git-svn-id: svn://10.0.0.236/trunk@220823 18797224-902f-48f8-a5cc-f745e15eee43
2007-02-23 16:58:05 +00:00
edburns%acm.org
e96b508972 remove_unnecessary_build_properties
git-svn-id: svn://10.0.0.236/trunk@220822 18797224-902f-48f8-a5cc-f745e15eee43
2007-02-23 16:55:25 +00:00
edburns%acm.org
7ebb86fbca define_main_class
git-svn-id: svn://10.0.0.236/trunk@220821 18797224-902f-48f8-a5cc-f745e15eee43
2007-02-23 16:42:52 +00:00
edburns%acm.org
df3334218e automated_tests_work_fully
git-svn-id: svn://10.0.0.236/trunk@220820 18797224-902f-48f8-a5cc-f745e15eee43
2007-02-23 16:40:14 +00:00
edburns%acm.org
da5a86f64e debug_jvm_args
git-svn-id: svn://10.0.0.236/trunk@220817 18797224-902f-48f8-a5cc-f745e15eee43
2007-02-23 16:14:13 +00:00
edburns%acm.org
f2d6e9214c automated_tests_run_outside_of_workarea
git-svn-id: svn://10.0.0.236/trunk@220815 18797224-902f-48f8-a5cc-f745e15eee43
2007-02-23 15:56:08 +00:00
edburns%acm.org
886c849e54 no_need
git-svn-id: svn://10.0.0.236/trunk@220814 18797224-902f-48f8-a5cc-f745e15eee43
2007-02-23 14:41:39 +00:00
edburns%acm.org
4aefbd9bc2 make_tests_more_amenable_to_non_workspace_running
git-svn-id: svn://10.0.0.236/trunk@220813 18797224-902f-48f8-a5cc-f745e15eee43
2007-02-23 14:38:55 +00:00
edburns%acm.org
23bcb8ea6e Automated and Manual Tests Run with only one ENV var set
git-svn-id: svn://10.0.0.236/trunk@220759 18797224-902f-48f8-a5cc-f745e15eee43
2007-02-22 21:31:43 +00:00
edburns%acm.org
20b52560c7 M build.xml
M dist/build.xml
M dist/netbeans/build.xml
A dist/netbeans/logging.properties
M dist/netbeans/webclient.properties
M webclient/test/automated/src/classes/org/mozilla/webclient/WebclientTestCase.java

Make it so the automated tests run from netbeans.


git-svn-id: svn://10.0.0.236/trunk@220619 18797224-902f-48f8-a5cc-f745e15eee43
2007-02-21 01:40:44 +00:00
edburns%acm.org
7caba9a94a Prepare for 2.0 alpha 5 release
M build.xml
A netbeans/build.xml
A netbeans/manifest.mf
A netbeans/webclient.properties
A netbeans/nbproject/build-impl.xml
A netbeans/nbproject/build.properties
A netbeans/nbproject/genfiles.properties
A netbeans/nbproject/project.properties
A netbeans/nbproject/project.xml

- the default dist will include a netbeans project that builds the test
  browser and runs the unit tests.


git-svn-id: svn://10.0.0.236/trunk@220551 18797224-902f-48f8-a5cc-f745e15eee43
2007-02-19 18:32:42 +00:00
edburns%acm.org
41b5fea580 in_progress_update_for_2_0_a5_dist
git-svn-id: svn://10.0.0.236/trunk@220423 18797224-902f-48f8-a5cc-f745e15eee43
2007-02-16 19:57:59 +00:00
edburns%acm.org
9a85d29904 remove non-existant import
git-svn-id: svn://10.0.0.236/trunk@220415 18797224-902f-48f8-a5cc-f745e15eee43
2007-02-16 18:18:15 +00:00
edburns%acm.org
5648af33d6 M classes_spec/org/mozilla/webclient/CurrentPage2.java
- Add new method copyCurrentSelectionHtmlToSystemClipboard().

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

- Full support for text and html copy

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

- Exercise HTML copy.


git-svn-id: svn://10.0.0.236/trunk@220412 18797224-902f-48f8-a5cc-f745e15eee43
2007-02-16 16:03:18 +00:00
edburns%acm.org
7841b5844f Issue: 369376
M classes_spec/org/mozilla/webclient/impl/wrapper_native/CurrentPageImpl.java
M test/automated/src/classes/org/mozilla/webclient/CurrentPageTest.java

- Get the test case working.


git-svn-id: svn://10.0.0.236/trunk@220409 18797224-902f-48f8-a5cc-f745e15eee43
2007-02-16 13:29:15 +00:00
edburns%acm.org
589b161152 Issue: 369376
Workaround

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

+void addStringToTransferable(String mimeType, String text) {

  This method is called from native code when a Transferable is being
  inspected for the DataFlavors it supports.

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

- Whitespace

M webclient/src_moz/EmbedWindow.cpp
M webclient/src_moz/EmbedWindow.h

- copy code from nsPrimitiveHelpers to aid in the extraction of text
  from the nsITransferable

- Flesh out GetText(), SendTextToJava() methods.

M webclient/src_moz/Makefile.in

- Additional dependencies for nsPrimitiveHelpers copy.


git-svn-id: svn://10.0.0.236/trunk@220342 18797224-902f-48f8-a5cc-f745e15eee43
2007-02-15 22:07:28 +00:00
edburns%acm.org
4d7ecb5ce0 increase_wait_time_before_testing_bitset
git-svn-id: svn://10.0.0.236/trunk@220167 18797224-902f-48f8-a5cc-f745e15eee43
2007-02-15 04:59:50 +00:00
edburns%acm.org
6a43b0c2f6 Issue: 369376
Use the nsIClipboardDragDropHooks mechanism to manually copy over data
from the nsITransferable to java, so that java can manualy fabricate a
Transferable instance and put it on the clipboard.

M src_moz/CurrentPageImpl.cpp

- Pass the java instance to EmbedWindow::CopySelection().

M src_moz/EmbedWindow.cpp
M src_moz/EmbedWindow.h

- Modify CopySelection to take the java object instance

- Make this implement nsIClipboardDragDropHooks.  Use the
  nsICommandManager to get informed of the copy event.

- Implement ::OnCopyOrDrag() to copy the data from the nsITransferable
  over to Java.

M src_moz/Makefile.in

- declare dependency on commandhandler


git-svn-id: svn://10.0.0.236/trunk@220060 18797224-902f-48f8-a5cc-f745e15eee43
2007-02-13 17:15:43 +00:00
edburns%acm.org
345b029cb2 M webclient/build-tests.xml
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImpl.java
M webclient/src_moz/CurrentPageImpl.cpp
M webclient/src_moz/Makefile.in

- Remove bookmarks because bookmarks is not in XULRunner

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

- Disable testCopyCurrentSelectionToSystemClipboard.  Need to try with
  1.5.0.9.

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

- Account for build dir change

M webclient/test/manual/src/classes/org/mozilla/webclient/test/TestBrowser.java

- enable copy button.


git-svn-id: svn://10.0.0.236/trunk@219185 18797224-902f-48f8-a5cc-f745e15eee43
2007-01-30 18:26:37 +00:00
edburns%acm.org
e72cf3994c M dom/build.xml
M dom/jni/Makefile.in
M dom/jni/javaDOMGlobals.cpp
M dom/src/Makefile.in
M webclient/build-tests.xml
M webclient/build.xml
M webclient/src_ie/Makefile.in
M webclient/src_moz/Makefile.in
M webclient/src_moz/gtk/Makefile.in
M webclient/src_moz/motif/gtkmozilla.h
M webclient/src_share/Makefile.in

- Enable building with an objdir.  Much more civilized.  Thanks very
  much to Bradley Smedberg.


git-svn-id: svn://10.0.0.236/trunk@219157 18797224-902f-48f8-a5cc-f745e15eee43
2007-01-30 01:51:54 +00:00
edburns%acm.org
6c952371fa M webclient/build-tests.xml
- re-enable all tests, but CurrentPageTest is currently hanging.

M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java

- Use new "runUntilEventOfType" method to prevent deadlock when creating a new 
  window.

M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/NativeEventThread.java

- extract doEventLoopOnce() method from run()

- create new method runUntilEventOfType().

M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WindowControlImpl.java

- convert anonymous inner class for WCRunnable.nativeRealize into
  non-anonymous inner class of WindowControlImpl

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

- Make sure to realize the new window on the main thread.


git-svn-id: svn://10.0.0.236/trunk@218745 18797224-902f-48f8-a5cc-f745e15eee43
2007-01-22 12:35:14 +00:00
edburns%acm.org
96654f7479 M logging.properties
- use log level INFO

M webclient/build-tests.xml

- comment out broken tests.  Currently: WindowCreatorTest, CurrentPageTest

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

- Log INFO for tearDown()


git-svn-id: svn://10.0.0.236/trunk@218519 18797224-902f-48f8-a5cc-f745e15eee43
2007-01-17 16:20:54 +00:00
edburns%acm.org
9f8e8c584b Append is false
git-svn-id: svn://10.0.0.236/trunk@218516 18797224-902f-48f8-a5cc-f745e15eee43
2007-01-17 13:47:31 +00:00
edburns%acm.org
a3121edc15 M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/NativeEventThread.java
- Use JDK 1.5 ConcurrentLinkedQueue to enable moving the enqueue and
  dequeue operations out of the synchronized block.

- Use a the new "result" property on WCRunnable to convey the result
  from the run() back to the caller.

M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WCRunnable.java

- Make this an abstract class and add a read/write property called
  "result".


git-svn-id: svn://10.0.0.236/trunk@218515 18797224-902f-48f8-a5cc-f745e15eee43
2007-01-17 13:45:22 +00:00
edburns%acm.org
f80fed1778 add logging
git-svn-id: svn://10.0.0.236/trunk@218514 18797224-902f-48f8-a5cc-f745e15eee43
2007-01-17 12:59:40 +00:00
edburns%acm.org
d0b3db034a M build.properties.sample
- declare compile.source=1.5

M dom/build.xml
M plugins/build.xml
M plugins/examples/MediaPlayer/build.xml
M plugins/test/build.xml
M util/build.xml

- remove compile.source property, take it from top level build.properties

M plugins/mozilla/Makefile.in

- remove hard coded MS_SDK_HOME reference

M util/classes/org/mozilla/util/Log.java

- This class is the home to the LogStrings property for java supplement

M webclient/build-tests.xml

- copy properties file

- turn on logging

M webclient/build.xml

- remove compile.source property, take it from top level build.properties

- set a FILE_PATH_SEP property

- make run.test depend on prepare

- make run.test.browser depend on prepare

M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/BookmarksImpl.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/CocoaBrowserControlCanvas.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/CurrentPageImpl.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/HistoryImpl.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/NavigationImpl.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/PreferencesImpl.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/RDFEnumeration.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/Win32BrowserControlCanvas.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WindowControlImpl.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImpl.java

- Define toString() for all the WCRunnable and Runnable impls.

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

- Some logging.

A util/classes/org/mozilla/LogStrings.properties
A webclient/test/automated/src/classes/org/mozilla/webclient/TestLogStrings.properties

- LogStrings.properties files for tests and core impl

A logging.properties

- Logging settings for java supplement


git-svn-id: svn://10.0.0.236/trunk@218507 18797224-902f-48f8-a5cc-f745e15eee43
2007-01-17 11:43:43 +00:00
edburns%acm.org
acfdb6daf6 fix makefiles, remove external dom
git-svn-id: svn://10.0.0.236/trunk@217594 18797224-902f-48f8-a5cc-f745e15eee43
2007-01-02 03:11:23 +00:00
edburns%acm.org
a50a2627e3 M build.xml
- don't extract dom2.jar.  It's in the JDK now.

M classes/org/mozilla/dom/AttrImpl.java
M classes/org/mozilla/dom/DOMImplementationImpl.java
M classes/org/mozilla/dom/DocumentImpl.java
M classes/org/mozilla/dom/ElementImpl.java
M classes/org/mozilla/dom/EntityImpl.java
M classes/org/mozilla/dom/NodeImpl.java
M classes/org/mozilla/dom/TextImpl.java

- conform to dom in JDK 1.6 (Dom level 3)


git-svn-id: svn://10.0.0.236/trunk@217588 18797224-902f-48f8-a5cc-f745e15eee43
2007-01-01 18:29:49 +00:00
edburns%acm.org
dac867a2cc M mozilla/Makefile.in
M src/Makefile.in

- Force logging to be enabled, regardless of debugging setting.

M src/PlugletEngine.cpp

- Make sure to disable JVM debugging.


git-svn-id: svn://10.0.0.236/trunk@216477 18797224-902f-48f8-a5cc-f745e15eee43
2006-12-05 13:02:25 +00:00
edburns%acm.org
2c1be00595 forgot_to_put_into_cvs
git-svn-id: svn://10.0.0.236/trunk@215736 18797224-902f-48f8-a5cc-f745e15eee43
2006-11-23 02:23:52 +00:00
edburns%acm.org
1879d39cea Add new first argument to PlugletFactory.initialize(): the string that
is the path to the jar from which the pluglet is loaded.

SECTION: Changes

M classes/org/mozilla/pluglet/PlugletFactory.java
M classes/org/mozilla/pluglet/PlugletFactoryAdaptor.java

- Add new first argument to PlugletFactory.initialize(): the string that
  is the path to the jar from which the pluglet is loaded.

M examples/MediaPlayer/JMPlayer.java
M test/test.java

- Account for new first argument

M src/PlugletFactory.cpp

- new JNI signature for initialize.


git-svn-id: svn://10.0.0.236/trunk@215304 18797224-902f-48f8-a5cc-f745e15eee43
2006-11-15 01:11:42 +00:00
edburns%acm.org
52244de3f3 M mozilla/npAPInsIInputStreamShim.cpp
- re-enable stream loading in pluglet.


git-svn-id: svn://10.0.0.236/trunk@215044 18797224-902f-48f8-a5cc-f745e15eee43
2006-11-09 20:17:43 +00:00
edburns%acm.org
3e78a4fbf3 Memory audit of code in src directory. Found and fixed some leaks.
Declaring this directory memory clean.

M src/Pluglet.cpp
M src/Pluglet.h

- use do_GetService instead of servman->GetServiceByContractID

- do not keep a reference to plugletEngine as an ivar

M src/PlugletFactory.cpp
M src/PlugletFactory.h

- use nsnull instead of NULL

- do not keep a reference to plugletEngine as an ivar

- use PL_strdup and PL_strfree to duplicate and free strings

M src/PlugletsDir.cpp

- use PL_strdup and PL_strfree to duplicate and free strings


git-svn-id: svn://10.0.0.236/trunk@215043 18797224-902f-48f8-a5cc-f745e15eee43
2006-11-09 20:10:17 +00:00
edburns%acm.org
0eeda55b56 update
git-svn-id: svn://10.0.0.236/trunk@214610 18797224-902f-48f8-a5cc-f745e15eee43
2006-11-02 18:57:52 +00:00
edburns%acm.org
fbd0e42fb9 This change-bundle fixes memory allocation in streams. Next step is to
make a final pass to make sure we are not leaking memory.  After that, I
want to clean up the build system, and the samples.

M build.xml

- Call make export in mozilla directory

- Fix clean target

M mozilla/Makefile.in

- Added export target
M classes/org/mozilla/pluglet/PlugletLoader.java

- avoid ambiguity by casting

+	    CodeSource codesource = new CodeSource(url,(java.security.cert.Certificate []) null);

M examples/MediaPlayer/JMPlayer.java

- remove debug printfs

M mozilla/npAPInsIInputStreamShim.cpp
M mozilla/npAPInsIInputStreamShim.h

- remove debug printfs

- fix buffer allocation, refactor into its own method.

- Use NPN_Mem* methods for memory allocation.

- isolate lock access to private methods.  Avoids locking when we
  already own the lock, which would cause an assertion.

M mozilla/nppluglet.cpp

- in dtor, check for null mScriptablePeer ivar before accessing it.

M mozilla/nsScriptablePeer.cpp

- whitespace

M src/Pluglet.cpp

- get the plugletEngine from do_GetService().

M src/PlugletEngine.cpp
M src/PlugletFactory.cpp
M src/PlugletLoader.cpp

- remove debug printfs

M test/test.java

- added test finalize.


build.xml classes/org/mozilla/pluglet/PlugletLoader.java examples/MediaPlayer/JMPlayer.java mozilla/Makefile.in mozilla/npAPInsIInputStreamShim.cpp mozilla/npAPInsIInputStreamShim.h mozilla/nppluglet.cpp mozilla/nsScriptablePeer.cpp src/Pluglet.cpp src/PlugletEngine.cpp src/PlugletFactory.cpp src/PlugletLoader.cpp test/test.java


git-svn-id: svn://10.0.0.236/trunk@214609 18797224-902f-48f8-a5cc-f745e15eee43
2006-11-02 18:55:50 +00:00
timeless%mozdev.org
c6467de559 Bug 106386 Correct misspellings in source code
r=glennrp@gmail.com, bclary@bclary.com rs=brendan


git-svn-id: svn://10.0.0.236/trunk@214560 18797224-902f-48f8-a5cc-f745e15eee43
2006-11-01 23:02:18 +00:00
edburns%acm.org
b81470eb5b checkpoint
git-svn-id: svn://10.0.0.236/trunk@214162 18797224-902f-48f8-a5cc-f745e15eee43
2006-10-26 13:46:57 +00:00
edburns%acm.org
cd61788d87 A mozilla/npAPInsIInputStreamShim.cpp
A mozilla/npAPInsIInputStreamShim.h

- Shim to allow the np4xplugin API to call pass stream data to pluglet

M mozilla/Makefile.in

- Add the shim to the source files

M mozilla/nppluglet.cpp

- implement the layer that calls the shim

M test/test.html

- Pass the plugin a src of its .java file.

M test/test.java

- additional debug printout inf

mozilla/npAPInsIInputStreamShim.cpp mozilla/npAPInsIInputStreamShim.h mozilla/Makefile.in mozilla/nppluglet.cpp test/test.html test/test.java


git-svn-id: svn://10.0.0.236/trunk@214151 18797224-902f-48f8-a5cc-f745e15eee43
2006-10-26 04:19:00 +00:00
edburns%acm.org
e144e050f9 ? build
? simple
? examples/MediaPlayer/build
? examples/MediaPlayer/build.properties
? examples/MediaPlayer/build.properties.sample
? test/build
M examples/MediaPlayer/JMPlayer.java
M examples/MediaPlayer/build.xml
M examples/MediaPlayer/samples/test.html
M mozilla/nppluglet.cpp
M mozilla/nppluglet.h


git-svn-id: svn://10.0.0.236/trunk@213989 18797224-902f-48f8-a5cc-f745e15eee43
2006-10-23 05:18:19 +00:00
edburns%acm.org
8c3dc031c9 simple_pluglet_works
git-svn-id: svn://10.0.0.236/trunk@213702 18797224-902f-48f8-a5cc-f745e15eee43
2006-10-16 13:53:26 +00:00
edburns%acm.org
0ad64df91a M mozilla/Makefile.in
- add nspr to libs

M mozilla/nppluglet.cpp

- make sure to store instance pointer for return to browser, this enables
  shutdown to work properly

- When HasPlugletForMimeType is called multiple times, actually check
  the mime type.

M mozilla/nsISimplePlugin.idl

- Fix this so it's callable from JavaScript

M src/PlugletsDir.cpp

- Fix bug for multiple plugin instances

Index: mozilla/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/java/plugins/mozilla/Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 Makefile.in
--- mozilla/Makefile.in	7 Oct 2006 23:31:52 -0000	1.1
+++ mozilla/Makefile.in	14 Oct 2006 12:26:06 -0000
@@ -59,7 +59,7 @@

 XPIDLSRCS = nsISimplePlugin.idl

-SHARED_LIBRARY_LIBS = $(PLUGIN_SDK)/samples/common/$(LIB_PREFIX)plugingate_s.$(LIB_SUFFIX) ../src/$(LIB_PREFIX)pluglet_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS = $(PLUGIN_SDK)/samples/common/$(LIB_PREFIX)plugingate_s.$(LIB_SUFFIX) ../src/$(LIB_PREFIX)pluglet.$(LIB_SUFFIX) $(XPCOM_LIBS) $(NSPR_LIBS)

 ifeq ($(OS_ARCH),WINNT)
 DEFFILE = $(win_srcdir)/nppluglet.def
Index: mozilla/nppluglet.cpp
===================================================================
RCS file: /cvsroot/mozilla/java/plugins/mozilla/nppluglet.cpp,v
retrieving revision 1.3
diff -u -r1.3 nppluglet.cpp
--- mozilla/nppluglet.cpp	13 Oct 2006 14:45:14 -0000	1.3
+++ mozilla/nppluglet.cpp	14 Oct 2006 12:26:07 -0000
@@ -47,6 +47,8 @@

 #include "nsServiceManagerUtils.h"

+#include "plstr.h"
+
 // service manager which will give the access to all public browser services
 // we will use memory service as an illustration
 nsIServiceManager * gServiceManager = NULL;
@@ -153,17 +155,21 @@
 // nsPluginInstance class implementation
 //
 nsPluginInstance::nsPluginInstance(nsPluginCreateData * aCreateDataStruct) : nsPluginInstanceBase(),
-  mInstance(aCreateDataStruct->instance),
   mInitialized(PR_FALSE),
   mScriptablePeer(nsnull),
   mPluglet(nsnull)
 {
+  mInstance = aCreateDataStruct->instance;
+
   mCreateDataStruct.instance = aCreateDataStruct->instance;
   mCreateDataStruct.type = aCreateDataStruct->type;
   mCreateDataStruct.mode = aCreateDataStruct->mode;
   mCreateDataStruct.argc = aCreateDataStruct->argc;
   mCreateDataStruct.argn = aCreateDataStruct->argn;
   mCreateDataStruct.saved = aCreateDataStruct->saved;
+
+  mCreateDataStruct.instance->pdata = this;
+  mInstance->pdata = this;
   mString[0] = '\0';
 }

@@ -256,19 +262,27 @@
                                                       PRBool *outResult)
 {
     nsresult rv = NS_ERROR_FAILURE;
-
-    nsCOMPtr<nsIPlugin> plugletEngine =
-	do_GetService(PLUGLETENGINE_ContractID, &rv);
     *outResult = PR_FALSE;
+    nsCOMPtr<nsIPlugin> plugletEngine = nsnull;
     nsIID scriptableIID = NS_ISIMPLEPLUGIN_IID;
+
+    if (!mPluglet) {
+        plugletEngine = do_GetService(PLUGLETENGINE_ContractID, &rv);

-    if (NS_SUCCEEDED(rv)) {
-        rv = plugletEngine->CreatePluginInstance(nsnull, scriptableIID,
-                                                 aMimeType,
-                                                 getter_AddRefs(mPluglet));
-        if (NS_SUCCEEDED(rv) && mPluglet) {
+        if (NS_SUCCEEDED(rv)) {
+            rv = plugletEngine->CreatePluginInstance(nsnull, scriptableIID,
+                                                     aMimeType,
+                                                     getter_AddRefs(mPluglet));
+            if (NS_SUCCEEDED(rv) && mPluglet) {
+                *outResult = PR_TRUE;
+            }
+        }
+    }
+    else {
+        if (0 == PL_strcmp(aMimeType, mCreateDataStruct.type)) {
             *outResult = PR_TRUE;
         }
+		rv = NS_OK;
     }

     return rv;
Index: mozilla/nsISimplePlugin.idl
===================================================================
RCS file: /cvsroot/mozilla/java/plugins/mozilla/nsISimplePlugin.idl,v
retrieving revision 1.2
diff -u -r1.2 nsISimplePlugin.idl
--- mozilla/nsISimplePlugin.idl	12 Oct 2006 21:22:47 -0000	1.2
+++ mozilla/nsISimplePlugin.idl	14 Oct 2006 12:26:07 -0000
@@ -40,5 +40,5 @@

 [scriptable, uuid(482e1890-1fe5-11d5-9cf8-0060b0fbd8ac)]
 interface nsISimplePlugin : nsISupports {
-  void hasPlugletForMimeType(in string aMimeType, out boolean isSupported);
+  boolean hasPlugletForMimeType(in string aMimeType);
 };
Index: src/PlugletsDir.cpp
===================================================================
RCS file: /cvsroot/mozilla/java/plugins/src/PlugletsDir.cpp,v
retrieving revision 1.10
diff -u -r1.10 PlugletsDir.cpp
--- src/PlugletsDir.cpp	12 Oct 2006 21:22:47 -0000	1.10
+++ src/PlugletsDir.cpp	14 Oct 2006 12:26:07 -0000
@@ -124,6 +124,9 @@
     if(!mMimeTypeToPlugletFacoryHash) {
 	res = LoadPluglets();
     }
+    else {
+	res = NS_OK;
+    }
     if (NS_SUCCEEDED(res) && mMimeTypeToPlugletFacoryHash) {
 	*plugletFactory = (PlugletFactory *)
 	    PL_HashTableLookup(mMimeTypeToPlugletFacoryHash,


git-svn-id: svn://10.0.0.236/trunk@213638 18797224-902f-48f8-a5cc-f745e15eee43
2006-10-14 12:28:15 +00:00
edburns%acm.org
53efe6b0fd M mozilla/nppluglet.cpp
M mozilla/nppluglet.h
M src/Pluglet.cpp
M src/Pluglet.h
M src/PlugletEngine.cpp

SetWindow works.  Next step is to try hook up scriptability.


git-svn-id: svn://10.0.0.236/trunk@213586 18797224-902f-48f8-a5cc-f745e15eee43
2006-10-13 14:45:14 +00:00