From 1ef65104c4113a1c6fad7ee93bc9862218a4bc68 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 16 Feb 2015 14:10:23 +0000
Subject: [PATCH] AutoRefactor: common code in if else statements
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java | 57 +++++++++++++++++++++++----------------------------------
1 files changed, 23 insertions(+), 34 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java
index 6086b9a..08edd16 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java
@@ -496,56 +496,45 @@
scroll.setVisible(showDetails);
extraStrut.setVisible(!showDetails);
details.setSelected(showDetails);
- if (showDetails)
+
+ final Window dialog = Utilities.getParentDialog(this);
+ if (dialog != null)
{
- final Window dialog = Utilities.getParentDialog(this);
- if (dialog != null)
+ final Runnable repaint = new Runnable()
{
- lastCollapsedHeight = dialog.getSize().height;
+ public void run()
+ {
+ invalidate();
+ dialog.invalidate();
+ dialog.repaint();
+ }
+ };
+
+ final Dimension dialogSize = dialog.getSize();
+ if (showDetails)
+ {
+ lastCollapsedHeight = dialogSize.height;
if (lastExpandedHeight == -1)
{
- dialog.setSize(new Dimension(dialog.getSize().width,
- dialog.getSize().height + heightDiff));
+ dialog.setSize(new Dimension(dialogSize.width, dialogSize.height + heightDiff));
}
else
{
- dialog.setSize(new Dimension(dialog.getSize().width,
- lastExpandedHeight));
+ dialog.setSize(new Dimension(dialogSize.width, lastExpandedHeight));
}
- SwingUtilities.invokeLater(new Runnable()
- {
- public void run()
- {
- invalidate();
- dialog.invalidate();
- dialog.repaint();
- }
- });
+ SwingUtilities.invokeLater(repaint);
}
- }
- else
- {
- final Window dialog = Utilities.getParentDialog(this);
- if (dialog != null)
+ else
{
- lastExpandedHeight = dialog.getSize().height;
+ lastExpandedHeight = dialogSize.height;
if (lastCollapsedHeight == -1)
{
packParentDialog();
}
else
{
- dialog.setSize(new Dimension(dialog.getSize().width,
- lastCollapsedHeight));
- SwingUtilities.invokeLater(new Runnable()
- {
- public void run()
- {
- invalidate();
- dialog.invalidate();
- dialog.repaint();
- }
- });
+ dialog.setSize(new Dimension(dialogSize.width, lastCollapsedHeight));
+ SwingUtilities.invokeLater(repaint);
}
}
}
--
Gitblit v1.10.0