Split Property into StandardProperty and Abstract for cleanup

Signed-off-by: Stefan Bischof <stbischof@bipolis.org>

Author: stbischof

mondrian/src/main/java/mondrian/olap/AbstractProperty.java

@@ -0,0 +1,71 @@
+package mondrian.olap;
+
+import org.eclipse.daanse.olap.api.element.Property;
+
+import mondrian.spi.PropertyFormatter;
+
+public abstract class AbstractProperty implements Property {
+
+	private String name;
+	private String description;
+
+	private final Datatype type;
+	private final boolean internal;
+	private final boolean member;
+	private final boolean cell;
+
+	protected AbstractProperty(String name, Datatype type, boolean internal, boolean member, boolean cell,
+			String description) {
+		this.name = name;
+		this.description = description;
+		this.type = type;
+		this.internal = internal;
+		this.member = member;
+		this.cell = cell;
+	}
+
+	@Override
+	public String getCaption() {
+		return name;
+	}
+
+	@Override
+	public String getDescription() {
+		return description;
+	}
+
+	@Override
+	public PropertyFormatter getFormatter() {
+		return null;
+	}
+
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	@Override
+	public Datatype getType() {
+		return type;
+	}
+
+	@Override
+	public boolean isCellProperty() {
+		return cell;
+	}
+
+	@Override
+	public boolean isInternal() {
+		return internal;
+	}
+
+	@Override
+	public boolean isMemberProperty() {
+		return member;
+	}
+
+	@Override
+	public String toString() {
+		return name;
+	}
+}

mondrian/src/main/java/mondrian/olap/FormulaImpl.java

@@ -160,9 +160,9 @@ public void accept(Validator validator) {
             Expression formatExp = getFormatExp(validator);
             if (formatExp != null) {
                 mdxMember.setProperty(
-                    Property.FORMAT_EXP_PARSED.name, formatExp);
+                    StandardProperty.FORMAT_EXP_PARSED.getName(), formatExp);
                 mdxMember.setProperty(
-                    Property.FORMAT_EXP.name, Util.unparse(formatExp));
+                		StandardProperty.FORMAT_EXP.getName(), Util.unparse(formatExp));
             }
 
             final List<MemberProperty> memberPropertyList =
@@ -173,7 +173,7 @@ public void accept(Validator validator) {
             for (int i = 0; i < memberPropertyList.size(); i++) {
                 MemberProperty memberProperty = memberPropertyList.get(i);
                 if (memberProperty.getName().equals(
-                        Property.CELL_FORMATTER_SCRIPT_LANGUAGE.name))
+                		StandardProperty.CELL_FORMATTER_SCRIPT_LANGUAGE.getName()))
                 {
                     memberPropertyList.remove(i);
                     memberPropertyList.add(0, memberProperty);
@@ -183,7 +183,7 @@ public void accept(Validator validator) {
             // For each property of the formula, make it a property of the
             // member.
             for (MemberProperty memberProperty : memberPropertyList) {
-                if (Property.FORMAT_PROPERTIES.contains(
+                if (StandardProperty.FORMAT_PROPERTIES.contains(
                         memberProperty.getName()))
                 {
                     continue; // we already dealt with format_string props
@@ -454,7 +454,7 @@ public Member getMdxMember() {
      */
     @Override
     public Number getSolveOrder() {
-        return getIntegerMemberProperty(Property.SOLVE_ORDER.name);
+        return getIntegerMemberProperty(StandardProperty.SOLVE_ORDER.getName());
     }
 
     /**
@@ -515,7 +515,7 @@ private static Number quickEval(Expression exp) {
     private Expression getFormatExp(Validator validator) {
         // If they have specified a format string (which they can do under
         // several names) return that.
-        for (String prop : Property.FORMAT_PROPERTIES) {
+        for (String prop : StandardProperty.FORMAT_PROPERTIES) {
             Expression formatExp = getMemberProperty(prop);
             if (formatExp != null) {
                 return formatExp;
@@ -686,7 +686,7 @@ private void returnFormula(Member member) {
 
         private Expression getFormula(Member member) {
             return (Expression)
-                member.getPropertyValue(Property.FORMAT_EXP_PARSED.name);
+                member.getPropertyValue(StandardProperty.FORMAT_EXP_PARSED.getName());
         }
     }
 }

mondrian/src/main/java/mondrian/olap/MemberBase.java

@@ -156,7 +156,7 @@ public MemberType getMemberType() {
 
   @Override
 public String getDescription() {
-    return (String) getPropertyValue( Property.DESCRIPTION_PROPERTY.name );
+    return (String) getPropertyValue( StandardProperty.DESCRIPTION_PROPERTY.getName() );
   }
 
   @Override