[power-architect commit] r2788 - in trunk/src: ca/sqlpower/architect/swingui ca/sqlpower/architect/swingui/dbtree ca/sqlpo...

Fri, 17 Oct 2008 08:32:24 -0700 


Author: jfuerth
Date: Fri Oct 17 08:31:21 2008
New Revision: 2788

Added:
   trunk/src/ca/sqlpower/architect/swingui/dbtree/icons/
trunk/src/ca/sqlpower/architect/swingui/dbtree/icons/Catalog16.png (props changed) 
      - copied unchanged from r2786, /trunk/src/icons/Catalog16.png
trunk/src/ca/sqlpower/architect/swingui/dbtree/icons/Column16.png (props changed) 
      - copied unchanged from r2786, /trunk/src/icons/Column16.png
trunk/src/ca/sqlpower/architect/swingui/dbtree/icons/Database16.png (props changed) 
      - copied unchanged from r2786, /trunk/src/icons/Database16.png
trunk/src/ca/sqlpower/architect/swingui/dbtree/icons/Database_target16.png (props changed) 
      - copied unchanged from r2786, /trunk/src/icons/Database_target16.png
trunk/src/ca/sqlpower/architect/swingui/dbtree/icons/ExportedKey16.png (props changed) 
      - copied unchanged from r2786, /trunk/src/icons/ExportedKey16.png
trunk/src/ca/sqlpower/architect/swingui/dbtree/icons/ImportedKey16.png (props changed) 
      - copied unchanged from r2786, /trunk/src/icons/ImportedKey16.png
trunk/src/ca/sqlpower/architect/swingui/dbtree/icons/Index16.png (props changed) 
      - copied unchanged from r2786, /trunk/src/icons/Index16.png
trunk/src/ca/sqlpower/architect/swingui/dbtree/icons/Index_key16.png (props changed) 
      - copied unchanged from r2786, /trunk/src/icons/Index_key16.png
trunk/src/ca/sqlpower/architect/swingui/dbtree/icons/Index_unique16.png (props changed) 
      - copied unchanged from r2786, /trunk/src/icons/Index_unique16.png
trunk/src/ca/sqlpower/architect/swingui/dbtree/icons/Owner16.png (props changed) 
      - copied unchanged from r2786, /trunk/src/icons/Owner16.png
trunk/src/ca/sqlpower/architect/swingui/dbtree/icons/Schema16.png (props changed) 
      - copied unchanged from r2786, /trunk/src/icons/Schema16.png
trunk/src/ca/sqlpower/architect/swingui/dbtree/icons/Table16.png (props changed) 
      - copied unchanged from r2786, /trunk/src/icons/Table16.png
Removed:
   trunk/src/icons/Catalog16.png
   trunk/src/icons/Column16.png
   trunk/src/icons/Database16.png
   trunk/src/icons/Database_target16.png
   trunk/src/icons/ExportedKey16.png
   trunk/src/icons/ImportedKey16.png
   trunk/src/icons/Index16.png
   trunk/src/icons/Index_key16.png
   trunk/src/icons/Index_unique16.png
   trunk/src/icons/Owner16.png
   trunk/src/icons/Schema16.png
   trunk/src/icons/Table16.png
Modified:
   trunk/src/ca/sqlpower/architect/swingui/ProfileRowComponent.java
   trunk/src/ca/sqlpower/architect/swingui/dbtree/DBTreeCellRenderer.java

Log:
Moved the tree icons (except profiling ones, which we will deal with shortly) to an icons package contained in the tree package. This will keep icons specific to the DBTree cell renderer with the renderer itself.
We're not using SPSUtils to load the icons anymore because we want to use a package-relative resource path name. 

Modified: trunk/src/ca/sqlpower/architect/swingui/ProfileRowComponent.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/ProfileRowComponent.java (original) +++ trunk/src/ca/sqlpower/architect/swingui/ProfileRowComponent.java Fri Oct 17 08:31:21 2008 
@@ -51,6 +51,7 @@
 import ca.sqlpower.architect.profile.event.ProfileChangeListener;
 import ca.sqlpower.architect.profile.event.ProfileResultEvent;
 import ca.sqlpower.architect.profile.event.ProfileResultListener;
+import ca.sqlpower.architect.swingui.dbtree.DBTreeCellRenderer;
 import ca.sqlpower.architect.swingui.event.SelectionEvent;
 import ca.sqlpower.architect.swingui.event.SelectionListener;
 import ca.sqlpower.swingui.ProgressWatcher;
@@ -78,8 +79,7 @@
     }

     /** The icon for all the rows (shared) */
-    private static ImageIcon tableIcon =
- SPSUtils.createIcon("Table", "Table Result", ArchitectSwingSessionContext.ICON_SIZE); 
+    private static ImageIcon tableIcon = DBTreeCellRenderer.tableIcon;

     /** The Stop Sign icon for all the rows (shared) */
     private static ImageIcon stopIcon =
Modified: trunk/src/ca/sqlpower/architect/swingui/dbtree/DBTreeCellRenderer.java 
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/dbtree/DBTreeCellRenderer.java (original) +++ trunk/src/ca/sqlpower/architect/swingui/dbtree/DBTreeCellRenderer.java Fri Oct 17 08:31:21 2008 
@@ -51,20 +51,22 @@
  * @version $Id$
  */
 public class DBTreeCellRenderer extends DefaultTreeCellRenderer {
- public static final ImageIcon dbIcon = SPSUtils.createIcon("Database", "SQL Database", ArchitectSwingSessionContext.ICON_SIZE); //$NON-NLS-1$ //$NON-NLS-2$ 
+
public static final ImageIcon dbProfiledIcon = SPSUtils.createIcon("Database_profiled", "SQL Database", ArchitectSwingSessionContext.ICON_SIZE); //$NON-NLS-1$ //$NON-NLS-2$ - public static final ImageIcon targetIcon = SPSUtils.createIcon("Database_target", "SQL Database", ArchitectSwingSessionContext.ICON_SIZE); //$NON-NLS-1$ //$NON-NLS-2$ - public static final ImageIcon cataIcon = SPSUtils.createIcon("Catalog", "SQL Catalog", ArchitectSwingSessionContext.ICON_SIZE); //$NON-NLS-1$ //$NON-NLS-2$ - public static final ImageIcon schemaIcon = SPSUtils.createIcon("Schema", "SQL Schema", ArchitectSwingSessionContext.ICON_SIZE); //$NON-NLS-1$ //$NON-NLS-2$ - public static final ImageIcon tableIcon = SPSUtils.createIcon("Table", "SQL Table", ArchitectSwingSessionContext.ICON_SIZE); //$NON-NLS-1$ //$NON-NLS-2$ public static final ImageIcon tableProfiledIcon = SPSUtils.createIcon("Table_profiled", "SQL Table", ArchitectSwingSessionContext.ICON_SIZE); //$NON-NLS-1$ //$NON-NLS-2$ - public static final ImageIcon exportedKeyIcon = SPSUtils.createIcon("ExportedKey", "Exported key", ArchitectSwingSessionContext.ICON_SIZE); //$NON-NLS-1$ //$NON-NLS-2$ - public static final ImageIcon importedKeyIcon = SPSUtils.createIcon("ImportedKey", "Imported key", ArchitectSwingSessionContext.ICON_SIZE); //$NON-NLS-1$ //$NON-NLS-2$ - public static final ImageIcon ownerIcon = SPSUtils.createIcon("Owner", "Owner", ArchitectSwingSessionContext.ICON_SIZE); //$NON-NLS-1$ //$NON-NLS-2$ - public static final ImageIcon indexIcon = SPSUtils.createIcon("Index", "Index", ArchitectSwingSessionContext.ICON_SIZE); //$NON-NLS-1$ //$NON-NLS-2$ - public static final ImageIcon pkIndexIcon = SPSUtils.createIcon("Index_key", "Primary Key Index", ArchitectSwingSessionContext.ICON_SIZE); //$NON-NLS-1$ //$NON-NLS-2$ - public static final ImageIcon uniqueIndexIcon = SPSUtils.createIcon("Index_unique", "Unique Index", ArchitectSwingSessionContext.ICON_SIZE); //$NON-NLS-1$ //$NON-NLS-2$ - public static final ImageIcon columnIcon = SPSUtils.createIcon("Column", "Column", ArchitectSwingSessionContext.ICON_SIZE); //$NON-NLS-1$ //$NON-NLS-2$ 
+
+ public static final ImageIcon dbIcon = new ImageIcon(DBTreeCellRenderer.class.getResource("icons/Database16.png")); + public static final ImageIcon targetIcon = new ImageIcon(DBTreeCellRenderer.class.getResource("icons/Database_target16.png")); + public static final ImageIcon cataIcon = new ImageIcon(DBTreeCellRenderer.class.getResource("icons/Catalog16.png")); + public static final ImageIcon schemaIcon = new ImageIcon(DBTreeCellRenderer.class.getResource("icons/Schema16.png")); + public static final ImageIcon tableIcon = new ImageIcon(DBTreeCellRenderer.class.getResource("icons/Table16.png")); + public static final ImageIcon exportedKeyIcon = new ImageIcon(DBTreeCellRenderer.class.getResource("icons/ExportedKey16.png")); + public static final ImageIcon importedKeyIcon = new ImageIcon(DBTreeCellRenderer.class.getResource("icons/ImportedKey16.png")); + public static final ImageIcon ownerIcon = new ImageIcon(DBTreeCellRenderer.class.getResource("icons/Owner16.png")); + public static final ImageIcon indexIcon = new ImageIcon(DBTreeCellRenderer.class.getResource("icons/Index16.png")); + public static final ImageIcon pkIndexIcon = new ImageIcon(DBTreeCellRenderer.class.getResource("icons/Index_key16.png")); + public static final ImageIcon uniqueIndexIcon = new ImageIcon(DBTreeCellRenderer.class.getResource("icons/Index_unique16.png")); + public static final ImageIcon columnIcon = new ImageIcon(DBTreeCellRenderer.class.getResource("icons/Column16.png")); 
     private final ArchitectSession session;

Reply via email to