diff --git a/ide/db.dataview/src/org/netbeans/modules/db/dataview/output/InsertRecordDialog.java b/ide/db.dataview/src/org/netbeans/modules/db/dataview/output/InsertRecordDialog.java index f3b3a3a9be4c..4510708aa01b 100644 --- a/ide/db.dataview/src/org/netbeans/modules/db/dataview/output/InsertRecordDialog.java +++ b/ide/db.dataview/src/org/netbeans/modules/db/dataview/output/InsertRecordDialog.java @@ -62,6 +62,7 @@ import org.netbeans.modules.db.dataview.util.DBReadWriteHelper; import org.openide.DialogDisplayer; import org.openide.NotifyDescriptor; +import org.openide.util.Lookup; import org.openide.util.NbBundle; import org.openide.util.Utilities; import org.openide.windows.WindowManager; @@ -539,7 +540,6 @@ private void processKeyEvents(KeyEvent e) { } else if (KeyStroke.getKeyStrokeForEvent(e).equals(tab)) { } } - private Clipboard clipBoard = Toolkit.getDefaultToolkit().getSystemClipboard(); private void copy() { StringBuilder strBuffer = new StringBuilder(); @@ -562,15 +562,22 @@ private void copy() { strBuffer.append("\n"); } StringSelection stringSelection = new StringSelection(strBuffer.toString()); - clipBoard = Toolkit.getDefaultToolkit().getSystemClipboard(); - clipBoard.setContents(stringSelection, stringSelection); + Clipboard clipboard = Lookup.getDefault().lookup(Clipboard.class); + if (clipboard == null) { + clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); + } + clipboard.setContents(stringSelection, stringSelection); } private void paste() { int startRow = (insertRecordTableUI.getSelectedRows())[0]; int startCol = (insertRecordTableUI.getSelectedColumns())[0]; try { - String trstring = (String) (clipBoard.getContents(this).getTransferData(DataFlavor.stringFlavor)); + Clipboard clipboard = Lookup.getDefault().lookup(Clipboard.class); + if (clipboard == null) { + clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); + } + String trstring = (String) (clipboard.getContents(this).getTransferData(DataFlavor.stringFlavor)); StringTokenizer st1 = new StringTokenizer(trstring, "\n"); for (int i = 0; st1.hasMoreTokens(); i++) { int rowIdx = startRow + i; diff --git a/ide/editor.completion/src/org/netbeans/modules/editor/completion/DocumentationScrollPane.java b/ide/editor.completion/src/org/netbeans/modules/editor/completion/DocumentationScrollPane.java index 881a2e2b1616..a017b6414f02 100644 --- a/ide/editor.completion/src/org/netbeans/modules/editor/completion/DocumentationScrollPane.java +++ b/ide/editor.completion/src/org/netbeans/modules/editor/completion/DocumentationScrollPane.java @@ -55,6 +55,7 @@ import org.openide.awt.StatusDisplayer; import org.openide.util.Exceptions; import org.openide.util.ImageUtilities; +import org.openide.util.Lookup; import org.openide.util.NbBundle; import org.openide.util.RequestProcessor; @@ -461,7 +462,10 @@ private class HyperlinkAction implements HyperlinkListener { @Override public void hyperlinkUpdate(HyperlinkEvent e) { if (e != null && e.getEventType() == HyperlinkEvent.EventType.ACTIVATED && e.getDescription().startsWith("copy.snippet")) { - Clipboard systemClipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); + Clipboard systemClipboard = Lookup.getDefault().lookup(Clipboard.class); + if (systemClipboard == null) { + systemClipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); + } String snippetCount = e.getDescription().replaceAll("[^0-9]", ""); HTMLDocument HtmlDoc = (HTMLDocument) e.getSourceElement().getDocument(); HTMLDocView source = (HTMLDocView) e.getSource(); diff --git a/ide/editor/src/org/netbeans/modules/editor/ExportHtmlAction.java b/ide/editor/src/org/netbeans/modules/editor/ExportHtmlAction.java index 73b0f9db36ee..a7cc7dbc761a 100644 --- a/ide/editor/src/org/netbeans/modules/editor/ExportHtmlAction.java +++ b/ide/editor/src/org/netbeans/modules/editor/ExportHtmlAction.java @@ -19,6 +19,7 @@ package org.netbeans.modules.editor; import java.awt.*; +import java.awt.datatransfer.Clipboard; import java.util.logging.Level; import java.util.logging.Logger; import org.openide.util.Exceptions; @@ -58,6 +59,7 @@ import org.netbeans.modules.editor.lib2.view.PrintUtils; import org.openide.awt.Mnemonics; import org.openide.filesystems.FileChooserBuilder; +import org.openide.util.Lookup; import org.openide.util.NbPreferences; public class ExportHtmlAction extends CookieAction { @@ -247,7 +249,11 @@ public void run() { htmlPrintContainer.addLines(lines); String result = htmlPrintContainer.end(); if (toClipboard) { - Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(result), null); + Clipboard clipboard = Lookup.getDefault().lookup(Clipboard.class); + if (clipboard == null) { + clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); + } + clipboard.setContents(new StringSelection(result), null); } else { PrintWriter out = null; try { diff --git a/ide/editor/src/org/netbeans/modules/editor/impl/actions/clipboardhistory/CompletionLayoutPopup.java b/ide/editor/src/org/netbeans/modules/editor/impl/actions/clipboardhistory/CompletionLayoutPopup.java index 2ed1050a8e48..ace4182ac2f9 100644 --- a/ide/editor/src/org/netbeans/modules/editor/impl/actions/clipboardhistory/CompletionLayoutPopup.java +++ b/ide/editor/src/org/netbeans/modules/editor/impl/actions/clipboardhistory/CompletionLayoutPopup.java @@ -49,6 +49,7 @@ import javax.swing.event.ListSelectionListener; import javax.swing.text.BadLocationException; import javax.swing.text.JTextComponent; +import org.openide.util.Lookup; import org.openide.util.Utilities; /** @@ -616,7 +617,10 @@ public void keyTyped(KeyEvent evt) { private void pasteContent() throws HeadlessException { Transferable transferable = layout.getSelectedValue().getTransferable(); - Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); + Clipboard clipboard = Lookup.getDefault().lookup(Clipboard.class); + if (clipboard == null) { + clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); + } if (transferable != null) { clipboard.setContents(transferable, layout.getSelectedValue()); } else { diff --git a/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/api/TestMethodNode.java b/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/api/TestMethodNode.java index 4ba597142333..bb88182f24fc 100644 --- a/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/api/TestMethodNode.java +++ b/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/api/TestMethodNode.java @@ -21,15 +21,14 @@ import java.awt.Image; import java.awt.Toolkit; +import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.StringSelection; import java.awt.event.ActionEvent; import java.io.CharConversionException; import java.lang.ref.WeakReference; import java.net.URI; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.AbstractAction; @@ -202,11 +201,15 @@ public Action[] getActions(boolean context) { } if (callStack.length() > 0) { final String trace = callStack.toString(); - actions.add(new AbstractAction(Bundle.LBL_CopyStackTrace()) { - @Override - public void actionPerformed(ActionEvent e) { - Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(trace), null); - } + actions.add(new AbstractAction(Bundle.LBL_CopyStackTrace()) { + @Override + public void actionPerformed(ActionEvent e) { + Clipboard clipboard = Lookup.getDefault().lookup(Clipboard.class); + if (clipboard == null) { + clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); + } + clipboard.setContents(new StringSelection(trace), null); + } }); } } diff --git a/ide/versioning.util/src/org/netbeans/modules/versioning/util/common/CommitPopupBuilder.java b/ide/versioning.util/src/org/netbeans/modules/versioning/util/common/CommitPopupBuilder.java index 82b42c265944..b06ef3118219 100644 --- a/ide/versioning.util/src/org/netbeans/modules/versioning/util/common/CommitPopupBuilder.java +++ b/ide/versioning.util/src/org/netbeans/modules/versioning/util/common/CommitPopupBuilder.java @@ -19,6 +19,7 @@ package org.netbeans.modules.versioning.util.common; import java.awt.Toolkit; +import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.DataFlavor; import java.awt.event.KeyEvent; import javax.swing.Action; @@ -29,6 +30,7 @@ import javax.swing.text.DefaultEditorKit; import javax.swing.text.JTextComponent; import org.openide.awt.Mnemonics; +import org.openide.util.Lookup; import org.openide.util.NbBundle; /** @@ -63,9 +65,13 @@ JPopupMenu getPopup(JTextComponent component) { cutAction.setEnabled(textSelected); copyAction.setEnabled(textSelected); - - boolean hasClipboardText = Toolkit.getDefaultToolkit().getSystemClipboard() - .isDataFlavorAvailable(DataFlavor.stringFlavor); + + Clipboard clipboard = Lookup.getDefault().lookup(Clipboard.class); + if (clipboard == null) { + clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); + } + + boolean hasClipboardText = clipboard.isDataFlavorAvailable(DataFlavor.stringFlavor); pasteAction.setEnabled(hasClipboardText); diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/jpqleditor/ui/JPQLEditorTopComponent.form b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/jpqleditor/ui/JPQLEditorTopComponent.form index d547ecf84216..63756f46cf1d 100644 --- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/jpqleditor/ui/JPQLEditorTopComponent.form +++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/jpqleditor/ui/JPQLEditorTopComponent.form @@ -54,7 +54,6 @@ - @@ -106,9 +105,6 @@ - - - @@ -164,7 +160,6 @@ - diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/jpqleditor/ui/JPQLEditorTopComponent.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/jpqleditor/ui/JPQLEditorTopComponent.java index f52b41256c11..e91ec7f5e310 100644 --- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/jpqleditor/ui/JPQLEditorTopComponent.java +++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/jpqleditor/ui/JPQLEditorTopComponent.java @@ -80,6 +80,7 @@ import org.openide.nodes.Node; import org.openide.util.Exceptions; import org.openide.util.ImageUtilities; +import org.openide.util.Lookup; import org.openide.util.Mutex; import org.openide.util.NbBundle; import org.openide.util.RequestProcessor; @@ -176,7 +177,6 @@ private class JPQLEditorPopupMouseAdapter extends PopupMouseAdapter { private final String COPY_COMMAND = NbBundle.getMessage(JPQLEditorTopComponent.class, "CTL_COPY_COMMAND"); private final String PASTE_COMMAND = NbBundle.getMessage(JPQLEditorTopComponent.class, "CTL_PASTE_COMMAND"); private final String SELECT_ALL_COMMAND = NbBundle.getMessage(JPQLEditorTopComponent.class, "CTL_SELECT_ALL_COMMAND"); - private Clipboard systemClipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); public JPQLEditorPopupMouseAdapter() { super(); @@ -230,7 +230,7 @@ protected void showPopup(MouseEvent evt) { copyMenuItem.setEnabled(true); } - Transferable transferable = (Transferable) systemClipboard.getContents(null); + Transferable transferable = getClipboard().getContents(null); if (transferable.getTransferDataFlavors().length == 0) { pasteMenuItem.setEnabled(false); } else { @@ -251,17 +251,17 @@ public void actionPerformed(ActionEvent e) { jpqlEditor.selectAll(); } else if (e.getActionCommand().equals(CUT_COMMAND)) { StringSelection stringSelection = new StringSelection(jpqlEditor.getSelectedText()); - systemClipboard.setContents(stringSelection, stringSelection); + getClipboard().setContents(stringSelection, stringSelection); jpqlEditor.setText( jpqlEditor.getText().substring(0, jpqlEditor.getSelectionStart()) + jpqlEditor.getText().substring(jpqlEditor.getSelectionEnd())); } else if (e.getActionCommand().equals(COPY_COMMAND)) { StringSelection stringSelection = new StringSelection(jpqlEditor.getSelectedText()); - systemClipboard.setContents(stringSelection, stringSelection); + getClipboard().setContents(stringSelection, stringSelection); } else if (e.getActionCommand().equals(PASTE_COMMAND)) { - Transferable transferable = (Transferable) systemClipboard.getContents(null); + Transferable transferable = getClipboard().getContents(null); String clipboardContents = ""; try { if (transferable.isDataFlavorSupported(DataFlavor.stringFlavor)) { @@ -953,4 +953,12 @@ private void puComboboxActionPerformed() { } } } + + private Clipboard getClipboard() { + Clipboard c = Lookup.getDefault().lookup(Clipboard.class); + if (c == null) { + c = Toolkit.getDefaultToolkit().getSystemClipboard(); + } + return c; + } } diff --git a/java/java.navigation/src/org/netbeans/modules/java/stackanalyzer/AnalyzeStackTopComponent.java b/java/java.navigation/src/org/netbeans/modules/java/stackanalyzer/AnalyzeStackTopComponent.java index 14aa953deb00..1d1cbcc5377d 100644 --- a/java/java.navigation/src/org/netbeans/modules/java/stackanalyzer/AnalyzeStackTopComponent.java +++ b/java/java.navigation/src/org/netbeans/modules/java/stackanalyzer/AnalyzeStackTopComponent.java @@ -43,6 +43,7 @@ import org.netbeans.modules.java.stackanalyzer.StackLineAnalyser.Link; import org.openide.util.Exceptions; import org.openide.util.HelpCtx; +import org.openide.util.Lookup; import org.openide.util.NbBundle; import org.openide.windows.TopComponent; import org.openide.windows.WindowManager; @@ -227,7 +228,10 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { private void insertButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_insertButtonActionPerformed try { - Clipboard clipBoard = Toolkit.getDefaultToolkit ().getSystemClipboard (); + Clipboard clipBoard = Lookup.getDefault().lookup(Clipboard.class); + if (clipBoard == null) { + clipBoard = Toolkit.getDefaultToolkit().getSystemClipboard(); + } Transferable transferable = clipBoard.getContents (this); if (!transferable.isDataFlavorSupported (DataFlavor.stringFlavor)) { return; diff --git a/java/java.project.ui/src/org/netbeans/spi/java/project/support/ui/CreateJavaClassFileFromClipboard.java b/java/java.project.ui/src/org/netbeans/spi/java/project/support/ui/CreateJavaClassFileFromClipboard.java index d7e8ab8b9074..30978d71f30b 100644 --- a/java/java.project.ui/src/org/netbeans/spi/java/project/support/ui/CreateJavaClassFileFromClipboard.java +++ b/java/java.project.ui/src/org/netbeans/spi/java/project/support/ui/CreateJavaClassFileFromClipboard.java @@ -48,6 +48,7 @@ import org.openide.filesystems.FileUtil; import org.openide.loaders.DataFolder; import org.openide.util.Exceptions; +import org.openide.util.Lookup; import org.openide.util.NbBundle; import org.openide.util.datatransfer.PasteType; @@ -74,7 +75,10 @@ public CreateJavaClassFileFromClipboard(DataFolder context, Transferable t) { @Override public Transferable paste() throws IOException { try { - Clipboard c = Toolkit.getDefaultToolkit().getSystemClipboard(); + Clipboard c = Lookup.getDefault().lookup(Clipboard.class); + if (c == null) { + c = Toolkit.getDefaultToolkit().getSystemClipboard(); + } if (!c.isDataFlavorAvailable(DataFlavor.stringFlavor)) { return t; } diff --git a/java/maven/src/org/netbeans/modules/maven/nodes/DependencyNode.java b/java/maven/src/org/netbeans/modules/maven/nodes/DependencyNode.java index 700e2ae02436..e35475521950 100644 --- a/java/maven/src/org/netbeans/modules/maven/nodes/DependencyNode.java +++ b/java/maven/src/org/netbeans/modules/maven/nodes/DependencyNode.java @@ -23,6 +23,7 @@ import java.awt.Component; import java.awt.Image; import java.awt.Toolkit; +import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.StringSelection; import java.awt.event.ActionEvent; import java.beans.PropertyChangeEvent; @@ -98,7 +99,9 @@ import org.netbeans.modules.maven.model.pom.Exclusion; import org.netbeans.modules.maven.model.pom.POMModel; import org.netbeans.spi.project.ui.PathFinder; + import static org.netbeans.modules.maven.nodes.Bundle.*; + import org.netbeans.modules.maven.queries.MavenFileOwnerQueryImpl; import org.netbeans.modules.maven.queries.RepositoryForBinaryQueryImpl; import org.netbeans.modules.maven.queries.RepositoryForBinaryQueryImpl.Coordinates; @@ -1238,8 +1241,13 @@ private class CopyLocationAction extends AbstractAction { super(CopyLocationAction_name()); } - @Override public void actionPerformed(ActionEvent e) { - Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(data.art.getFile().getAbsolutePath()), null); + @Override + public void actionPerformed(ActionEvent e) { + Clipboard clipboard = Lookup.getDefault().lookup(Clipboard.class); + if (clipboard == null) { + clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); + } + clipboard.setContents(new StringSelection(data.art.getFile().getAbsolutePath()), null); } } diff --git a/php/php.dbgp/src/org/netbeans/modules/php/dbgp/ConnectionErrMessage.java b/php/php.dbgp/src/org/netbeans/modules/php/dbgp/ConnectionErrMessage.java index 204bc8c02266..9fbcd0d5b0ec 100644 --- a/php/php.dbgp/src/org/netbeans/modules/php/dbgp/ConnectionErrMessage.java +++ b/php/php.dbgp/src/org/netbeans/modules/php/dbgp/ConnectionErrMessage.java @@ -40,7 +40,9 @@ import org.openide.NotifyDescriptor; import org.openide.awt.HtmlBrowser; import org.openide.util.Exceptions; +import org.openide.util.Lookup; import org.openide.util.NbBundle; +import org.openide.util.datatransfer.ExClipboard; /** * @@ -266,8 +268,11 @@ private void copySettings(String settings) { } private void copyToClipboard(String contents) { + Clipboard clipboard = Lookup.getDefault().lookup(Clipboard.class); + if (clipboard == null) { + clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); + } StringSelection selection = new StringSelection(contents); - Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); clipboard.setContents(selection, selection); } diff --git a/platform/core.windows/src/org/netbeans/core/windows/services/NbPresenter.java b/platform/core.windows/src/org/netbeans/core/windows/services/NbPresenter.java index 74ed8553bf7c..06ccc8463d46 100644 --- a/platform/core.windows/src/org/netbeans/core/windows/services/NbPresenter.java +++ b/platform/core.windows/src/org/netbeans/core/windows/services/NbPresenter.java @@ -88,6 +88,7 @@ import org.openide.awt.Mnemonics; import org.openide.util.HelpCtx; import org.openide.util.ImageUtilities; +import org.openide.util.Lookup; import org.openide.util.Mutex; import org.openide.util.NbBundle; import org.openide.util.RequestProcessor; @@ -527,8 +528,11 @@ private void showCopyToClipboardPopupMenu(MouseEvent e) { pm.add(new AbstractAction(NbBundle.getMessage(NbPresenter.class, "Lbl_CopyToClipboard")) { //NOI18N @Override public void actionPerformed(ActionEvent e) { - Clipboard c = Toolkit.getDefaultToolkit().getSystemClipboard(); - c.setContents(new StringSelection(clipboardText), null); + Clipboard clipboard = Lookup.getDefault().lookup(Clipboard.class); + if (clipboard == null) { + clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); + } + clipboard.setContents(new StringSelection(clipboardText), null); } }); pm.show(e.getComponent(), e.getX(), e.getY()); diff --git a/platform/javahelp/src/org/netbeans/modules/javahelp/BrowserDisplayer.java b/platform/javahelp/src/org/netbeans/modules/javahelp/BrowserDisplayer.java index 4fe4afe97670..4cc742fbb9b8 100644 --- a/platform/javahelp/src/org/netbeans/modules/javahelp/BrowserDisplayer.java +++ b/platform/javahelp/src/org/netbeans/modules/javahelp/BrowserDisplayer.java @@ -25,6 +25,7 @@ import java.awt.Font; import java.awt.FontMetrics; import java.awt.Insets; +import java.awt.Toolkit; import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.Transferable; import java.awt.event.ActionListener; @@ -47,6 +48,7 @@ import javax.swing.JPopupMenu; import org.netbeans.modules.javahelp.CopyLinkLocationAction.LinkOwner; import org.openide.awt.HtmlBrowser; +import org.openide.util.Lookup; import org.openide.util.NbBundle; /** @@ -533,8 +535,15 @@ public String getURLExternalForm() { return getContent(); } + @Override public Clipboard getClipboard() { - return this.getToolkit().getSystemClipboard(); + Clipboard c = Lookup.getDefault().lookup(Clipboard.class); + + if (c == null) { + c = Toolkit.getDefaultToolkit().getSystemClipboard(); + } + + return c; } public void lostOwnership(Clipboard clipboard, Transferable contents) { diff --git a/platform/javahelp/src/org/netbeans/modules/javahelp/HyperlinkEventProcessor.java b/platform/javahelp/src/org/netbeans/modules/javahelp/HyperlinkEventProcessor.java index e2f1ee97fd95..24a0aaf68284 100644 --- a/platform/javahelp/src/org/netbeans/modules/javahelp/HyperlinkEventProcessor.java +++ b/platform/javahelp/src/org/netbeans/modules/javahelp/HyperlinkEventProcessor.java @@ -19,6 +19,7 @@ package org.netbeans.modules.javahelp; +import java.awt.Toolkit; import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.Transferable; import java.awt.event.MouseAdapter; @@ -31,6 +32,7 @@ import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkListener; import org.netbeans.modules.javahelp.CopyLinkLocationAction.LinkOwner; +import org.openide.util.Lookup; /** * Processor for the both MouseEvents and @@ -119,8 +121,15 @@ public String getURLExternalForm() { return url == null ? null : url.toExternalForm(); // #176141 } + @Override public Clipboard getClipboard() { - return pane.getToolkit().getSystemClipboard(); + Clipboard c = Lookup.getDefault().lookup(Clipboard.class); + + if (c == null) { + c = Toolkit.getDefaultToolkit().getSystemClipboard(); + } + + return c; } } diff --git a/platform/openide.dialogs/src/org/openide/WizardDescriptor.java b/platform/openide.dialogs/src/org/openide/WizardDescriptor.java index 3fb1f8eb73f4..2fb3feffd4b0 100644 --- a/platform/openide.dialogs/src/org/openide/WizardDescriptor.java +++ b/platform/openide.dialogs/src/org/openide/WizardDescriptor.java @@ -3240,7 +3240,12 @@ private void showCopyToClipboardPopupMenu(MouseEvent e) { pm.add(new AbstractAction(NbBundle.getMessage(WizardDescriptor.class, "Lbl_CopyToClipboard")) { //NOI18N @Override public void actionPerformed(ActionEvent e) { - Clipboard c = Toolkit.getDefaultToolkit().getSystemClipboard(); + Clipboard c = Lookup.getDefault().lookup(Clipboard.class); + + if (c == null) { + c = Toolkit.getDefaultToolkit().getSystemClipboard(); + } + c.setContents(new StringSelection(getToolTipText()), null); } }); diff --git a/platform/openide.text/src/org/openide/text/QuietEditorPane.java b/platform/openide.text/src/org/openide/text/QuietEditorPane.java index 409d62cd814a..15ad6a07a3b2 100644 --- a/platform/openide.text/src/org/openide/text/QuietEditorPane.java +++ b/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 diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/HTMLTextArea.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/HTMLTextArea.java index 62be4f3a15e8..8bb1a3f358db 100644 --- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/HTMLTextArea.java +++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/HTMLTextArea.java @@ -51,6 +51,7 @@ import javax.swing.text.html.HTMLEditorKit; import javax.swing.text.html.HTMLWriter; import org.netbeans.lib.profiler.ui.UIUtils; +import org.openide.util.Lookup; /** @@ -116,7 +117,11 @@ protected void startTag(Element elem) throws IOException, BadLocationException { private class HTMLTextAreaTransferHandler extends TransferHandler { //~ Methods -------------------------------------------------------------------------------------------------------------- - public void exportToClipboard(JComponent comp, Clipboard clip, int action) { + public void exportToClipboard(JComponent comp, Clipboard baseClipboard, int action) { + Clipboard clip = Lookup.getDefault().lookup(Clipboard.class); + if (clip == null) { + clip = baseClipboard; + } try { int selStart = getSelectionStart(); int selLength = getSelectionEnd() - selStart; diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTable.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTable.java index 40aeed7b7eef..2c40bd9246d5 100644 --- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTable.java +++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTable.java @@ -26,6 +26,7 @@ import java.awt.Point; import java.awt.Rectangle; import java.awt.Toolkit; +import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.StringSelection; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -986,7 +987,15 @@ public final boolean providesPopupMenu() { protected void populatePopup(JPopupMenu popup, Object value, Object userValue) { // Implementation here } - + + private Clipboard getClipboard() { + Clipboard clipboard = Lookup.getDefault().lookup(Clipboard.class); + if (clipboard == null) { + clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); + } + return clipboard; + } + public final JMenuItem createCopyMenuItem() { final int row = getSelectedRow(); @@ -999,7 +1008,7 @@ protected void fireActionPerformed(ActionEvent e) { for (int col = 0; col < columns.size(); col++) if (columns.get(col).getWidth() > 0) val.append("\t").append(getStringValue(row, col)); // NOI118N StringSelection s = new StringSelection(val.toString().trim()); - Toolkit.getDefaultToolkit().getSystemClipboard().setContents(s, s); + getClipboard().setContents(s, s); } }; copyItem.add(copyRowItem); @@ -1017,7 +1026,7 @@ protected void fireActionPerformed(ActionEvent e) { copyItem.add(new JMenuItem(MessageFormat.format(genericItemName, columnName)) { protected void fireActionPerformed(ActionEvent e) { StringSelection s = new StringSelection(getStringValue(row, _col)); - Toolkit.getDefaultToolkit().getSystemClipboard().setContents(s, s); + getClipboard().setContents(s, s); } }); } diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/TextArea.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/TextArea.java index 49ec21472f52..2087113691cb 100644 --- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/TextArea.java +++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/TextArea.java @@ -20,6 +20,7 @@ import java.awt.Color; import java.awt.Toolkit; +import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; import java.awt.event.ActionEvent; @@ -36,6 +37,7 @@ import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.text.Document; +import org.openide.util.Lookup; /** * @@ -180,7 +182,7 @@ protected void fireActionPerformed(ActionEvent ae) { super.fireActionPerformed(ae); hideHint(); try { - replaceSelection(Toolkit.getDefaultToolkit().getSystemClipboard().getContents(this). + replaceSelection(getClipboard().getContents(this). getTransferData(DataFlavor.stringFlavor).toString()); requestFocusInWindow(); } catch (Exception ex) {} @@ -188,7 +190,7 @@ protected void fireActionPerformed(ActionEvent ae) { } }; try { - Transferable clipboardContent = Toolkit.getDefaultToolkit().getSystemClipboard().getContents(this); + Transferable clipboardContent = getClipboard().getContents(this); miPaste.setEnabled(editable && clipboardContent != null && clipboardContent.isDataFlavorSupported( DataFlavor.stringFlavor)); requestFocusInWindow(); @@ -230,7 +232,14 @@ protected void fireActionPerformed(ActionEvent ae) { } protected void customizePopup(JPopupMenu popup) {} - + + private Clipboard getClipboard() { + Clipboard clipboard = Lookup.getDefault().lookup(Clipboard.class); + if (clipboard == null) { + clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); + } + return clipboard; + } // --- Resize support ------------------------------------------------------ diff --git a/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/steps/BasicAttachStepsProvider.java b/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/steps/BasicAttachStepsProvider.java index 0136c95a1933..5c4df67f4d07 100644 --- a/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/steps/BasicAttachStepsProvider.java +++ b/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/steps/BasicAttachStepsProvider.java @@ -19,6 +19,7 @@ package org.netbeans.modules.profiler.attach.steps; import java.awt.Toolkit; +import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.StringSelection; import java.io.File; import java.io.IOException; @@ -34,6 +35,7 @@ import org.netbeans.modules.profiler.api.ProfilerDialogs; import org.netbeans.modules.profiler.attach.providers.RemotePackExporter; import org.netbeans.modules.profiler.attach.spi.AttachStepsProvider; +import org.openide.util.Lookup; import org.openide.util.NbBundle; import org.openide.util.RequestProcessor; import org.openide.util.lookup.ServiceProvider; @@ -295,8 +297,12 @@ protected String parameters(AttachSettings settings) { protected void copyParameters(AttachSettings settings) { String parameters = parameters(settings); parameters = parameters.replace("<", "<").replace(">", ">"); // NOI18N + Clipboard clipboard = Lookup.getDefault().lookup(Clipboard.class); + if (clipboard == null) { + clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); + } StringSelection s = new StringSelection(parameters); - Toolkit.getDefaultToolkit().getSystemClipboard().setContents(s, s); + clipboard.setContents(s, s); ProfilerDialogs.displayInfo(Bundle.AttachDialog_CopiedToClipboard()); } diff --git a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/BrowserUtils.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/BrowserUtils.java index cb04cf4e0583..6cea68cf2260 100644 --- a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/BrowserUtils.java +++ b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/model/BrowserUtils.java @@ -20,6 +20,7 @@ package org.netbeans.modules.profiler.heapwalk.model; import java.awt.Toolkit; +import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.StringSelection; import java.util.ArrayList; import java.util.HashSet; @@ -38,6 +39,7 @@ import org.netbeans.modules.profiler.api.icons.LanguageIcons; import org.netbeans.modules.profiler.api.ProfilerDialogs; import org.netbeans.modules.profiler.heapwalk.ui.icons.HeapWalkerIcons; +import org.openide.util.Lookup; /** @@ -299,7 +301,11 @@ public static void copyPathFromRoot(final TreePath path) { performTask(new Runnable() { public void run() { StringSelection s = new StringSelection(pathFromRoot(path)); - Toolkit.getDefaultToolkit().getSystemClipboard().setContents(s, s); + Clipboard clipboard = Lookup.getDefault().lookup(Clipboard.class); + if (clipboard == null) { + clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); + } + clipboard.setContents(s, s); ProfilerDialogs.displayInfo(Bundle.BrowserUtils_PathCopiedToClipboard()); } }); diff --git a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/InstancesListControllerUI.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/InstancesListControllerUI.java index 2552c37eb1ce..4f3d9b5445a2 100644 --- a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/InstancesListControllerUI.java +++ b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/ui/InstancesListControllerUI.java @@ -40,6 +40,7 @@ import java.awt.Insets; import java.awt.KeyboardFocusManager; import java.awt.Rectangle; +import java.awt.Toolkit; import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.StringSelection; import java.awt.event.ActionEvent; @@ -575,7 +576,9 @@ private void copyIdToClipboard() { if (instance == null) return; Clipboard clipboard = Lookup.getDefault().lookup(Clipboard.class); - + if (clipboard == null) { + clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); + } clipboard.setContents(new StringSelection("0x" + Long.toHexString(instance.getInstanceId())), null); // NOI18N }