From 51e1cfb00af976bca660d0c1a7f54d65dac3bd7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Thu, 22 Dec 2022 10:54:16 +0100 Subject: [PATCH] Transform clipboard - ignore all exceptions --- .../decompiler/flash/gui/TransformPanel.java | 53 +++++++++---------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/src/com/jpexs/decompiler/flash/gui/TransformPanel.java b/src/com/jpexs/decompiler/flash/gui/TransformPanel.java index 83e4c4c85..b7116e9ae 100644 --- a/src/com/jpexs/decompiler/flash/gui/TransformPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/TransformPanel.java @@ -497,11 +497,11 @@ public class TransformPanel extends JPanel { } public void clipBoardflavorsChanged(FlavorEvent e) { - Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); - Transferable contents = clipboard.getContents(null); - boolean hasTransferableText = (contents != null) && contents.isDataFlavorSupported(DataFlavor.stringFlavor); - if (hasTransferableText) { - try { + try { + Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); + Transferable contents = clipboard.getContents(null); + boolean hasTransferableText = (contents != null) && contents.isDataFlavorSupported(DataFlavor.stringFlavor); + if (hasTransferableText) { String result = (String) contents.getTransferData(DataFlavor.stringFlavor); if (result != null) { Matcher matcher = matrixPattern.matcher(result); @@ -512,12 +512,11 @@ public class TransformPanel extends JPanel { } } else { pasteClipboardButton.setEnabled(false); - } - - } catch (UnsupportedFlavorException | IOException ex) { + } + } else { pasteClipboardButton.setEnabled(false); } - } else { + } catch (Exception ex) { pasteClipboardButton.setEnabled(false); } } @@ -531,34 +530,30 @@ public class TransformPanel extends JPanel { } private void pasteClipboardActionPerformed(ActionEvent e) { - Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); - Transferable contents = clipboard.getContents(null); - boolean hasTransferableText = (contents != null) && contents.isDataFlavorSupported(DataFlavor.stringFlavor); - if (hasTransferableText) { - try { + try { + Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); + Transferable contents = clipboard.getContents(null); + boolean hasTransferableText = (contents != null) && contents.isDataFlavorSupported(DataFlavor.stringFlavor); + if (hasTransferableText) { String result = (String) contents.getTransferData(DataFlavor.stringFlavor); if (result != null) { Matcher matcher = matrixPattern.matcher(result); if (matcher.matches()) { - Matrix matrix = new Matrix(); - try { - matrix.scaleX = Double.parseDouble(matcher.group("scaleX")); - matrix.rotateSkew0 = Double.parseDouble(matcher.group("rotateSkew0")); - matrix.rotateSkew1 = Double.parseDouble(matcher.group("rotateSkew1")); - matrix.scaleY = Double.parseDouble(matcher.group("scaleY")); - matrix.translateX = Double.parseDouble(matcher.group("translateX")); - matrix.translateY = Double.parseDouble(matcher.group("translateY")); + Matrix matrix = new Matrix(); + matrix.scaleX = Double.parseDouble(matcher.group("scaleX")); + matrix.rotateSkew0 = Double.parseDouble(matcher.group("rotateSkew0")); + matrix.rotateSkew1 = Double.parseDouble(matcher.group("rotateSkew1")); + matrix.scaleY = Double.parseDouble(matcher.group("scaleY")); + matrix.translateX = Double.parseDouble(matcher.group("translateX")); + matrix.translateY = Double.parseDouble(matcher.group("translateY")); - matrix = imagePanel.getNewMatrix().inverse().concatenate(matrix); - imagePanel.applyTransformMatrix(matrix); - } catch (NumberFormatException nfe) { - //ignore - } + matrix = imagePanel.getNewMatrix().inverse().concatenate(matrix); + imagePanel.applyTransformMatrix(matrix); } } - } catch (UnsupportedFlavorException | IOException ex) { - //ignore } + } catch (Exception ex) { + //ignore } }