キーワード検索ダイアログ等にESCキーでのキャンセル動作を追加

[tainavi/TinyBannavi.git] / TinyBannavi / src / tainavi / AbsPaperColorsDialog.java

diff --git a/TinyBannavi/src/tainavi/AbsPaperColorsDialog.java b/TinyBannavi/src/tainavi/AbsPaperColorsDialog.java
index dea440f..307ed7c 100644 (file)
--- a/TinyBannavi/src/tainavi/AbsPaperColorsDialog.java
+++ b/TinyBannavi/src/tainavi/AbsPaperColorsDialog.java
@@ -37,7 +37,7 @@ import tainavi.JTXTButton.FontStyle;
 import tainavi.TVProgram.ProgGenre;\r
 \r
 \r
-abstract class AbsPaperColorsDialog extends JDialog {\r
+abstract class AbsPaperColorsDialog extends JEscCancelDialog {\r
 \r
        private static final long serialVersionUID = 1L;\r
        \r
@@ -222,7 +222,8 @@ abstract class AbsPaperColorsDialog extends JDialog {
                setVisible(false);\r
        }\r
        \r
-       private void doCancel() {\r
+       @Override\r
+       protected void doCancel() {\r
                updatePaperColors(origenv,origpc);\r
                updatePaperFonts(origenv);\r
                updatePaperBounds(origenv,origbnd);\r
@@ -245,9 +246,9 @@ abstract class AbsPaperColorsDialog extends JDialog {
                                        System.err.println("[DEBUG] before orig papercolorsmap "+key+"="+origpc.get(key));\r
                                }\r
                        }\r
-                       CommonUtils.FieldCopy(tmpenv, origenv);\r
-                       CommonUtils.FieldCopy(tmpbnd, origbnd);\r
-                       CommonUtils.FieldCopy(tmppc, origpc);\r
+                       FieldUtils.deepCopy(tmpenv, origenv);\r
+                       FieldUtils.deepCopy(tmpbnd, origbnd);\r
+                       FieldUtils.deepCopy(tmppc, origpc);\r
                        setColors();\r
                        setFonts();\r
                        setBounds();\r