only invoke later if not already on EDT, fixes selection issue

kontalk · Mar 8, 2015 · 1d645cd · 1d645cd
1 parent 0fc7453
commit 1d645cd
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git a/src/org/kontalk/view/ThreadListView.java b/src/org/kontalk/view/ThreadListView.java
@@ -152,6 +152,10 @@ KonThread getSelectedThread() {
 
     @Override
     public void update(Observable o, Object arg) {
+        if (SwingUtilities.isEventDispatchThread()) {
+            this.updateOnEDT();
+            return;
+        }
         SwingUtilities.invokeLater(new Runnable() {
             @Override
             public void run() {
@@ -246,6 +250,10 @@ String getTooltipText() {
 
         @Override
         public void update(Observable o, Object arg) {
+            if (SwingUtilities.isEventDispatchThread()) {
+                this.updateOnEDT();
+                return;
+            }
             SwingUtilities.invokeLater(new Runnable() {
                 @Override
                 public void run() {

diff --git a/src/org/kontalk/view/ThreadView.java b/src/org/kontalk/view/ThreadView.java
@@ -227,6 +227,10 @@ private void check(MouseEvent e) {
 
         @Override
         public void update(Observable o, Object arg) {
+            if (SwingUtilities.isEventDispatchThread()) {
+                this.updateOnEDT();
+                return;
+            }
             SwingUtilities.invokeLater(new Runnable() {
                 @Override
                 public void run() {
@@ -508,6 +512,10 @@ private String toPrettyString() {
 
             @Override
             public void update(Observable o, Object arg) {
+                if (SwingUtilities.isEventDispatchThread()) {
+                    this.updateOnEDT();
+                    return;
+                }
                 SwingUtilities.invokeLater(new Runnable() {
                     @Override
                     public void run() {

diff --git a/src/org/kontalk/view/UserListView.java b/src/org/kontalk/view/UserListView.java
@@ -111,6 +111,10 @@ public void mouseExited(MouseEvent e) {
 
     @Override
     public void update(Observable o, Object arg) {
+        if (SwingUtilities.isEventDispatchThread()) {
+            this.updateOnEDT();
+            return;
+        }
         SwingUtilities.invokeLater(new Runnable() {
             @Override
             public void run() {

diff --git a/src/org/kontalk/view/View.java b/src/org/kontalk/view/View.java
@@ -290,6 +290,10 @@ void showConfig() {
 
     @Override
     public void update(Observable o, final Object arg) {
+        if (SwingUtilities.isEventDispatchThread()) {
+            this.updateOnEDT(arg);
+            return;
+        }
         SwingUtilities.invokeLater(new Runnable() {
             @Override
             public void run() {