#57994: the rest of the fix; EditorKit registry in JEditorPane returns JDK's kit for text/html; affected modules have been updated to use CloneableEditorSupport.getEditorKit
1.1 --- a/j2ee.blueprints/src/org/netbeans/modules/j2ee/blueprints/ui/HtmlBrowserWithScrollPosition.java Wed Aug 02 11:38:55 2006 +0000
1.2 +++ b/j2ee.blueprints/src/org/netbeans/modules/j2ee/blueprints/ui/HtmlBrowserWithScrollPosition.java Thu Aug 03 06:46:54 2006 +0000
1.3 @@ -47,7 +47,6 @@
1.4
1.5 // construct html pane
1.6 html = new JEditorPane();
1.7 - html.setEditorKitForContentType("text/html", new HTMLEditorKit()); //NOI18N
1.8 html.setEditable(false);
1.9 html.addHyperlinkListener(this);
1.10
2.1 --- a/vcscore/nbproject/project.xml Wed Aug 02 11:38:55 2006 +0000
2.2 +++ b/vcscore/nbproject/project.xml Thu Aug 03 06:46:54 2006 +0000
2.3 @@ -142,7 +142,7 @@
2.4 <build-prerequisite/>
2.5 <compile-dependency/>
2.6 <run-dependency>
2.7 - <specification-version>6.2</specification-version>
2.8 + <specification-version>6.12</specification-version>
2.9 </run-dependency>
2.10 </dependency>
2.11 <dependency>
3.1 --- a/vcscore/src/org/netbeans/modules/vcscore/ui/views/types/UpdateStdOutPanel.java Wed Aug 02 11:38:55 2006 +0000
3.2 +++ b/vcscore/src/org/netbeans/modules/vcscore/ui/views/types/UpdateStdOutPanel.java Thu Aug 03 06:46:54 2006 +0000
3.3 @@ -38,6 +38,7 @@
3.4 import java.util.*;
3.5 import org.openide.util.NbBundle;
3.6 import javax.accessibility.*;
3.7 +import org.openide.text.CloneableEditorSupport;
3.8
3.9 public class UpdateStdOutPanel extends SingleNodeView {
3.10
3.11 @@ -193,13 +194,8 @@
3.12 File tempFile = (File)info.getAttribute(PIPED_FILE);
3.13 if (tempFile != null && tempFile.exists()) {
3.14 String mime = getMIMEType(fo);
3.15 - epFile.setContentType(mime);
3.16 - EditorKit kit = JEditorPane.createEditorKitForContentType(mime);
3.17 + EditorKit kit = CloneableEditorSupport.getEditorKit(mime);
3.18 // D.deb("MIME = "+mime+": I have kit = "+kit); // NOI18N
3.19 - if (kit == null) {
3.20 - epFile.setContentType("text/plain"); // NOI18N
3.21 - kit = JEditorPane.createEditorKitForContentType("text/plain"); // NOI18N
3.22 - }
3.23 epFile.setEditorKit(kit);
3.24 Document doc = kit.createDefaultDocument();
3.25 try {