Summary: Added multiple default values to the selection list.

Description of Issue: [BZ]Default parameter is not visible on listbox
Description of Resolution: Added multiple default values, which are not in the selection list, to the selection list.

1 files changed, 19 insertions, 1 deletions

diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/ParameterUtility.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/ParameterUtility.java
index 0967996..87a39bf 100644
--- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/ParameterUtility.java
+++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/ParameterUtility.java
@@ -148,12 +148,19 @@ public class ParameterUtility
 					{
 						if ( DataUtil.contain( (List<?>)defaultValues, displayValue, true ) )
 						{
-							parameterBean.setDefaultValueInList( true );							
+							parameterBean.setDefaultValueInList( true );
+							
+							// remove current value from the defaultvalues list
+							defaultValues.remove(displayValue);
 						}
 					}
+					// if it is a single default value
 					else if ( DataUtil.equals( displayValue, parameterBean.getDefaultValue( ) ) )
 					{
 						parameterBean.setDefaultValueInList( true );
+						
+						// remove current value from the defaultvalues list
+						defaultValues.remove(displayValue);
 					}
 				}
 			}
@@ -171,6 +178,17 @@ public class ParameterUtility
 											.getValue( ) ) );
 					isDisplayTextInList = true;
 				}
+				
+				// handle multiple default values
+				if ( defaultValues != null && defaultValues.size() > 0 )
+				{
+					for (int i = 0; i < defaultValues.size(); i++)
+					{
+						// add these default values which are not in the selectionList as string values, 
+						// for those values have already been evaluated and are of string type.
+						processedList.add(i, new ParameterSelectionChoice( defaultValues.get(i), defaultValues.get(i) ) );
+					}
+				}
 	
 				parameterBean.setDisplayTextInList( isDisplayTextInList );
 			}