From 1849eec8744764b0536c74934f8057f3d55fbad0 Mon Sep 17 00:00:00 2001
From: Branislav Stojkovic <Branislav Stojkovic@Bancika-PC>
Date: Sun, 30 Oct 2016 10:29:50 +0100
Subject: [PATCH] optimize the code

---
 .../cloud/view/browser/CloudBrowserFrame.java       |  4 ++--
 .../cloud/view/browser/SearchHeaderPanel.java       | 13 ++++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/CloudBrowserFrame.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/CloudBrowserFrame.java
index 445f119c..17cba956 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/CloudBrowserFrame.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/CloudBrowserFrame.java
@@ -72,7 +72,7 @@ public class CloudBrowserFrame extends JFrame {
   @Override
   public void setVisible(boolean b) {
     super.setVisible(b);
-    if (b) {
+    if (b && !getSearchHeaderPanel().isInitialized()) {
       executeBackgroundTask(new ITask<Pair<String[], String[]>>() {
 
         @Override
@@ -88,7 +88,7 @@ public class CloudBrowserFrame extends JFrame {
 
         @Override
         public void complete(Pair<String[], String[]> result) {
-          getSearchHeaderPanel().updateLists(result.getFirst(), result.getSecond());
+          getSearchHeaderPanel().initializeLists(result.getFirst(), result.getSecond());
         }
       });
     }
diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/SearchHeaderPanel.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/SearchHeaderPanel.java
index 0accb325..7b107709 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/SearchHeaderPanel.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/cloud/view/browser/SearchHeaderPanel.java
@@ -23,6 +23,8 @@ public class SearchHeaderPanel extends JPanel {
   private JComboBox sortBox;
   private JButton goButton;
 
+  private boolean initialized = false;
+
   public SearchHeaderPanel() {
     setLayout(new GridBagLayout());
 
@@ -65,13 +67,14 @@ public class SearchHeaderPanel extends JPanel {
     getSearchField().requestFocusInWindow();
   }
 
-  public void updateLists(String[] categories, String[] sortings) {
-    Object selectedCategory = getCategoryBox().getSelectedItem();
-    Object selectedSorting = getSortBox().getSelectedItem();
+  public void initializeLists(String[] categories, String[] sortings) {
     getCategoryBox().setModel(new DefaultComboBoxModel(categories));
     getSortBox().setModel(new DefaultComboBoxModel(sortings));
-    getCategoryBox().setSelectedItem(selectedCategory);
-    getSortBox().setSelectedItem(selectedSorting);
+    initialized = true;
+  }
+
+  public boolean isInitialized() {
+    return initialized;
   }
 
   private JTextField getSearchField() {