Merge pull request #8462 from matthiasblaesing/exclipboard2

Restore clipboard history for editor by using ExClipboard instead of directly accessing system clipboard

Author: ebarboni

platform/openide.text/src/org/openide/text/QuietEditorPane.java

@@ -59,6 +59,7 @@
 import javax.swing.text.JTextComponent;
 import org.openide.util.Lookup;
 import org.openide.util.NbBundle;
+import org.openide.util.datatransfer.ExClipboard;
 import org.openide.windows.ExternalDropHandler;
 import org.openide.windows.TopComponent;
 
@@ -351,7 +352,8 @@ public void exportAsDrag(JComponent comp, InputEvent e, int action) {
 
         @Override
         public void exportToClipboard(JComponent comp, Clipboard clip, int action) {
-            delegator.exportToClipboard(comp, clip, action);
+            ExClipboard clipboard = Lookup.getDefault().lookup(ExClipboard.class);
+            delegator.exportToClipboard(comp, clipboard != null ? clipboard : clip, action);
         }
 
         @Override