Author: jfuerth
Date: Mon Aug 25 09:09:30 2008
New Revision: 2603
Added:
trunk/src/icons/olap/
trunk/src/icons/olap/cube.png (contents, props changed)
trunk/src/icons/olap/cubeUsage.png (contents, props changed)
trunk/src/icons/olap/dimension.png (contents, props changed)
trunk/src/icons/olap/formula.png (contents, props changed)
trunk/src/icons/olap/hierarchy.png (contents, props changed)
trunk/src/icons/olap/level.png (contents, props changed)
trunk/src/icons/olap/measure.png (contents, props changed)
trunk/src/icons/olap/namedSet.png (contents, props changed)
trunk/src/icons/olap/schema.png (contents, props changed)
trunk/src/icons/olap/securityGrant.png (contents, props changed)
trunk/src/icons/olap/securityRole.png (contents, props changed)
trunk/src/icons/olap/securityUnion.png (contents, props changed)
trunk/src/icons/olap/virtualCube.png (contents, props changed)
Modified:
trunk/src/ca/sqlpower/architect/swingui/olap/OLAPTreeCellRenderer.java
Log:
First cut at using the tree icons Giulio made for us last week. So far so
good, but we'll be making a few tweaks based on how we feel now that we see
it in real life.
Modified:
trunk/src/ca/sqlpower/architect/swingui/olap/OLAPTreeCellRenderer.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/olap/OLAPTreeCellRenderer.java
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/olap/OLAPTreeCellRenderer.java
Mon Aug 25 09:09:30 2008
@@ -27,20 +27,41 @@
import ca.sqlpower.architect.olap.OLAPObject;
import ca.sqlpower.architect.olap.OLAPUtil;
+import ca.sqlpower.architect.olap.MondrianModel.CalculatedMember;
import ca.sqlpower.architect.olap.MondrianModel.Cube;
import ca.sqlpower.architect.olap.MondrianModel.CubeDimension;
+import ca.sqlpower.architect.olap.MondrianModel.CubeUsage;
+import ca.sqlpower.architect.olap.MondrianModel.Formula;
+import ca.sqlpower.architect.olap.MondrianModel.Grant;
import ca.sqlpower.architect.olap.MondrianModel.Hierarchy;
+import ca.sqlpower.architect.olap.MondrianModel.Level;
import ca.sqlpower.architect.olap.MondrianModel.Measure;
+import ca.sqlpower.architect.olap.MondrianModel.MemberGrant;
+import ca.sqlpower.architect.olap.MondrianModel.NamedSet;
+import ca.sqlpower.architect.olap.MondrianModel.Property;
+import ca.sqlpower.architect.olap.MondrianModel.Role;
import ca.sqlpower.architect.olap.MondrianModel.Schema;
+import ca.sqlpower.architect.olap.MondrianModel.Union;
import ca.sqlpower.architect.olap.MondrianModel.VirtualCube;
import ca.sqlpower.architect.olap.MondrianModel.VirtualCubeMeasure;
-import ca.sqlpower.architect.swingui.ArchitectSwingSessionContext;
+import ca.sqlpower.swingui.BlankIcon;
import ca.sqlpower.swingui.SPSUtils;
public class OLAPTreeCellRenderer extends DefaultTreeCellRenderer {
- 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 columnIcon =
SPSUtils.createIcon("Column", "Column",
ArchitectSwingSessionContext.ICON_SIZE); //$NON-NLS-1$ //$NON-NLS-2$
+
+ public static final ImageIcon CUBE_ICON =
SPSUtils.createIcon("olap/cube", "Cube"); //$NON-NLS-1$ //$NON-NLS-2$
+ public static final ImageIcon CUBE_USAGE_ICON =
SPSUtils.createIcon("olap/cubeUsage", "Cube Usage"); //$NON-NLS-1$
//$NON-NLS-2$
+ public static final ImageIcon DIMENSION_ICON =
SPSUtils.createIcon("olap/dimension", "Dimension"); //$NON-NLS-1$
//$NON-NLS-2$
+ public static final ImageIcon FORMULA_ICON =
SPSUtils.createIcon("olap/formula", "Formula"); //$NON-NLS-1$ //$NON-NLS-2$
+ public static final ImageIcon HIERARCHY_ICON =
SPSUtils.createIcon("olap/hierarchy", "Hierarchy"); //$NON-NLS-1$
//$NON-NLS-2$
+ public static final ImageIcon LEVEL_ICON =
SPSUtils.createIcon("olap/level", "Level"); //$NON-NLS-1$ //$NON-NLS-2$
+ public static final ImageIcon MEASURE_ICON =
SPSUtils.createIcon("olap/measure", "Measure"); //$NON-NLS-1$ //$NON-NLS-2$
+ public static final ImageIcon NAMED_SET_ICON =
SPSUtils.createIcon("olap/namedSet", "Named Set"); //$NON-NLS-1$
//$NON-NLS-2$
+ public static final ImageIcon SCHEMA_ICON =
SPSUtils.createIcon("olap/schema", "Schema"); //$NON-NLS-1$ //$NON-NLS-2$
+ public static final ImageIcon SEC_GRANT_ICON =
SPSUtils.createIcon("olap/securityGrant", "Grant"); //$NON-NLS-1$
//$NON-NLS-2$
+ public static final ImageIcon SEC_ROLE_ICON =
SPSUtils.createIcon("olap/securityRole", "Role"); //$NON-NLS-1$
//$NON-NLS-2$
+ public static final ImageIcon SEC_UNION_ICON =
SPSUtils.createIcon("olap/securityUnion", "Union"); //$NON-NLS-1$
//$NON-NLS-2$
+ public static final ImageIcon VIRTUAL_CUBE_ICON =
SPSUtils.createIcon("olap/virtualCube", "Virtual Cube"); //$NON-NLS-1$
//$NON-NLS-2$
public OLAPTreeCellRenderer(){
super();
@@ -55,22 +76,43 @@
int row,
boolean hasFocus) {
setText(OLAPUtil.nameFor((OLAPObject) value));
- if (value instanceof Schema) {
- setIcon(schemaIcon);
+ if (false) {
+ } else if (value instanceof CalculatedMember) {
+ setIcon(FORMULA_ICON);
} else if (value instanceof Cube) {
- setIcon(tableIcon);
- } else if (value instanceof VirtualCube) {
- setIcon(tableIcon);
+ setIcon(CUBE_ICON);
+ } else if (value instanceof CubeUsage) {
+ setIcon(CUBE_USAGE_ICON);
} else if (value instanceof CubeDimension) {
- setIcon(columnIcon);
+ setIcon(DIMENSION_ICON);
+ } else if (value instanceof Formula) {
+ setIcon(FORMULA_ICON);
+ } else if (value instanceof Hierarchy) {
+ setIcon(HIERARCHY_ICON);
+ } else if (value instanceof Level) {
+ setIcon(LEVEL_ICON);
} else if (value instanceof Measure) {
- setIcon(columnIcon);
+ setIcon(MEASURE_ICON);
+ } else if (value instanceof MemberGrant) {
+ setIcon(SEC_GRANT_ICON);
+ } else if (value instanceof NamedSet) {
+ setIcon(NAMED_SET_ICON);
+ } else if (value instanceof Schema) {
+ setIcon(SCHEMA_ICON);
+ } else if (value instanceof Grant) {
+ setIcon(SEC_GRANT_ICON);
+ } else if (value instanceof Property) {
+ setIcon(null);
+ } else if (value instanceof Role) {
+ setIcon(SEC_ROLE_ICON);
+ } else if (value instanceof Union) {
+ setIcon(SEC_UNION_ICON);
+ } else if (value instanceof VirtualCube) {
+ setIcon(VIRTUAL_CUBE_ICON);
} else if (value instanceof VirtualCubeMeasure) {
- setIcon(columnIcon);
- } else if (value instanceof Hierarchy) {
- setIcon(columnIcon);
+ setIcon(MEASURE_ICON);
} else {
- setIcon(null);
+ setIcon(BlankIcon.getInstance(16, 16));
}
this.selected = sel;
Added: trunk/src/icons/olap/cube.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/icons/olap/cubeUsage.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/icons/olap/dimension.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/icons/olap/formula.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/icons/olap/hierarchy.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/icons/olap/level.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/icons/olap/measure.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/icons/olap/namedSet.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/icons/olap/schema.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/icons/olap/securityGrant.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/icons/olap/securityRole.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/icons/olap/securityUnion.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/icons/olap/virtualCube.png
==============================================================================
Binary file. No diff available.
