Don't let label get focus (try with screenreader)

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@1165 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

1 files changed, 6 insertions, 5 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 c75bd0eb..111c73a1 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
@@ -1691,17 +1691,17 @@ public class BKUGUIImpl implements BKUGUIFacade {
 
 					renderShowMessageDialogueButtonPanel();
 
-					primaryFocusHolder = msgLabel;
+					primaryFocusHolder = okButton;
 
 				} else {
 					log.debug("No okListener configured.");
 					showMessageOKButton = false;
 				}
 
-        // okListener might be null (up to windowCloseAdapter what to do)
-        if (windowCloseAdapter != null) {
-          windowCloseAdapter.registerListener(okListener, okCommand);
-        }
+				// okListener might be null (up to windowCloseAdapter what to do)
+				if (windowCloseAdapter != null) {
+					windowCloseAdapter.registerListener(okListener, okCommand);
+				}
 
 				updateMethodToRunAtResize("at.gv.egiz.bku.gui.BKUGUIImpl",
 						"renderShowMessageDialogueButtonPanel");
@@ -1709,6 +1709,7 @@ public class BKUGUIImpl implements BKUGUIFacade {
 				// put focus to msgLabel to guarantee that label is read by
 				// screen reader upon loading
 				msgLabel.requestFocus();
+				msgLabel.setFocusable(false);
 
 				contentPanel.validate();