[CIShell-SVN] SF.net SVN: cishell:[1123] trunk/core/org.cishell.utilities/src/org/cishell /utilities/MutateParameterUtilities.java

[<pat...@us...>]

Revision: 1123
          http://cishell.svn.sourceforge.net/cishell/?rev=1123&view=rev
Author:   pataphil
Date:     2010-08-12 16:14:56 +0000 (Thu, 12 Aug 2010)

Log Message:
-----------
* Added MutateParameterUtilities.formLabelAttributeDefinition
* Reviewed by Patrick

Modified Paths:
--------------
    trunk/core/org.cishell.utilities/src/org/cishell/utilities/MutateParameterUtilities.java

Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/MutateParameterUtilities.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/MutateParameterUtilities.java	2010-08-06 16:58:57 UTC (rev 1122)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/MutateParameterUtilities.java	2010-08-12 16:14:56 UTC (rev 1123)
@@ -5,6 +5,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Map;
+import java.util.List;
 
 import org.cishell.reference.service.metatype.BasicObjectClassDefinition;
 import org.cishell.utilities.mutateParameter.AttributeDefinitionTransformer;
@@ -24,15 +25,35 @@
 	public static AttributeDefinition formLabelAttributeDefinition(
 			AttributeDefinition oldAttributeDefinition, Table table)
 			throws ColumnNotFoundException {
-		Collection<String> validStringColumnsInTable =
+		Collection<String> originalLabelColumnNames =
 			Arrays.asList(TableUtilities.getValidStringColumnNamesInTable(table));
 	
 		AttributeDefinition labelAttributeDefinition = cloneToDropdownAttributeDefinition(
-			oldAttributeDefinition, validStringColumnsInTable, validStringColumnsInTable);
+			oldAttributeDefinition, originalLabelColumnNames, originalLabelColumnNames);
 
 		return labelAttributeDefinition;
 	}
+	
+	/**
+	 * Support additional default labels to be added to the front.
+	 * TODO: Look at other utilities for future refactoring.  (This may not be needed.)
+	 */
+	public static AttributeDefinition formLabelAttributeDefinition(
+			AttributeDefinition oldAttributeDefinition, Table table, List<String> additionalLabels)
+			throws ColumnNotFoundException {
+		Collection<String> originalLabelColumnNames = 
+			Arrays.asList(TableUtilities.getValidStringColumnNamesInTable(table));
 
+		Collection<String> newLabelColumnNames = new ArrayList<String>();
+		newLabelColumnNames.addAll(additionalLabels);
+		newLabelColumnNames.addAll(originalLabelColumnNames);
+
+		AttributeDefinition labelAttributeDefinition = cloneToDropdownAttributeDefinition(
+			oldAttributeDefinition, newLabelColumnNames, newLabelColumnNames);
+
+		return labelAttributeDefinition;
+	}
+
 	public static AttributeDefinition formDateAttributeDefinition(
 			AttributeDefinition oldAttributeDefinition, Table table)
 			throws ColumnNotFoundException {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.