From 309973e37f2cc7ecfba3b320d7619f118535da5c Mon Sep 17 00:00:00 2001
From: Branislav Stojkovic <Branislav Stojkovic@Bancika-PC>
Date: Sat, 22 Oct 2016 23:13:54 +0200
Subject: [PATCH] add cloud browser frame

---
 .../src/org/diylc/images/IconLoader.java      |   2 +-
 .../src/org/diylc/images/dashboard.png        | Bin 0 -> 601 bytes
 .../diylc-swing/src/org/diylc/images/find.png | Bin 0 -> 751 bytes
 .../org/diylc/swing/gui/DialogFactory.java    |  16 +++-
 .../src/org/diylc/swing/gui/MainFrame.java    |   8 +-
 .../swing/plugins/cloud/CloudPlugIn.java      |   4 +
 .../plugins/cloud/view/CloudBrowserFrame.java |  80 ++++++++++++++++++
 .../plugins/cloud/view/LibraryFrame.java      |  12 ---
 8 files changed, 104 insertions(+), 18 deletions(-)
 create mode 100644  diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/images/dashboard.png
 create mode 100644  diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/images/find.png
 create mode 100644  diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/cloud/view/CloudBrowserFrame.java
 delete mode 100644  diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/cloud/view/LibraryFrame.java

diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/images/IconLoader.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/images/IconLoader.java
index aaee0234..df271b82 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/images/IconLoader.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/images/IconLoader.java	
@@ -42,7 +42,7 @@ public enum IconLoader {
 			"rotate_ccw.png"), ElementInto("element_into.png"), Arrow(
 			"arrow.png"), Cloud("cloud.png"), CloudUp("cloud_up.png"), CloudGear(
 			"cloud_gear.png"), IdCardEdit("id_card_edit.png"), KeyEdit(
-			"key_edit.png");
+			"key_edit.png"), Find("find.png"), Dashboard("dashboard.png");
 
 	protected String name;
 
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/images/dashboard.png b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/images/dashboard.png
new file mode 100644
index 0000000000000000000000000000000000000000..be0640342e4fb921ebefa452b5abe8412b4e6d31
GIT binary patch
literal 601
zcmV-f0;c_mP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000hbVXQnLvm$d
zbZKvHAXI5>WdKHUATlu^MrC3kGB7YRATcpIF*iChG9W83F)%Q{Dd!0Q000McNliru
z)&&<0GyuMD)nEVs010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E00FT{
zL_t(|+KrRHOF~f;$Irb!eTc7y3XBMJYUl@2Hq?}J(A3=0*dn>~FEkZ6M2!u#wK~*L
zgZ&^xB@4n@f`|q+NJLHFyPfmA_vOPV4}3WH^4|A*&Ux=%1{k}i<&16^QLEjC|9H!1
zb9*~$D<~@=O-P=9W***6(Qjmn6|ugtpGWZwqHCJ2M<;_EMvn~edOV<U4nCQ^3f!xl
zT6%=>>DdU1V@R1(TNLz=GiD3Bvw|TiglSR=ApuPpq!;hNLnb7YsJ*6X_L?9gsqrG*
zF$f<B0EW(-vW1yLCGLgF*${L`c(ttz?3Nq@64<D<Y&*DIb#+5HnjQn1laOl?8L<IZ
z2apk9b-sbypcMDp6`2&OYK?T=>42bcbzrty_QF>faTOBO)IuHn$;QukXf8GbpfoN6
zHeYo*AgC%+<EZiEH?q17)TU=vdhynDi<LoV1YsL|)oa<@)5qM@RkPEHtj^^@5(&d)
zdU^8<mGbL7E~&Cb|8gv`ok|&l!;yY26N!%xw+g7cMo!2;M<(Ri4#^Y7;P()+@(Xf-
n6xEAlLcbyKhq&9Mrmpih!~^r&BO>+O00000NkvXXu0mjfK*0JT

literal 0
HcmV?d00001

diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/images/find.png b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/images/find.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd369f12829adbc50a0a0b5399f0155de1be7e91
GIT binary patch
literal 751
zcmV<L0ucR)P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000jbVXQnLvm$d
zbZKvHAXI5>WdLerbuJ(^AY|!dE+8^6Fft%9GCDFbIx#RHD=;xIFkm~<h5!Hn2XskI
zMF-Xe7Y#B320IhV00009a7bBm000W`000W`0Ya=am;e9(1ZP1_K>z@;j|==^1poj7
zMM*?KRCwCWlHY67P!z{cm#k@Hvu3rZtTf9Q8ah;1H&#)H$V5c?Cel(S_NA|~f59ig
zmx6*%KKKu)528Mdbto%X*H#~Flf^=XQ5)NJ>(V4`*I%AOg<8Z{J@6s-a&x}-d(Sxl
z|2l}FwW&`y9Jcd3zv}UL?y)ROX`1%E(P*^stotVcQy>snwpc6=Y&M%ZGczM}Ivt)Q
z$uXLy0oRa7B&1|Ad0!O8H~7DfbbfQdaoqYmMko|I?Q}XP8HO?8jZi9;pja#d3OgMR
z$1Stje74<g=XG7L42uw$wC4Bw9o1?T3WWlwstU3!Lpq&?Znq0AmkXlNs3{VO2%2WB
za?{i9hGB@6{e7+fECQ{{tyb$MCR!<qf?zNRi{1q&C>peybtv!s0M6}(Og0DJr4{o0
zN^m}x`EW+cW<H{TN>nNprCcuO(803L=d<axLy&fxaOZ9i7~u-Uo<9YawL`}-2fSw%
z41$2XB%eseV<HOd_Pfx=+Y9I-+o;!<#w`phT)zzl)?FQ^VC%)Rom6sLJ~emAU8Q*_
zVg)|EdYqHQYyoq#<e)tVilS_6#p7!<ZGB?Bcr=AY16|3(j+FgeR7z!b@}W8_i#LqD
zueJ5JueUMh5IHi9%)x{p2-g-aTz%x^&P{!Zzf5gzZlrs?-a9<|X17l)YMSoC_SSI!
z9!Z%-=b|q{QD!emke7ACU~r#DVo2Yz9XXCP5e2D@3j7i|hMXLH50Fyd?$Gr122bz(
hZOq3Iav=C0$4~p@_m4g9xfTEb002ovPDHLkV1n@ALRJ6(

literal 0
HcmV?d00001

diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/DialogFactory.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/DialogFactory.java
index ae2b4370..2debd119 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/DialogFactory.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/DialogFactory.java	
@@ -16,6 +16,7 @@ import org.diylc.plugins.cloud.presenter.CloudPresenter;
 import org.diylc.swing.gui.components.OverwritePromptFileChooser;
 import org.diylc.swing.gui.editor.PropertyEditorDialog;
 import org.diylc.swing.plugins.cloud.view.ChangePasswordDialog;
+import org.diylc.swing.plugins.cloud.view.CloudBrowserFrame;
 import org.diylc.swing.plugins.cloud.view.LoginDialog;
 import org.diylc.swing.plugins.cloud.view.UserEditDialog;
 import org.diylc.swing.plugins.cloud.view.UploadDialog;
@@ -152,16 +153,25 @@ public class DialogFactory {
 		return dialog;
 	}
 
-	public UploadDialog createUploadDialog(IPlugInPort plugInPort, CloudPresenter cloudPresenter) {
-		UploadDialog dialog = new UploadDialog(mainFrame, plugInPort, cloudPresenter);
+	public UploadDialog createUploadDialog(IPlugInPort plugInPort,
+			CloudPresenter cloudPresenter) {
+		UploadDialog dialog = new UploadDialog(mainFrame, plugInPort,
+				cloudPresenter);
 		return dialog;
 	}
-	
+
 	public ChangePasswordDialog createChangePasswordDialog() {
 		ChangePasswordDialog dialog = new ChangePasswordDialog(mainFrame);
 		return dialog;
 	}
 
+	public CloudBrowserFrame createCloudBrowserFrame(IPlugInPort plugInPort,
+			CloudPresenter cloudPresenter) {
+		CloudBrowserFrame frame = new CloudBrowserFrame(mainFrame, plugInPort,
+				cloudPresenter);
+		return frame;
+	}
+
 	public ProgressDialog createProgressDialog(String title,
 			String[] buttonCaptions, String description, boolean useProgress) {
 		ProgressDialog dialog = new ProgressDialog(mainFrame, title,
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/MainFrame.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/MainFrame.java
index 198c40ef..b1de976c 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/MainFrame.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/MainFrame.java	
@@ -18,6 +18,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ExecutionException;
 
 import javax.swing.Action;
 import javax.swing.BoxLayout;
@@ -330,8 +331,11 @@ public class MainFrame extends JFrame implements ISwingUI {
 				try {
 					T result = get();
 					task.complete(result);
-				} catch (Exception e) {
-					LOG.error("Task failed", e);
+				} catch (ExecutionException e) {
+					LOG.error("Background task execution failed", e);
+					task.failed(e);
+				} catch (InterruptedException e) {
+					LOG.error("Background task execution interrupted", e);
 					task.failed(e);
 				}
 				getGlassPane().setVisible(false);
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/cloud/CloudPlugIn.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/cloud/CloudPlugIn.java
index 829f728c..6b245f12 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/cloud/CloudPlugIn.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/cloud/CloudPlugIn.java	
@@ -23,6 +23,7 @@ import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
 import org.diylc.swing.gui.DummyView;
 import org.diylc.swing.plugins.cloud.view.ChangePasswordDialog;
+import org.diylc.swing.plugins.cloud.view.CloudBrowserFrame;
 import org.diylc.swing.plugins.cloud.view.LoginDialog;
 import org.diylc.swing.plugins.cloud.view.UserEditDialog;
 import org.diylc.swing.plugins.cloud.view.UploadDialog;
@@ -186,6 +187,9 @@ public class CloudPlugIn implements IPlugIn, CloudListener {
 
 		@Override
 		public void actionPerformed(ActionEvent e) {
+			CloudBrowserFrame frame = DialogFactory.getInstance()
+					.createCloudBrowserFrame(plugInPort, cloudPresenter);
+			frame.setVisible(true);
 		}
 	}
 
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/cloud/view/CloudBrowserFrame.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/cloud/view/CloudBrowserFrame.java
new file mode 100644
index 00000000..fdc08863
--- /dev/null
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/cloud/view/CloudBrowserFrame.java	
@@ -0,0 +1,80 @@
+package org.diylc.swing.plugins.cloud.view;
+
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JTabbedPane;
+
+import org.diylc.common.IPlugInPort;
+import org.diylc.images.IconLoader;
+import org.diylc.plugins.cloud.presenter.CloudPresenter;
+
+public class CloudBrowserFrame extends JFrame {
+
+	private static final long serialVersionUID = 1L;
+
+	private JPanel mainPanel;
+	private JTabbedPane tabbedPane;
+	private JPanel dashboardPanel;
+	private JPanel browsePanel;
+
+	private IPlugInPort plugInPort;
+	private CloudPresenter cloudPresenter;
+
+	public CloudBrowserFrame(JFrame owner, IPlugInPort plugInPort,
+			CloudPresenter cloudPresenter) {
+		super("DIY Cloud Browser");
+		this.setIconImage(IconLoader.Cloud.getImage());
+		this.setPreferredSize(new Dimension(800, 600));
+		this.plugInPort = plugInPort;
+		this.cloudPresenter = cloudPresenter;
+
+		setContentPane(getMainPanel());
+		this.pack();
+		this.setLocationRelativeTo(owner);
+	}
+
+	public JPanel getMainPanel() {
+		if (mainPanel == null) {
+			mainPanel = new JPanel(new GridBagLayout());
+			GridBagConstraints gbc = new GridBagConstraints();
+			gbc.anchor = GridBagConstraints.NORTHWEST;
+			gbc.insets = new Insets(2, 2, 2, 2);
+
+			gbc.gridx = 0;
+			gbc.gridy = 0;
+			gbc.fill = GridBagConstraints.BOTH;
+			gbc.weightx = 1;
+			gbc.weighty = 1;
+			mainPanel.add(getTabbedPane(), gbc);
+		}
+		return mainPanel;
+	}
+
+	private JTabbedPane getTabbedPane() {
+		if (tabbedPane == null) {
+			tabbedPane = new JTabbedPane();
+			tabbedPane.addTab("Dashboard", IconLoader.Dashboard.getIcon(), getDashboardPanel());
+			tabbedPane.addTab("Search For Projects", IconLoader.Find.getIcon(), getBrowsePanel());
+		}
+		return tabbedPane;
+	}
+
+	private JPanel getDashboardPanel() {
+		if (dashboardPanel == null) {
+			dashboardPanel = new JPanel();
+		}
+		return dashboardPanel;
+	}
+
+	private JPanel getBrowsePanel() {
+		if (browsePanel == null) {
+			browsePanel = new JPanel();
+		}
+		return browsePanel;
+	}
+}
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/cloud/view/LibraryFrame.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/cloud/view/LibraryFrame.java
deleted file mode 100644
index b16d1a35..00000000
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/plugins/cloud/view/LibraryFrame.java	
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.diylc.swing.plugins.cloud.view;
-
-import javax.swing.JFrame;
-
-public class LibraryFrame extends JFrame {
-
-	private static final long serialVersionUID = 1L;
-
-	public LibraryFrame() {
-		super("Online Library");
-	}
-}