17316

Class names updated (see 18180)

a=laa@sparc.spb.su
r=idk@eng.sun.com

java/plugins/examples/MediaPlayer/JMPlayer.java

@@ -15,12 +15,12 @@ import java.io.*;
 import java.util.*;
 
 
-public class JMPlayer implements Pluglet {
+public class JMPlayer implements PlugletFactory {
     public JMPlayer() {
     }
 
-    public PlugletInstance createPlugletInstance(String mimeType) {
- 	return new JMPlayerInstance();
+    public Pluglet createPluglet(String mimeType) {
+ 	return new Player();
     }
 
     public void initialize(PlugletManager manager) {	
@@ -30,8 +30,8 @@ public class JMPlayer implements Pluglet {
     }
 }
 
-class JMPlayerInstance implements PlugletInstance, ControllerListener {
-    PlugletInstancePeer peer;
+class Player implements Pluglet, ControllerListener {
+    PlugletPeer peer;
     Dimension defaultSize;
     Frame frm;
     int w, h;
@@ -54,10 +54,10 @@ class JMPlayerInstance implements PlugletInstance, ControllerListener {
 	}
     }
 
-    public JMPlayerInstance() {
+    public Player() {
     }
 
-    public void initialize(PlugletInstancePeer peer) {
+    public void initialize(PlugletPeer peer) {
 	PlugletTagInfo2 info = (PlugletTagInfo2)peer.getTagInfo();
 	w = info.getWidth();
 	h = info.getHeight();
@@ -120,7 +120,7 @@ class JMPlayerInstance implements PlugletInstance, ControllerListener {
 }
 
 class JMPlayerStreamListener implements PlugletStreamListener {
-    JMPlayerInstance jmp;
+    Player jmp;
     int total=0;
 
     public JMPlayerStreamListener() {
@@ -136,7 +136,7 @@ class JMPlayerStreamListener implements PlugletStreamListener {
 
     }
 
-    public void setPlayer(JMPlayerInstance jmp) {
+    public void setPlayer(Player jmp) {
 	this.jmp = jmp;
     }
 

java/plugins/examples/makefile.win

@@ -0,0 +1,32 @@
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Sun Microsystems,
+# Inc. Portions created by Sun are
+# Copyright (C) 1999 Sun Microsystems, Inc. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+IGNORE_MANIFEST=1 
+#//------------------------------------------------------------------------
+#//
+#// Specify the depth of the current directory relative to the
+#// root of NS
+#//
+#//------------------------------------------------------------------------
+DEPTH = ..\..\..
+
+DIRS  =  MediaPlayer pdf rtf zip
+
+include <$(DEPTH)\config\rules.mak>

java/plugins/examples/pdf/PDFView.java

@@ -12,12 +12,12 @@ import java.util.Vector;
 
 import com.adobe.acrobat.Viewer;
 
-public class PDFView implements Pluglet {
+public class PDFView implements PlugletFactory {
     public PDFView() {
     }
-    public PlugletInstance createPlugletInstance(String mimeType) {
+    public Pluglet createPluglet(String mimeType) {
 	try {
- 	    return new PDFViewInstance();
+ 	    return new AcrobatView();
 	} catch(Exception e) {
 	}
 	return null;
@@ -28,7 +28,7 @@ public class PDFView implements Pluglet {
     }
 }
 
-class PDFViewInstance extends Viewer implements PlugletInstance {
+class AcrobatView extends Viewer implements Pluglet {
     JScrollPane view;
     com.adobe.acrobat.Viewer acr;
     Dimension defaultSize;
@@ -59,10 +59,10 @@ class PDFViewInstance extends Viewer implements PlugletInstance {
     }
 
 
-    public PDFViewInstance() throws Exception {
+    public AcrobatView() throws Exception {
     }
 
-    public void initialize(PlugletInstancePeer peer) {
+    public void initialize(PlugletPeer peer) {
 	PlugletTagInfo2 info = (PlugletTagInfo2)peer.getTagInfo();
 	defaultSize = new Dimension(info.getWidth(), info.getHeight());
     }
@@ -93,12 +93,12 @@ class PDFViewInstance extends Viewer implements PlugletInstance {
 }
 
 class PDFViewStreamListener implements PlugletStreamListener {
-    PDFViewInstance viewer;
+    AcrobatView viewer;
     int total = 0, length = 0, first = 0;
     byte[] b, bb;
     Vector v = new Vector(20, 20);
 
-    public void setViewer(PDFViewInstance view) {
+    public void setViewer(AcrobatView view) {
 	viewer = view;
     }
     public PDFViewStreamListener() {

java/plugins/examples/rtf/JView.java

@@ -9,11 +9,11 @@ import java.awt.event.*;
 import java.awt.print.*;
 import java.io.*;
 
-public class JView implements Pluglet {
+public class JView implements PlugletFactory {
     public JView() {
     }
-    public PlugletInstance createPlugletInstance(String mimeType) {
- 	return new JViewInstance();
+    public Pluglet createPluglet(String mimeType) {
+ 	return new RTFView();
     }
     public void initialize(PlugletManager manager) {	
     }
@@ -21,7 +21,7 @@ public class JView implements Pluglet {
     }
 }
 
-class JViewInstance implements PlugletInstance {
+class RTFView implements Pluglet {
 //    JScrollPane view;
     ScrollPane view;
     JEditorPane viewPane;
@@ -48,10 +48,10 @@ class JViewInstance implements PlugletInstance {
 	System.out.println("++ Showing");
     }
 
-    public JViewInstance() {
+    public RTFView() {
     }
 
-    public void initialize(PlugletInstancePeer peer) {
+    public void initialize(PlugletPeer peer) {
 	PlugletTagInfo2 info = (PlugletTagInfo2)peer.getTagInfo();
 	defaultSize = new Dimension(info.getWidth(), info.getHeight());
     }
@@ -81,9 +81,9 @@ class JViewInstance implements PlugletInstance {
 }
 
 class JViewStreamListener implements PlugletStreamListener {
-    JViewInstance viewer;
+    RTFView viewer;
 
-    public void setViewer(JViewInstance view) {
+    public void setViewer(RTFView view) {
 	viewer = view;
     }
     public JViewStreamListener() {

java/plugins/examples/zip/ZipView.java

@@ -17,13 +17,13 @@ import java.util.zip.*;
 import java.util.Enumeration;
 import java.util.Vector;
 
-public class ZipView implements Pluglet {
+public class ZipView implements PlugletFactory {
 
     public ZipView() {
     }
 
-    public PlugletInstance createPlugletInstance(String mimeType) {
- 	return new ZipInstance();
+    public Pluglet createPluglet(String mimeType) {
+ 	return new ZipDecoder();
     }
 
     public void initialize(PlugletManager manager) {	
@@ -43,7 +43,7 @@ class Node {
     }
 
 }
-class ZipInstance implements PlugletInstance {
+class ZipDecoder implements Pluglet {
     Button extract;
     byte[] b;
     Frame frm;
@@ -55,7 +55,7 @@ class ZipInstance implements PlugletInstance {
     Dimension defaultSize;
     String zname;
 
-    public ZipInstance() {
+    public ZipDecoder() {
 
     }
 
@@ -275,7 +275,7 @@ class ZipInstance implements PlugletInstance {
 
     }
 
-    public void initialize(PlugletInstancePeer peer) {
+    public void initialize(PlugletPeer peer) {
 	PlugletTagInfo2 info = (PlugletTagInfo2)peer.getTagInfo();
 	defaultSize = new Dimension(info.getWidth()-65, info.getHeight()-10);
 
@@ -319,7 +319,7 @@ class ZipInstance implements PlugletInstance {
 
 class ZipStreamListener implements PlugletStreamListener {
     int total = 0, length = 0, first = 0;
-    ZipInstance zip;
+    ZipDecoder zip;
     byte[] b, bb;
     Vector v = new Vector(20, 20);
 
@@ -333,7 +333,7 @@ class ZipStreamListener implements PlugletStreamListener {
 
     }
 
-    public void setZip(ZipInstance zip) {
+    public void setZip(ZipDecoder zip) {
 	this.zip=zip;
     }