summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlzhang2011-10-27 03:32:56 (EDT)
committer xgu2011-10-27 03:32:56 (EDT)
commit74fad948f456137c151a486e0a3c955b54cac0e0 (patch)
tree8fa2cc4e32b304fdbbd5c7969b1b94cdb92e4170
parentf3fb0405a9c601e87141a6590e2795337386491d (diff)
downloadorg.eclipse.birt-74fad948f456137c151a486e0a3c955b54cac0e0.zip
org.eclipse.birt-74fad948f456137c151a486e0a3c955b54cac0e0.tar.gz
org.eclipse.birt-74fad948f456137c151a486e0a3c955b54cac0e0.tar.bz2
Checkin: Change the API of IComputedMeasureDefinition and
IDerivedMeasureDefinition, use the method related to dataType in parent class
-rw-r--r--data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/api/query/IComputedMeasureDefinition.java9
-rw-r--r--data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/api/query/IDerivedMeasureDefinition.java7
-rw-r--r--data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/impl/query/ComputedMeasureDefinition.java12
-rw-r--r--data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/impl/query/DerivedMeasureDefinition.java14
4 files changed, 4 insertions, 38 deletions
diff --git a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/api/query/IComputedMeasureDefinition.java b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/api/query/IComputedMeasureDefinition.java
index 27f927a..885a7bd 100644
--- a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/api/query/IComputedMeasureDefinition.java
+++ b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/api/query/IComputedMeasureDefinition.java
@@ -27,12 +27,5 @@ public interface IComputedMeasureDefinition extends IMeasureDefinition
* @throws DataException
*/
public IBaseExpression getExpression( ) throws DataException;
-
- /**
- * Return the type of computed measure.
- *
- * @return
- * @throws DataException
- */
- public int getType() throws DataException;
+
}
diff --git a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/api/query/IDerivedMeasureDefinition.java b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/api/query/IDerivedMeasureDefinition.java
index 219af85..7e1f5b4 100644
--- a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/api/query/IDerivedMeasureDefinition.java
+++ b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/api/query/IDerivedMeasureDefinition.java
@@ -14,11 +14,4 @@ public interface IDerivedMeasureDefinition extends IMeasureDefinition
*/
public IBaseExpression getExpression( ) throws DataException;
- /**
- * Return the type of the derived measure.
- *
- * @return
- * @throws DataException
- */
- public int getType() throws DataException;
}
diff --git a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/impl/query/ComputedMeasureDefinition.java b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/impl/query/ComputedMeasureDefinition.java
index 1de2132..257a4f6 100644
--- a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/impl/query/ComputedMeasureDefinition.java
+++ b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/impl/query/ComputedMeasureDefinition.java
@@ -22,7 +22,6 @@ public class ComputedMeasureDefinition extends MeasureDefinition implements ICom
{
//
private IBaseExpression expr;
- private int type;
/**
* Constructor.
@@ -34,8 +33,8 @@ public class ComputedMeasureDefinition extends MeasureDefinition implements ICom
public ComputedMeasureDefinition( String name, int type, IBaseExpression expr )
{
super( name );
+ super.setDataType( type );
this.expr = expr;
- this.type = type;
}
/*
@@ -46,13 +45,4 @@ public class ComputedMeasureDefinition extends MeasureDefinition implements ICom
{
return this.expr;
}
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.birt.data.engine.olap.api.query.IComputedMeasureDefinition#getType()
- */
- public int getType()
- {
- return this.type;
- }
}
diff --git a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/impl/query/DerivedMeasureDefinition.java b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/impl/query/DerivedMeasureDefinition.java
index 669c084..28af8ce 100644
--- a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/impl/query/DerivedMeasureDefinition.java
+++ b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/impl/query/DerivedMeasureDefinition.java
@@ -8,7 +8,6 @@ public class DerivedMeasureDefinition extends MeasureDefinition implements IDeri
{
//
private IBaseExpression expr;
- private int type;
/**
* Constructor.
@@ -20,25 +19,16 @@ public class DerivedMeasureDefinition extends MeasureDefinition implements IDeri
public DerivedMeasureDefinition( String name, int type, IBaseExpression expr )
{
super( name );
+ super.setDataType( type );
this.expr = expr;
- this.type = type;
}
/*
* (non-Javadoc)
- * @see org.eclipse.birt.data.engine.olap.api.query.IComputedMeasureDefinition#getExpression()
+ * @see org.eclipse.birt.data.engine.olap.api.query.IDerivedMeasureDefinition#getExpression()
*/
public IBaseExpression getExpression( )
{
return this.expr;
}
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.birt.data.engine.olap.api.query.IComputedMeasureDefinition#getType()
- */
- public int getType()
- {
- return this.type;
- }
}