Author: jfuerth
Date: Wed Aug 27 07:58:21 2008
New Revision: 2620
Added:
trunk/src/icons/olap/cubeGrant.png (contents, props changed)
trunk/src/icons/olap/hierarchyGrant.png (contents, props changed)
trunk/src/icons/olap/levelProperty.png (contents, props changed)
trunk/src/icons/olap/measureProperty.png (contents, props changed)
trunk/src/icons/olap/schemaGrant.png (contents, props changed)
Modified:
trunk/src/ca/sqlpower/architect/swingui/olap/OLAPTreeCellRenderer.java
trunk/src/icons/olap/dimension.png
trunk/src/icons/olap/formula.png
trunk/src/icons/olap/hierarchy.png
trunk/src/icons/olap/level.png
trunk/src/icons/olap/measure.png
Log:
Newly tweaked tree icons from Giulio which rock and roll all night (and
party every day)
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
Wed Aug 27 07:58:21 2008
@@ -30,10 +30,12 @@
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.CubeGrant;
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.HierarchyGrant;
import ca.sqlpower.architect.olap.MondrianModel.Level;
import ca.sqlpower.architect.olap.MondrianModel.Measure;
import ca.sqlpower.architect.olap.MondrianModel.MemberGrant;
@@ -41,6 +43,7 @@
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.SchemaGrant;
import ca.sqlpower.architect.olap.MondrianModel.Union;
import ca.sqlpower.architect.olap.MondrianModel.VirtualCube;
import ca.sqlpower.architect.olap.MondrianModel.VirtualCubeMeasure;
@@ -55,10 +58,15 @@
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 LEVEL_PROP_ICON =
SPSUtils.createIcon("olap/levelProperty", "Level Property"); //$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 MEASURE_PROP_ICON =
SPSUtils.createIcon("olap/measureProperty", "Measure Property");
//$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_CUBE_GRANT_ICON =
SPSUtils.createIcon("olap/cubeGrant", "Cube Grant"); //$NON-NLS-1$
//$NON-NLS-2$
+ public static final ImageIcon SEC_HIERARCHY_GRANT_ICON =
SPSUtils.createIcon("olap/hierarchyGrant", "Hierarchy Grant");
//$NON-NLS-1$ //$NON-NLS-2$
+ public static final ImageIcon SEC_SCHEMA_GRANT_ICON =
SPSUtils.createIcon("olap/schemaGrant", "Schema 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$
@@ -91,14 +99,26 @@
setIcon(HIERARCHY_ICON);
} else if (value instanceof Level) {
setIcon(LEVEL_ICON);
+ } else if (value instanceof Property && ((Property)
value).getParent() instanceof Level) {
+ setIcon(LEVEL_PROP_ICON);
} else if (value instanceof Measure) {
setIcon(MEASURE_ICON);
+ } else if (value instanceof Property && ((Property)
value).getParent() instanceof Measure) {
+ setIcon(MEASURE_PROP_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 CubeGrant) {
+ setIcon(SEC_CUBE_GRANT_ICON);
+// } else if (value instanceof DimensionGrant) { TODO get this icon
+// setIcon(SEC_DIMENSION_GRANT_ICON);
+ } else if (value instanceof HierarchyGrant) {
+ setIcon(SEC_HIERARCHY_GRANT_ICON);
+ } else if (value instanceof SchemaGrant) {
+ setIcon(SEC_SCHEMA_GRANT_ICON);
} else if (value instanceof Grant) {
setIcon(SEC_GRANT_ICON);
} else if (value instanceof Property) {
Added: trunk/src/icons/olap/cubeGrant.png
==============================================================================
Binary file. No diff available.
Modified: trunk/src/icons/olap/dimension.png
==============================================================================
Binary files. No diff available.
Modified: trunk/src/icons/olap/formula.png
==============================================================================
Binary files. No diff available.
Modified: trunk/src/icons/olap/hierarchy.png
==============================================================================
Binary files. No diff available.
Added: trunk/src/icons/olap/hierarchyGrant.png
==============================================================================
Binary file. No diff available.
Modified: trunk/src/icons/olap/level.png
==============================================================================
Binary files. No diff available.
Added: trunk/src/icons/olap/levelProperty.png
==============================================================================
Binary file. No diff available.
Modified: trunk/src/icons/olap/measure.png
==============================================================================
Binary files. No diff available.
Added: trunk/src/icons/olap/measureProperty.png
==============================================================================
Binary file. No diff available.
Added: trunk/src/icons/olap/schemaGrant.png
==============================================================================
Binary file. No diff available.
