Author: truesweetman
Date: Thu Aug 28 14:51:29 2008
New Revision: 2657
Modified:
trunk/src/ca/sqlpower/architect/olap/MondrianModel.java
trunk/src/ca/sqlpower/architect/olap/xml-to-java-classes.xsl
Log:
Altered the set methods (for Objects) in the MondrianModel to not do
anything if the value is set to the value it already is.
Modified: trunk/src/ca/sqlpower/architect/olap/MondrianModel.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/olap/MondrianModel.java (original)
+++ trunk/src/ca/sqlpower/architect/olap/MondrianModel.java Thu Aug 28
14:51:29 2008
@@ -892,8 +892,11 @@
}
public void setFact(Relation /* */ newval) {
- int overallPosition = childPositionOffset(Relation.class);
Relation /* */ oldval = fact;
+ if (oldval == newval) {
+ return;
+ }
+ int overallPosition = childPositionOffset(Relation.class);
fact = newval;
if (fact == null) {
fireChildRemoved(Relation.class, overallPosition, oldval);
@@ -1353,8 +1356,11 @@
}
public void setCubeUsage(CubeUsages /* */ newval) {
- int overallPosition = childPositionOffset(CubeUsages.class);
CubeUsages /* */ oldval = cubeUsage;
+ if (oldval == newval) {
+ return;
+ }
+ int overallPosition = childPositionOffset(CubeUsages.class);
cubeUsage = newval;
if (cubeUsage == null) {
fireChildRemoved(CubeUsages.class, overallPosition, oldval);
@@ -2751,8 +2757,11 @@
}
public void setRelation(RelationOrJoin /* */ newval) {
- int overallPosition = childPositionOffset(RelationOrJoin.class);
RelationOrJoin /* */ oldval = relation;
+ if (oldval == newval) {
+ return;
+ }
+ int overallPosition = childPositionOffset(RelationOrJoin.class);
relation = newval;
if (relation == null) {
fireChildRemoved(RelationOrJoin.class, overallPosition,
oldval);
@@ -3329,8 +3338,11 @@
}
public void setKeyExp(KeyExpression /* */ newval) {
- int overallPosition = childPositionOffset(KeyExpression.class);
KeyExpression /* */ oldval = keyExp;
+ if (oldval == newval) {
+ return;
+ }
+ int overallPosition = childPositionOffset(KeyExpression.class);
keyExp = newval;
if (keyExp == null) {
fireChildRemoved(KeyExpression.class, overallPosition, oldval);
@@ -3352,8 +3364,11 @@
}
public void setNameExp(NameExpression /* */ newval) {
- int overallPosition = childPositionOffset(NameExpression.class);
NameExpression /* */ oldval = nameExp;
+ if (oldval == newval) {
+ return;
+ }
+ int overallPosition = childPositionOffset(NameExpression.class);
nameExp = newval;
if (nameExp == null) {
fireChildRemoved(NameExpression.class, overallPosition,
oldval);
@@ -3374,8 +3389,11 @@
}
public void setOrdinalExp(OrdinalExpression /* */ newval) {
- int overallPosition = childPositionOffset(OrdinalExpression.class);
OrdinalExpression /* */ oldval = ordinalExp;
+ if (oldval == newval) {
+ return;
+ }
+ int overallPosition = childPositionOffset(OrdinalExpression.class);
ordinalExp = newval;
if (ordinalExp == null) {
fireChildRemoved(OrdinalExpression.class, overallPosition,
oldval);
@@ -3397,8 +3415,11 @@
}
public void setParentExp(ParentExpression /* */ newval) {
- int overallPosition = childPositionOffset(ParentExpression.class);
ParentExpression /* */ oldval = parentExp;
+ if (oldval == newval) {
+ return;
+ }
+ int overallPosition = childPositionOffset(ParentExpression.class);
parentExp = newval;
if (parentExp == null) {
fireChildRemoved(ParentExpression.class, overallPosition,
oldval);
@@ -3417,8 +3438,11 @@
}
public void setClosure(Closure /* */ newval) {
- int overallPosition = childPositionOffset(Closure.class);
Closure /* */ oldval = closure;
+ if (oldval == newval) {
+ return;
+ }
+ int overallPosition = childPositionOffset(Closure.class);
closure = newval;
if (closure == null) {
fireChildRemoved(Closure.class, overallPosition, oldval);
@@ -3687,8 +3711,11 @@
}
public void setTable(Table /* */ newval) {
- int overallPosition = childPositionOffset(Table.class);
Table /* */ oldval = table;
+ if (oldval == newval) {
+ return;
+ }
+ int overallPosition = childPositionOffset(Table.class);
table = newval;
if (table == null) {
fireChildRemoved(Table.class, overallPosition, oldval);
@@ -4114,8 +4141,11 @@
}
public void setMeasureExp(MeasureExpression /* */ newval) {
- int overallPosition = childPositionOffset(MeasureExpression.class);
MeasureExpression /* */ oldval = measureExp;
+ if (oldval == newval) {
+ return;
+ }
+ int overallPosition = childPositionOffset(MeasureExpression.class);
measureExp = newval;
if (measureExp == null) {
fireChildRemoved(MeasureExpression.class, overallPosition,
oldval);
@@ -4409,8 +4439,11 @@
}
public void setFormulaElement(Formula /* */ newval) {
- int overallPosition = childPositionOffset(Formula.class);
Formula /* */ oldval = formulaElement;
+ if (oldval == newval) {
+ return;
+ }
+ int overallPosition = childPositionOffset(Formula.class);
formulaElement = newval;
if (formulaElement == null) {
fireChildRemoved(Formula.class, overallPosition, oldval);
@@ -4779,8 +4812,11 @@
}
public void setFormulaElement(Formula /* */ newval) {
- int overallPosition = childPositionOffset(Formula.class);
Formula /* */ oldval = formulaElement;
+ if (oldval == newval) {
+ return;
+ }
+ int overallPosition = childPositionOffset(Formula.class);
formulaElement = newval;
if (formulaElement == null) {
fireChildRemoved(Formula.class, overallPosition, oldval);
@@ -5493,8 +5529,11 @@
}
public void setLeft(RelationOrJoin /* */ newval) {
- int overallPosition = childPositionOffset(RelationOrJoin.class);
RelationOrJoin /* */ oldval = left;
+ if (oldval == newval) {
+ return;
+ }
+ int overallPosition = childPositionOffset(RelationOrJoin.class);
left = newval;
if (left == null) {
fireChildRemoved(RelationOrJoin.class, overallPosition,
oldval);
@@ -5513,8 +5552,11 @@
}
public void setRight(RelationOrJoin /* */ newval) {
- int overallPosition = childPositionOffset(RelationOrJoin.class);
RelationOrJoin /* */ oldval = right;
+ if (oldval == newval) {
+ return;
+ }
+ int overallPosition = childPositionOffset(RelationOrJoin.class);
right = newval;
if (right == null) {
fireChildRemoved(RelationOrJoin.class, overallPosition,
oldval);
@@ -5702,8 +5744,11 @@
}
public void setFilter(SQL /* */ newval) {
- int overallPosition = childPositionOffset(SQL.class);
SQL /* */ oldval = filter;
+ if (oldval == newval) {
+ return;
+ }
+ int overallPosition = childPositionOffset(SQL.class);
filter = newval;
if (filter == null) {
fireChildRemoved(SQL.class, overallPosition, oldval);
@@ -5973,8 +6018,11 @@
}
public void setColumnDefs(ColumnDefs /* */ newval) {
- int overallPosition = childPositionOffset(ColumnDefs.class);
ColumnDefs /* */ oldval = columnDefs;
+ if (oldval == newval) {
+ return;
+ }
+ int overallPosition = childPositionOffset(ColumnDefs.class);
columnDefs = newval;
if (columnDefs == null) {
fireChildRemoved(ColumnDefs.class, overallPosition, oldval);
@@ -5993,8 +6041,11 @@
}
public void setRows(Rows /* */ newval) {
- int overallPosition = childPositionOffset(Rows.class);
Rows /* */ oldval = rows;
+ if (oldval == newval) {
+ return;
+ }
+ int overallPosition = childPositionOffset(Rows.class);
rows = newval;
if (rows == null) {
fireChildRemoved(Rows.class, overallPosition, oldval);
@@ -6726,8 +6777,11 @@
}
public void setFactcount(AggFactCount /* */ newval) {
- int overallPosition = childPositionOffset(AggFactCount.class);
AggFactCount /* */ oldval = factcount;
+ if (oldval == newval) {
+ return;
+ }
+ int overallPosition = childPositionOffset(AggFactCount.class);
factcount = newval;
if (factcount == null) {
fireChildRemoved(AggFactCount.class, overallPosition, oldval);
@@ -8640,8 +8694,11 @@
}
public void setUnion(Union /* */ newval) {
- int overallPosition = childPositionOffset(Union.class);
Union /* */ oldval = union;
+ if (oldval == newval) {
+ return;
+ }
+ int overallPosition = childPositionOffset(Union.class);
union = newval;
if (union == null) {
fireChildRemoved(Union.class, overallPosition, oldval);
Modified: trunk/src/ca/sqlpower/architect/olap/xml-to-java-classes.xsl
==============================================================================
--- trunk/src/ca/sqlpower/architect/olap/xml-to-java-classes.xsl
(original)
+++ trunk/src/ca/sqlpower/architect/olap/xml-to-java-classes.xsl Thu Aug 28
14:51:29 2008
@@ -165,8 +165,11 @@
}
public void set<xsl:call-template
name="name-initcap"/>(<xsl:call-template name="attribute-type"/> /* */
newval) {
- int overallPosition = childPositionOffset(<xsl:call-template
name="attribute-type"/>.class);
<xsl:call-template name="attribute-type"/> /* */ oldval =
<xsl:value-of select="@name"/>;
+ if (oldval == newval) {
+ return;
+ }
+ int overallPosition = childPositionOffset(<xsl:call-template
name="attribute-type"/>.class);
<xsl:value-of select="@name"/> = newval;
if (<xsl:value-of select="@name"/> == null) {
fireChildRemoved(<xsl:call-template
name="attribute-type"/>.class, overallPosition, oldval);
