summaryrefslogtreecommitdiff
path: root/BKUCommonGUI/src/main/java/at/gv/egiz
diff options
context:
space:
mode:
Diffstat (limited to 'BKUCommonGUI/src/main/java/at/gv/egiz')
-rw-r--r--BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java18
-rw-r--r--BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java15
-rw-r--r--BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SwitchFocusListener.java4
3 files changed, 18 insertions, 19 deletions
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index 8df4bd72..34f278fb 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -159,7 +159,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
@Override
public void run() {
- log.debug("initializing gui [" + Thread.currentThread().getName() + "]");
+ log.debug("[" + Thread.currentThread().getName() + "] initializing gui");
if (renderIconPanel) {
initIconPanel(background);
@@ -565,7 +565,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
@Override
public void run() {
- log.debug("show card-pin dialog [" + Thread.currentThread().getName() + "]");
+ log.debug("[" + Thread.currentThread().getName() + "] show card-pin dialog");
mainPanel.removeAll();
buttonPanel.removeAll();
@@ -758,7 +758,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
@Override
public void run() {
- log.debug("show pinpad signature-pin dialog [" + Thread.currentThread().getName() + "]");
+ log.debug("[" + Thread.currentThread().getName() + "] show pinpad signature-pin dialog");
mainPanel.removeAll();
buttonPanel.removeAll();
@@ -927,7 +927,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
@Override
public void run() {
- log.debug("show signature-pin dialog [" + Thread.currentThread().getName() + "]");
+ log.debug("[" + Thread.currentThread().getName() + "] show signature-pin dialog");
mainPanel.removeAll();
buttonPanel.removeAll();
@@ -1215,7 +1215,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
@Override
public void run() {
- log.debug("show message dialog [" + Thread.currentThread().getName() + "]");
+ log.debug("[" + Thread.currentThread().getName() + "] show message dialog");
mainPanel.removeAll();
buttonPanel.removeAll();
@@ -1385,7 +1385,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
backListener, backCommand);
} else if (dataToBeSigned.size() == 1) {
try {
- log.debug("scheduling secure viewer");
+ log.debug("[" + Thread.currentThread().getName() + "] scheduling secure viewer");
SwingUtilities.invokeLater(new Runnable() {
@@ -1419,7 +1419,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
*/
private void showSecureViewer(HashDataInput dataToBeSigned) throws FontProviderException {
- log.debug("show secure viewer [" + Thread.currentThread().getName() + "]");
+ log.debug("[" + Thread.currentThread().getName() + "] show secure viewer");
if (secureViewer == null) {
secureViewer = new SecureViewerDialog(null, messages,
fontProvider, helpMouseListener.getActionListener());
@@ -1439,14 +1439,14 @@ public class BKUGUIImpl implements BKUGUIFacade {
private void showSignedReferencesListDialog(final List<HashDataInput> signedReferences,
final ActionListener backListener, final String backCommand) {
- log.debug("scheduling signed references list dialog");
+ log.debug("[" + Thread.currentThread().getName() + "] scheduling signed references list dialog");
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
- log.debug("show signed references list dialog [" + Thread.currentThread().getName() + "]");
+ log.debug("[" + Thread.currentThread().getName() + "] show signed references list dialog");
mainPanel.removeAll();
buttonPanel.removeAll();
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
index c0b14a85..878a998b 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
@@ -54,8 +54,6 @@ import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.LayoutStyle;
import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
-import javax.swing.text.DefaultEditorKit;
import javax.swing.text.Document;
import javax.swing.text.EditorKit;
import javax.swing.text.StyledEditorKit;
@@ -73,7 +71,6 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
* BKUApplet includes BKUFonts as runtime dependency only, the jar is copied to the applet dir in BKUOnline with dependency-plugin
* BKUViewer has compile dependency BKUFonts, transitive in BKUOnline and BKULocal
*/
- public static final String PLAINTEXT_FONT_RESOURCE = "DejaVuSansMono.ttf";
public static final Dimension VIEWER_DIMENSION = new Dimension(600, 400);
protected static final Log log = LogFactory.getLog(SecureViewerDialog.class);
// private static SecureViewerDialog dialog;
@@ -227,6 +224,8 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
*/
public void setContent(HashDataInput hashDataInput) { //throws FontProviderException {
+ log.debug("[" + Thread.currentThread().getName() + "] set viewer content");
+
this.content = null;
viewer.setText(null);
@@ -285,6 +284,7 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
viewerLabel.setText("");
}
+ log.debug("VIEWER FONT: " + viewer.getFont());
setVisible(true);
toFront();
}
@@ -320,12 +320,11 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
@Override
public void actionPerformed(ActionEvent e) {
if ("close".equals(e.getActionCommand())) {
-// SecureViewerDialog.dialog.setVisible(false);
- log.trace(Thread.currentThread() + " closing secure viewer");
+ log.trace("[" + Thread.currentThread().getName() + "] closing secure viewer");
setVisible(false);
log.trace("secure viewer closed");
} else if ("save".equals(e.getActionCommand())) {
- log.trace(Thread.currentThread() + " display secure viewer save dialog");
+ log.trace("[" + Thread.currentThread().getName() + "] display secure viewer save dialog");
showSaveDialog(content, null, null);
log.trace("done secure viewer save");
} else {
@@ -336,14 +335,14 @@ public class SecureViewerDialog extends JDialog implements ActionListener {
private void showSaveDialog(final HashDataInput hashDataInput,
final ActionListener okListener, final String okCommand) {
- log.debug("scheduling save dialog [" + Thread.currentThread().getName() + "]");
+ log.debug("[" + Thread.currentThread().getName() + "] scheduling save dialog");
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
- log.debug("show save dialog [" + Thread.currentThread().getName() + "]");
+ log.debug("[" + Thread.currentThread().getName() + "] show save dialog");
String userHome = System.getProperty("user.home");
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SwitchFocusListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SwitchFocusListener.java
index 1e3fabbd..48b641e2 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SwitchFocusListener.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SwitchFocusListener.java
@@ -33,8 +33,8 @@ public class SwitchFocusListener implements ActionListener {
ctx.showDocument
(new URL("javascript:" + javascriptFunction));
}
- catch (MalformedURLException me) {
-
+ catch (MalformedURLException me) {
+
log.warn("Unable to call external javascript function.", me);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 19:09:06 +0000