Improved server listing.

Author: ryanhamilton

qstudio/src/main/java/com/timestored/qstudio/servertree/SelectedServerObjectPanel.java

@@ -29,6 +29,7 @@
 import com.timestored.qstudio.model.AdminModel;
 import com.timestored.qstudio.model.AdminModel.Category;
 import com.timestored.qstudio.model.QEntity;
+import com.timestored.qstudio.model.QueryManager;
 import com.timestored.qstudio.model.ServerModel;
 import com.timestored.qstudio.model.ServerObjectTree;
 import com.timestored.sqldash.chart.ChartTheme;
@@ -44,11 +45,12 @@ public class SelectedServerObjectPanel extends JPanel
 
 	private static final long serialVersionUID = 1L;
 	private final AdminModel adminModel;
+	private final QueryManager queryManager;
 	private ChartTheme chartTheme;
 
-	public SelectedServerObjectPanel(AdminModel adminModel) {
-		
+	public SelectedServerObjectPanel(AdminModel adminModel, QueryManager queryManager) {
 		this.adminModel = adminModel;
+		this.queryManager = queryManager;
 		setLayout(new BorderLayout());
 		adminModel.addListener(this);
 		refreshGUI(false);
@@ -66,7 +68,7 @@ private void refreshGUI(boolean forceModelUpdate) {
 
 		if(adminModel.getSelectedServerName() != null) {
 			if(cat.equals(Category.ELEMENT)) {
-				p = ElementDisplayFactory.getPanel(adminModel, chartTheme);
+				p = ElementDisplayFactory.getPanel(adminModel, queryManager, chartTheme);
 				title = adminModel.getSelectedElement().getName();
 			} else if(cat.equals(Category.NAMESPACE)) {
 				p = getNamespaceListing(adminModel);

qstudio/src/main/java/com/timestored/qstudio/servertree/ServerListPanel.java

@@ -56,6 +56,7 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import com.timestored.connections.JdbcIcons;
 import com.timestored.connections.JdbcTypes;
 import com.timestored.connections.ServerConfig;
 import com.timestored.kdb.KdbConnection;
@@ -423,14 +424,16 @@ private boolean isTreeProblem() {
 		}
 
 		@Override public ImageIcon getIcon() {
-			if(serverModel.getServerConfig().getJdbcType().equals(JdbcTypes.DUCKDB)) {
-				return Theme.CIcon.DUCK.get();
+			JdbcTypes jdbcType = serverModel.getServerConfig().getJdbcType();
+			if(JdbcTypes.DUCKDB.equals(jdbcType) || JdbcTypes.BABELDB.equals(jdbcType)) {
+				return serverModel.isConnected() ? Theme.CIcon.DUCK.get() : Theme.CIcon.DUCK_FADED.get();
 			} else if(serverModel.isConnected() && isTreeProblem()) {
 				return Theme.CIcon.SERVER_LIGHTNING.get();
 			} else if(serverModel.getServerConfig().isKDB() && serverModel.isConnected()) {
 				return Theme.CIcon.SERVER.get();
 			} else if (!serverModel.getServerConfig().isKDB() && serverModel.isConnected()){
-				return Theme.CIcon.SERVER_DATABASE.get();
+				JdbcIcons jicon = JdbcIcons.getIconFor(jdbcType);
+				return jicon.get16();
 			} 
 			return Theme.CIcon.SERVER_CONNECT.get();
 		}
@@ -486,7 +489,7 @@ private boolean isTreeProblem() {
 					if(savedDocFile == null) {
 						savedDocFile = new File(myDocs, "table-docs.html");
 					}
-					savedDocFile = SwingUtils.askUserSaveLocation("html", savedDocFile);
+					savedDocFile = SwingUtils.askUserSaveLocation(savedDocFile, "html");
 
 			        if (savedDocFile != null) {
 			            try {