Index: html/nbproject/project.xml
===================================================================
RCS file: /cvs/html/nbproject/project.xml,v
retrieving revision 1.16
diff -u -r1.16 project.xml
--- html/nbproject/project.xml 18 Jul 2007 10:55:28 -0000 1.16
+++ html/nbproject/project.xml 19 Jul 2007 06:28:16 -0000
@@ -67,6 +67,12 @@
+ org.netbeans.modules.imagepaste
+
+
+
+
+
org.netbeans.modules.lexer
Index: html/src/org/netbeans/modules/html/HtmlEditorSupport.java
===================================================================
RCS file: /cvs/html/src/org/netbeans/modules/html/HtmlEditorSupport.java,v
retrieving revision 1.19
diff -u -r1.19 HtmlEditorSupport.java
--- html/src/org/netbeans/modules/html/HtmlEditorSupport.java 14 Jun 2007 08:57:21 -0000 1.19
+++ html/src/org/netbeans/modules/html/HtmlEditorSupport.java 19 Jul 2007 06:28:16 -0000
@@ -24,10 +24,12 @@
import java.io.ObjectInput;
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.swing.TransferHandler;
import javax.swing.text.EditorKit;
import javax.swing.text.StyledDocument;
import javax.swing.text.BadLocationException;
import org.netbeans.api.html.lexer.HTMLTokenId;
+import org.netbeans.api.imagepaste.ImagePasteSupport;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenHierarchy;
import org.netbeans.api.lexer.TokenSequence;
@@ -88,6 +90,27 @@
}
};
+ private static final String IMG_TEMPLATE = "";
+
+ protected void initializeCloneableEditor(CloneableEditor editor) {
+ try {
+ super.initializeCloneableEditor(editor);
+ TransferHandler handler = ImagePasteSupport.createTransferHandler(
+ editor.getEditorPane(), IMG_TEMPLATE);
+ editor.getEditorPane().setTransferHandler(handler);
+ } catch (IllegalStateException ise) {
+ //Normal during restart if module has created a dataobject, then
+ //immediately been unloaded and reloaded. The editor toolbar
+ //tries to get info from a node whose dataobject was destroyed
+ //when the module was unloaded. Bug is in the Ant Debugger module,
+ //which is receiving property changes and not checking validity.
+
+ //No worries about initialization not having completed - this
+ //editor is going to be replaced completely anyway, it's being
+ //initialized for nothing.
+ }
+ }
/** Constructor. */
HtmlEditorSupport(HtmlDataObject obj) {
Index: nbbuild/cluster.properties
===================================================================
RCS file: /cvs/nbbuild/cluster.properties,v
retrieving revision 1.350
diff -u -r1.350 cluster.properties
--- nbbuild/cluster.properties 19 Jul 2007 06:08:57 -0000 1.350
+++ nbbuild/cluster.properties 19 Jul 2007 06:28:17 -0000
@@ -183,6 +183,7 @@
ant/project,\
apisupport/timers,\
classfile,\
+ contrib/imagepaste,\
core/ide,\
core/navigator,\
core/palette,\
@@ -797,7 +798,6 @@
contrib/genericnavigator,\
contrib/htmlprojects,\
contrib/insertunicode,\
- contrib/imagepaste,\
contrib/jalopy,\
contrib/looks,\
contrib/manifesteditor,\