From fa678267dfee2a196797d8203e7e1be98f44f4a4 Mon Sep 17 00:00:00 2001 From: Jaroslav Beran Date: Sat, 23 Mar 2019 10:30:49 +0100 Subject: [PATCH] Some escapeable dialogs --- src/main/java/cz/webstones/words/AboutDialog.java | 2 +- src/main/java/cz/webstones/words/AddCategoryDialog.java | 2 +- src/main/java/cz/webstones/words/ErrorDialog.java | 2 +- src/main/java/cz/webstones/words/FindDialog.java | 2 +- .../words/{JEscapeDialog.java => JEscapeableDialog.java} | 4 ++-- src/main/java/cz/webstones/words/RenameCategoryDialog.java | 2 +- src/main/java/cz/webstones/words/WordDialog.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename src/main/java/cz/webstones/words/{JEscapeDialog.java => JEscapeableDialog.java} (90%) diff --git a/src/main/java/cz/webstones/words/AboutDialog.java b/src/main/java/cz/webstones/words/AboutDialog.java index 74097b2..b6989cf 100644 --- a/src/main/java/cz/webstones/words/AboutDialog.java +++ b/src/main/java/cz/webstones/words/AboutDialog.java @@ -17,7 +17,7 @@ * * @author jaroslav_b */ -public class AboutDialog extends javax.swing.JDialog { +public class AboutDialog extends JEscapeableDialog { private final String urlGitHub = "https://github.com/berk76/words/wiki"; diff --git a/src/main/java/cz/webstones/words/AddCategoryDialog.java b/src/main/java/cz/webstones/words/AddCategoryDialog.java index 1506f75..ba21678 100644 --- a/src/main/java/cz/webstones/words/AddCategoryDialog.java +++ b/src/main/java/cz/webstones/words/AddCategoryDialog.java @@ -8,7 +8,7 @@ * * @author jaroslav_b */ -public class AddCategoryDialog extends javax.swing.JDialog { +public class AddCategoryDialog extends JEscapeableDialog { private boolean commited; diff --git a/src/main/java/cz/webstones/words/ErrorDialog.java b/src/main/java/cz/webstones/words/ErrorDialog.java index 137e455..675650e 100644 --- a/src/main/java/cz/webstones/words/ErrorDialog.java +++ b/src/main/java/cz/webstones/words/ErrorDialog.java @@ -12,7 +12,7 @@ * * @author jaroslav_b */ -public class ErrorDialog extends javax.swing.JDialog { +public class ErrorDialog extends JEscapeableDialog { /** * Creates new form ErrorDialog diff --git a/src/main/java/cz/webstones/words/FindDialog.java b/src/main/java/cz/webstones/words/FindDialog.java index 6a3e8fa..70592ac 100644 --- a/src/main/java/cz/webstones/words/FindDialog.java +++ b/src/main/java/cz/webstones/words/FindDialog.java @@ -13,7 +13,7 @@ * * @author jaroslav_b */ -public class FindDialog extends JEscapeDialog implements IObserver { +public class FindDialog extends JEscapeableDialog implements IObserver { private Dictionary dict = null; diff --git a/src/main/java/cz/webstones/words/JEscapeDialog.java b/src/main/java/cz/webstones/words/JEscapeableDialog.java similarity index 90% rename from src/main/java/cz/webstones/words/JEscapeDialog.java rename to src/main/java/cz/webstones/words/JEscapeableDialog.java index 54fbe29..34e22d1 100644 --- a/src/main/java/cz/webstones/words/JEscapeDialog.java +++ b/src/main/java/cz/webstones/words/JEscapeableDialog.java @@ -18,9 +18,9 @@ * * @author jaroslav_b */ -public class JEscapeDialog extends JDialog { +public class JEscapeableDialog extends JDialog { - public JEscapeDialog(java.awt.Frame parent, boolean modal) { + public JEscapeableDialog(java.awt.Frame parent, boolean modal) { super(parent, modal); } diff --git a/src/main/java/cz/webstones/words/RenameCategoryDialog.java b/src/main/java/cz/webstones/words/RenameCategoryDialog.java index 0f6035d..f2f0771 100644 --- a/src/main/java/cz/webstones/words/RenameCategoryDialog.java +++ b/src/main/java/cz/webstones/words/RenameCategoryDialog.java @@ -10,7 +10,7 @@ * * @author jaroslav_b */ -public class RenameCategoryDialog extends javax.swing.JDialog { +public class RenameCategoryDialog extends JEscapeableDialog { private boolean commited; diff --git a/src/main/java/cz/webstones/words/WordDialog.java b/src/main/java/cz/webstones/words/WordDialog.java index ce906ab..7c77f4a 100644 --- a/src/main/java/cz/webstones/words/WordDialog.java +++ b/src/main/java/cz/webstones/words/WordDialog.java @@ -12,7 +12,7 @@ * * @author jaroslav_b */ -public class WordDialog extends javax.swing.JDialog implements IObserver { +public class WordDialog extends JEscapeableDialog implements IObserver { private boolean commited; private WordDto word;