svn commit: r521206 - /lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java

Author: andreas
Date: Thu Mar 22 03:58:32 2007
New Revision: 521206

URL: http://svn.apache.org/viewvc?view=rev&rev=521206
Log:
Create usecase: allow to provide the sample name as parameter

Modified:
    
lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java

Modified: 
lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java?view=diff&rev=521206&r1=521205&r2=521206
==============================================================================
--- 
lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java
 (original)
+++ 
lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java
 Thu Mar 22 03:58:32 2007
@@ -21,6 +21,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.GregorianCalendar;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.avalon.framework.service.ServiceSelector;
@@ -309,7 +310,17 @@
                         + "] doesn't provide any samples!");
             }
             setParameter(SAMPLES, samples);
-            setParameter(SAMPLE, samples[0]);
+            String presetSample = getParameterAsString(SAMPLE);
+            if (presetSample == null) {
+                setParameter(SAMPLE, samples[0]);
+            }
+            else {
+                List sampleList = Arrays.asList(samples);
+                if (!sampleList.contains(presetSample)) {
+                    getLogger().warn("Sample [" + presetSample + "] not 
defined, using default sample.");
+                    setParameter(SAMPLE, samples[0]);
+                }
+            }
         } catch (Exception e) {
             throw new RuntimeException(e);
         } finally {