Skip to content

CAY-2462 Clipboard holds old content after application was reloaded #305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfgit merged 1 commit into from
Aug 28, 2018
Merged

CAY-2462 Clipboard holds old content after application was reloaded #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Bug Fixes:

CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation
CAY-2445 Oracle: Problem with ExpressionFactory.notInExp()
CAY-2462 Clipboard holds old content after application was reloaded

----------------------------------
Release: 4.1.M2
Expand Down
2 changes: 1 addition & 1 deletion modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.swing.*;
import javax.swing.SwingUtilities;
import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
Expand Down
43 changes: 31 additions & 12 deletions ...er/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,6 @@

package org.apache.cayenne.modeler.action;

import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.io.File;
import java.net.URL;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;

import javax.swing.JOptionPane;
import javax.swing.KeyStroke;

import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.CayenneModelerController;
import org.apache.cayenne.modeler.dialog.ErrorDebugDialog;
Expand All @@ -44,6 +32,20 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.swing.JOptionPane;
import javax.swing.KeyStroke;
import java.awt.Toolkit;
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.Transferable;
import java.awt.datatransfer.UnsupportedFlavorException;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.io.File;
import java.net.URL;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;

public class OpenProjectAction extends ProjectAction {

private static Logger logObj = LoggerFactory.getLogger(OpenProjectAction.class);
Expand All @@ -70,6 +72,7 @@ public static String getActionName() {
public OpenProjectAction(Application application) {
super(getActionName(), application);
this.fileChooser = new ProjectOpener();
resetClipboard();
}

@Override
Expand Down Expand Up @@ -191,4 +194,20 @@ private boolean processUpgrades() {
JOptionPane.YES_NO_OPTION);
return returnCode != JOptionPane.NO_OPTION;
}

private void resetClipboard() {
Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new Transferable() {
public DataFlavor[] getTransferDataFlavors() {
return new DataFlavor[0];
}

public boolean isDataFlavorSupported(DataFlavor flavor) {
return false;
}

public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException {
throw new UnsupportedFlavorException(flavor);
}
}, null);
}
}