Feature: #53

  Aliases tree display:
  Alias folder icons now show if a folder is expanded or collapsed.
  New Alias icon was introduced.

Author: gerdwagner

sql12/core/doc/changes.txt

@@ -6,6 +6,11 @@ Not yet released, available in our GIT repository, snapshots and future releases
 
 Enhancements:
 
+https://github.com/squirrel-sql-client/squirrel-sql-code/issues/53
+  Aliases tree display:
+  Alias folder icons now show if a folder is expanded or collapsed.
+  New Alias icon was introduced.
+
 https://github.com/squirrel-sql-client/squirrel-sql-code/issues/50
   SQL result and table export to CSV or XML:
   New formatting option "Include grouping separator if configured in Global Preferences"

sql12/core/src/net/sourceforge/squirrel_sql/client/gui/db/AliasTreeCellRenderer.java

@@ -1,8 +1,12 @@
 package net.sourceforge.squirrel_sql.client.gui.db;
 
+import net.sourceforge.squirrel_sql.client.Main;
 import net.sourceforge.squirrel_sql.client.gui.db.aliascolor.AliasColor;
+import net.sourceforge.squirrel_sql.client.resources.SquirrelResources;
 
 import javax.swing.BorderFactory;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JTree;
@@ -17,10 +21,18 @@ public class AliasTreeCellRenderer extends DefaultTreeCellRenderer
    private final AliasTreePasteState _aliasPasteState;
    private AliasDragState _aliasDragState;
 
+   private final Icon _folderClosedIcon;
+   private final Icon _folderOpenIcon;
+   private final ImageIcon _startAliasIcon;
+
    public AliasTreeCellRenderer(AliasTreePasteState aliasPasteState, AliasDragState aliasDragState)
    {
       _aliasPasteState = aliasPasteState;
       _aliasDragState = aliasDragState;
+
+      _folderClosedIcon = Main.getApplication().getResources().getIcon(SquirrelResources.IImageNames.FOLDER_CLOSED);
+      _folderOpenIcon = Main.getApplication().getResources().getIcon(SquirrelResources.IImageNames.FOLDER_OPEN);
+      _startAliasIcon = Main.getApplication().getResources().getIcon(SquirrelResources.IImageNames.START_ALIAS);
    }
 
    @Override
@@ -43,6 +55,21 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean
          renderer.setBackground(itemColor);
          ((JComponent) renderer).setOpaque(true);
       }
+
+      if(value instanceof DefaultMutableTreeNode)
+      {
+         DefaultMutableTreeNode node = (DefaultMutableTreeNode) value;
+         if(node.getUserObject() instanceof AliasFolder)
+         {
+            setIcon(expanded ? _folderOpenIcon : _folderClosedIcon);
+         }
+         else
+         {
+            setIcon(_startAliasIcon); // No icon for leaf nodes
+         }
+      }
+
+
       return modifyRenderer(renderer, value);
    }
 

sql12/core/src/net/sourceforge/squirrel_sql/client/resources/SquirrelResources.java

@@ -211,6 +211,10 @@ public interface IImageNames
 
 		String PINNED = "pinned";
 
+		String FOLDER_OPEN = "folderOpen";
+		String FOLDER_CLOSED = "folderClosed";
+		String START_ALIAS = "startAlias";
+
 	}
 
 	public SquirrelResources(String rsrcBundleBaseName)

sql12/core/src/net/sourceforge/squirrel_sql/client/resources/images/folderClosed.png

@@ -198,6 +198,10 @@ run_all.image=eclipse/active/run_all.png
 
 pinned.image=pinned.png
 
+folderOpen.image=folderOpen.png
+folderClosed.image=folderClosed.png
+startAlias.image=startAlias.png
+
 MeanDeviationDefinition.image=pics/MeanDeviationDefinition.png
 
 ########