Add mig info version to info panel, issue 2148; issue 2451

src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java

@@ -76,6 +76,7 @@ import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
 
+import java.util.concurrent.atomic.AtomicBoolean;
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
 import javax.swing.JComponent;
@@ -126,6 +127,8 @@ public abstract class TextFrame extends JInternalFrame implements Window,
     private Window inputWindow;
     /** Swing controller. */
     private SwingController controller;
+    /** Are we maximising/restoring? */
+    private AtomicBoolean maximiseRestoreInProgress = new AtomicBoolean(false);
 
     /** Click types. */
     public enum MouseClickType {
@@ -562,6 +565,9 @@ public abstract class TextFrame extends JInternalFrame implements Window,
     public void internalFrameActivated(final InternalFrameEvent event) {
         LOGGER.finer(getName() + ": internalFrameActivated()");
 
+        if (maximiseRestoreInProgress.get()) {
+            return;
+        }
         new LoggingSwingWorker() {
 
             /** {@inheritDoc} */
@@ -582,6 +588,9 @@ public abstract class TextFrame extends JInternalFrame implements Window,
      */
     @Override
     public void internalFrameDeactivated(final InternalFrameEvent event) {
+        if (maximiseRestoreInProgress.get()) {
+            return;
+        }
         new LoggingSwingWorker() {
 
             /** {@inheritDoc} */
@@ -1028,6 +1037,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
                         return;
                     }
 
+                    maximiseRestoreInProgress.set(true);
                     LOGGER.finest("maximise(): About to set icon");
                     setIcon(false);
                     LOGGER.finest("maximise(): About to set visible");
@@ -1038,6 +1048,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
                 } catch (PropertyVetoException ex) {
                     Logger.userError(ErrorLevel.LOW, "Unable to minimise frame");
                 }
+                maximiseRestoreInProgress.set(false);
 
                 LOGGER.finest("maximise(): Done running");
             }
@@ -1058,12 +1069,14 @@ public abstract class TextFrame extends JInternalFrame implements Window,
                         return;
                     }
 
+                    maximiseRestoreInProgress.set(true);
                     setIcon(false);
                     //setVisible(true);
                     setMaximum(false);
                 } catch (PropertyVetoException ex) {
                     Logger.userError(ErrorLevel.LOW, "Unable to minimise frame");
                 }
+                maximiseRestoreInProgress.set(false);
             }
         });
     }

src/com/dmdirc/addons/ui_swing/dialogs/about/InfoPanel.java

@@ -37,6 +37,7 @@ import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.text.html.HTMLDocument;
 import javax.swing.text.html.HTMLEditorKit;
+import net.miginfocom.layout.LayoutUtil;
 import net.miginfocom.swing.MigLayout;
 
 /** Info panel. */
@@ -73,6 +74,7 @@ public final class InfoPanel extends JPanel {
                 "<b>Java version: </b>" + Info.getJavaVersion() + "<br>" +
                 "<b>OS Version: </b>" + Info.getOSVersion() + "<br>" +
                 "<b>Look and Feel: </b>" + SwingController.getLookAndFeel() + "<br>" +
+                "<b>MiG Layout version: </b>" + LayoutUtil.getVersion() + "<br>" +
                 "</html>");
         infoPane.setEditable(false);
         scrollPane.setViewportView(infoPane);

src/com/dmdirc/addons/ui_swing/framemanager/tree/Tree.java

@@ -117,7 +117,7 @@ public class Tree extends JTree implements MouseMotionListener,
      */
     public void setTreePath(final TreePath path) {
         this.path = path;
-        UIUtilities.invokeAndWait(new Runnable() {
+        UIUtilities.invokeLater(new Runnable() {
 
             @Override
             public void run() {

src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeFrameManager.java

@@ -149,7 +149,7 @@ public final class TreeFrameManager implements FrameManager,
     /** {@inheritDoc} */
     @Override
     public void delWindow(final FrameContainer window) {
-        UIUtilities.invokeAndWait(new Runnable() {
+        UIUtilities.invokeLater(new Runnable() {
 
             /** {@inheritDoc} */
             @Override
@@ -183,7 +183,7 @@ public final class TreeFrameManager implements FrameManager,
      */
     public void addWindow(final TreeViewNode parent,
             final FrameContainer window) {
-        UIUtilities.invokeAndWait(new Runnable() {
+        UIUtilities.invokeLater(new Runnable() {
 
             /** {@inheritDoc} */
             @Override