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

Add new first argument to PlugletFactory.initialize(): the string that

Browse Source 
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
This commit is contained in:
edburns%acm.org
2006-11-15 01:11:42 +00:00
parent 7b06962b2a
commit 1879d39cea
6 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/java/plugins/classes/org/mozilla/pluglet/PlugletFactory.java
View File

@@ -56,7 +56,7 @@ public interface PlugletFactory {
* @param manager This is an instance of <code>PlugletManager</code> that is passed
* to this method.
*/
public void initialize(PlugletManager manager);
public void initialize(String plugletJarFileName, PlugletManager manager);
/**
* Called when the browser is done with a <code>PlugletFactory</code> instance. Normally
* there is only one <code>PlugletFactory</code> instance.

2
mozilla/java/plugins/classes/org/mozilla/pluglet/PlugletFactoryAdaptor.java
View File

@@ -26,7 +26,7 @@ public class PlugletFactoryAdaptor implements PlugletFactory {
public Pluglet createPluglet(String mimeType) {
return null;
}
public void initialize(PlugletManager manager) {
public void initialize(String plugletPath, PlugletManager manager) {
}
public void shutdown() {
}

2
mozilla/java/plugins/examples/MediaPlayer/JMPlayer.java
View File

@@ -27,7 +27,7 @@ public class JMPlayer implements PlugletFactory {
}
return player;
}
public void initialize(PlugletManager manager) {
public void initialize(String plugletPath, PlugletManager manager) {
}
public void shutdown() {
}

2
mozilla/java/plugins/src/PlugletEngine.cpp
View File

@@ -202,7 +202,7 @@ void PlugletEngine::StartJVM() {
options[3].optionString=""; //-Djava.compiler=NONE";
vm_args.version = JNI_VERSION_1_4;
vm_args.options = options;
vm_args.nOptions = 1; // EDBURNS: Change for debugging
vm_args.nOptions = 3; // EDBURNS: Change to 4 for debugging
vm_args.ignoreUnrecognized = JNI_FALSE;
/* Create the Java VM */
res = JNI_CreateJavaVM(&jvm, (void**)&env, &vm_args);

7
mozilla/java/plugins/src/PlugletFactory.cpp
View File

@@ -99,7 +99,8 @@ nsresult PlugletFactory::Initialize(void) {
env->ExceptionDescribe();
return NS_ERROR_FAILURE;
}
initializeMID = env->GetMethodID(clazz,"initialize","(Lorg/mozilla/pluglet/mozilla/PlugletManager;)V");
initializeMID = env->GetMethodID(clazz,"initialize",
"(Ljava/lang/String;Lorg/mozilla/pluglet/mozilla/PlugletManager;)V");
if (!initializeMID) {
env->ExceptionDescribe();
return NS_ERROR_FAILURE;
@@ -116,7 +117,9 @@ nsresult PlugletFactory::Initialize(void) {
if (NS_FAILED(rv)) {
return rv;
}
env->CallVoidMethod(jthis,initializeMID,plugletEngineObj);
jstring jpath = env->NewStringUTF(path);
env->CallVoidMethod(jthis,initializeMID, jpath, plugletEngineObj);
env->ReleaseStringUTFChars(jpath, path);
if (env->ExceptionOccurred()) {
env->ExceptionDescribe();
return NS_ERROR_FAILURE;

5
mozilla/java/plugins/test/test.java
View File

@@ -42,8 +42,9 @@ public class test implements PlugletFactory {
* Initializes the pluglet and will be called before any new instances are
* created.
*/
public void initialize(PlugletManager manager) {
org.mozilla.util.DebugPluglet.print("--test.initialize\n");
public void initialize(String plugletPath, PlugletManager manager) {
org.mozilla.util.DebugPluglet.print("--test.initialize(" +
plugletPath + ")\n");
}
/**
* Called when the browser is done with the pluglet factory, or when