dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #04974
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1663: Renamed Operand.id to operandId
------------------------------------------------------------
revno: 1663
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2010-03-17 17:08:03 +0100
message:
Renamed Operand.id to operandId
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementOperand.java
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOperands.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlOperands.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/editDenumForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/denum.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementForm.vm
dhis-2/dhis-web/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/editExpressionForm.vm
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/expression.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementOperand.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementOperand.java 2010-03-17 13:16:09 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementOperand.java 2010-03-17 16:08:03 +0000
@@ -41,12 +41,12 @@
{
public static final String SEPARATOR = ".";
- private String id;
-
private int dataElementId;
private int optionComboId;
+ private String operandId;
+
private String operandName;
private List<Integer> aggregationLevels = new ArrayList<Integer>();
@@ -61,24 +61,24 @@
public DataElementOperand( int dataElementId, int optionComboId )
{
- this.id = dataElementId + SEPARATOR + optionComboId;
this.dataElementId = dataElementId;
this.optionComboId = optionComboId;
+ this.operandId = dataElementId + SEPARATOR + optionComboId;
}
public DataElementOperand( int dataElementId, int optionComboId, String operandName )
{
- this.id = dataElementId + SEPARATOR + optionComboId;
this.dataElementId = dataElementId;
this.optionComboId = optionComboId;
+ this.operandId = dataElementId + SEPARATOR + optionComboId;
this.operandName = operandName;
}
public DataElementOperand( int dataElementId, int optionComboId, String operandName, List<Integer> aggregationLevels )
{
- this.id = dataElementId + SEPARATOR + optionComboId;
this.dataElementId = dataElementId;
this.optionComboId = optionComboId;
+ this.operandId = dataElementId + SEPARATOR + optionComboId;
this.operandName = operandName;
this.aggregationLevels = aggregationLevels;
}
@@ -135,26 +135,6 @@
// Getters & setters
// -------------------------------------------------------------------------
- public String getId()
- {
- return id;
- }
-
- public void setId( String id )
- {
- this.id = id;
- }
-
- public String getOperandName()
- {
- return operandName;
- }
-
- public void setOperandName( String operandName )
- {
- this.operandName = operandName;
- }
-
public int getDataElementId()
{
return dataElementId;
@@ -175,6 +155,26 @@
this.optionComboId = optionComboId;
}
+ public String getOperandId()
+ {
+ return operandId;
+ }
+
+ public void setOperandId( String operandId )
+ {
+ this.operandId = operandId;
+ }
+
+ public String getOperandName()
+ {
+ return operandName;
+ }
+
+ public void setOperandName( String operandName )
+ {
+ this.operandName = operandName;
+ }
+
public List<Integer> getAggregationLevels()
{
return aggregationLevels;
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOperands.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOperands.vm 2010-02-04 11:04:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOperands.vm 2010-03-17 16:08:03 +0000
@@ -2,9 +2,9 @@
{ "operands": [
#foreach( $operand in $operands )
{
- "id": "$!{operand.id}",
"dataElementId": "$!{operand.dataElementId}",
"optionComboId": "$!{operand.optionComboId}",
+ "operandId": "$!{operand.operandId}",
"operandName": "$!encoder.jsEncode( ${operand.operandName} )"
}#if( $velocityCount < $size ),#end
#end
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlOperands.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlOperands.vm 2010-03-17 14:24:39 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlOperands.vm 2010-03-17 16:08:03 +0000
@@ -2,11 +2,10 @@
<operands>
#foreach ( $operand in $operands )
<operand>
- <id>$operand.id</id>
- <name>$encoder.xmlEncode( $operand.operandName )</name>
<dataElementId>$operand.dataElementId</dataElementId>
<categoryOptionComboId>$operand.optionComboId</categoryOptionComboId>
- <operandName>$operand.operandName</operandName>
+ <operandId>$operand.operandId</operandId>
+ <operandName>$encoder.xmlEncode( $operand.operandName )</operandName>
</operand>
#end
</operands>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementForm.vm 2010-02-09 09:10:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementForm.vm 2010-03-17 16:08:03 +0000
@@ -126,7 +126,7 @@
</select><br>
<select id="availableDataElements" size="5" multiple="multiple" style="width:450px">
#foreach( $operand in $operands )
- <option value="[$operand.id]">$encoder.htmlEncode( $operand.operandName )</option>
+ <option value="[$operand.operandId]">$encoder.htmlEncode( $operand.operandName )</option>
#end
</select>
</td>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/editDenumForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/editDenumForm.vm 2009-12-14 17:40:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/editDenumForm.vm 2010-03-17 16:08:03 +0000
@@ -61,7 +61,7 @@
<select id="dataElementId" name="dataElementId" size="10" style="min-width:450px"
ondblclick="insertText( 'formula', this.options[ this.selectedIndex ].value, 'aggregationOperator' )">
#foreach( $operand in $operands )
- <option value="[$operand.id]">$encoder.htmlEncode( $operand.operandName )</option>
+ <option value="[$operand.operandId]">$encoder.htmlEncode( $operand.operandName )</option>
#end
</select>
</td>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js 2010-02-15 12:29:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js 2010-03-17 16:08:03 +0000
@@ -110,8 +110,8 @@
for ( var i = 0; i < operands.length; i++ )
{
- var id = operands[ i ].getElementsByTagName( "id" )[0].firstChild.nodeValue;
- var dataElementName = operands[ i ].getElementsByTagName( "name" )[0].firstChild.nodeValue;
+ var id = operands[ i ].getElementsByTagName( "operandId" )[0].firstChild.nodeValue;
+ var dataElementName = operands[ i ].getElementsByTagName( "operandName" )[0].firstChild.nodeValue;
var option = document.createElement( "option" );
option.value = id;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/denum.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/denum.js 2010-03-08 08:34:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/denum.js 2010-03-17 16:08:03 +0000
@@ -25,8 +25,8 @@
for ( var i = 0; i < operands.length; i++)
{
- var id = operands[ i ].getElementsByTagName( "id" )[0].firstChild.nodeValue;
- var elementName = operands[ i ].getElementsByTagName( "name" )[0].firstChild.nodeValue;
+ var id = operands[ i ].getElementsByTagName( "operandId" )[0].firstChild.nodeValue;
+ var elementName = operands[ i ].getElementsByTagName( "operandName" )[0].firstChild.nodeValue;
var option = document.createElement( "option" );
option.value = "[" + id + "]";
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementForm.vm 2010-02-09 09:10:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementForm.vm 2010-03-17 16:08:03 +0000
@@ -163,8 +163,8 @@
</tr>
#foreach ( $operand in $operands )
<tr>
- <td>$operand.operandName<input type="hidden" name="dataElementIds" value="$operand.id"></td>
- <td><input type="text" name="factors" value="$factorMap.get($operand.id)"></td>
+ <td>$operand.operandName<input type="hidden" name="dataElementIds" value="$operand.operandId"></td>
+ <td><input type="text" name="factors" value="$factorMap.get($operand.operandId)"></td>
<td><button type="button" title="$i18n.getString('remove_all')"><img src="../images/delete.png" alt="$i18n.getString('delete_icon')"></button></td>
</tr>
#end
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml 2010-02-09 15:55:32 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml 2010-03-17 16:08:03 +0000
@@ -160,15 +160,6 @@
<!-- MapLegendSet -->
- <bean id="org.hisp.dhis.mapping.action.AddMapLegendSetAction"
- class="org.hisp.dhis.mapping.action.AddMapLegendSetAction"
- scope="prototype">
- <property name="mappingService"
- ref="org.hisp.dhis.mapping.MappingService"/>
- <property name="indicatorService"
- ref="org.hisp.dhis.indicator.IndicatorService"/>
- </bean>
-
<bean id="org.hisp.dhis.mapping.action.AddOrUpdateMapLegendSetAction"
class="org.hisp.dhis.mapping.action.AddOrUpdateMapLegendSetAction"
scope="prototype">
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/editExpressionForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/editExpressionForm.vm 2009-12-14 17:51:18 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/editExpressionForm.vm 2010-03-17 16:08:03 +0000
@@ -56,7 +56,7 @@
onmouseover="this.title = this.options[this.selectedIndex].text;"
ondblclick="insertText( 'expression', this.options[ this.selectedIndex ].value )">
#foreach( $operand in $operands )
- <option value="[$operand.id]">$encoder.htmlEncode( $operand.operandName )</option>
+ <option value="[$operand.operandId]">$encoder.htmlEncode( $operand.operandName )</option>
#end
</select>
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/expression.js'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/expression.js 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/expression.js 2010-03-17 16:08:03 +0000
@@ -69,8 +69,8 @@
for ( var i = 0; i < operands.length; i++)
{
- var id = operands[ i ].getElementsByTagName( "id" )[0].firstChild.nodeValue;
- var elementName = operands[ i ].getElementsByTagName( "name" )[0].firstChild.nodeValue;
+ var id = operands[ i ].getElementsByTagName( "operandId" )[0].firstChild.nodeValue;
+ var elementName = operands[ i ].getElementsByTagName( "operandName" )[0].firstChild.nodeValue;
var option = document.createElement( "option" );
option.value = "[" + id + "]";
