=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DefaultDataEntryFormService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DefaultDataEntryFormService.java	2011-05-10 20:24:39 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DefaultDataEntryFormService.java	2011-05-11 21:14:38 +0000
@@ -193,10 +193,10 @@
                 // -------------------------------------------------------------
 
                 StringBuilder title = new StringBuilder( "title=\"" ).append( dataElement.getId() ).append( " - " ).
-                    append( dataElement.getShortName() ).append( " - " ).append( optionComboId ).append( " - " ).
+                    append( dataElement.getName() ).append( " - " ).append( optionComboId ).append( " - " ).
                     append( optionComboName ).append( " - " ).append( dataElement.getType() ).append( "\"" );
                 
-                String displayValue = dataElement != null ? "value=\"[ " + dataElement.getShortName() + " " + optionComboName + " ]\"" : "[ Data element does not exist ]";
+                String displayValue = dataElement != null ? "value=\"[ " + dataElement.getName() + " " + optionComboName + " ]\"" : "[ Data element does not exist ]";
                 String displayTitle = dataElement != null ? title.toString() : "[ Data element does not exist ]";
                 
                 inputHtml = inputHtml.contains( EMPTY_VALUE_TAG ) ? inputHtml.replace( EMPTY_VALUE_TAG, displayValue ) : inputHtml + " " + displayValue;                    
@@ -312,7 +312,7 @@
 
                 inputHtml = inputHtml.replaceAll( "view=\".*?\"", "" ); // For backwards compatibility
 
-                StringBuilder title = new StringBuilder( "title=\"Name: " ).append( dataElement.getShortName() ).
+                StringBuilder title = new StringBuilder( "title=\"Name: " ).append( dataElement.getName() ).
                     append( " Type: " ).append( dataElement.getType() ).append( " Min: " ).append( minValue ).
                     append( " Max: " ).append( maxValue ).append( "\"" );
                 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm	2011-05-11 12:54:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm	2011-05-11 21:14:38 +0000
@@ -14,7 +14,7 @@
 
 		jQuery("#selectionDialog").dialog({
 			minWidth: 560,
-			minHeight: 250,
+			minHeight: 320,
 			position: [900, 60]
 		});
 
@@ -192,7 +192,7 @@
 
 			<tr id="dataElementsTab">
 				<td colspan="2">
-					<select id="dataElementSelector" multiple="multiple" style="height: 150px; width: 100%; margin: 1px;">
+					<select id="dataElementSelector" multiple="multiple" style="height: 212px; width: 100%; margin: 1px;">
 					#foreach( $operand in $operands )
 						<option class="dataElementSelectorOption"
 								data-idx="${velocityCount}"
@@ -213,7 +213,7 @@
 
 			<tr id="indicatorsTab">
 				<td colspan="2">
-					<select id="indicatorSelector" multiple="multiple" style="height: 150px; width: 100%; margin: 1px;">
+					<select id="indicatorSelector" multiple="multiple" style="height: 212px; width: 100%; margin: 1px;">
 					#foreach( $indicator in $indicators )
 						<option class="indicatorSelectorOption"
 								data-idx="${velocityCount}" data-id="${indicator.id}" ondblclick="insertIndicator()">$encoder.htmlEncode( $indicator.name )</option>

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2011-05-07 22:33:04 +0000
+++ dhis-2/pom.xml	2011-05-11 21:14:38 +0000
@@ -578,7 +578,7 @@
       <dependency>
         <groupId>jfree</groupId>
         <artifactId>jfreechart</artifactId>
-        <version>1.0.12</version>
+        <version>1.0.13</version>
         <exclusions>
           <exclusion>
             <groupId>gnujaxp</groupId>