Each document type now uses itself. So default uses iincludes documents of the type...

[tools/siman.git] / Workspace / Siman-Common / src / org / splat / service / technical / ProjectSettingsServiceImpl.java

diff --git a/Workspace/Siman-Common/src/org/splat/service/technical/ProjectSettingsServiceImpl.java b/Workspace/Siman-Common/src/org/splat/service/technical/ProjectSettingsServiceImpl.java
index 08feeae8374fa27a8a524ce55efe817358a6e02f..88a779e22122e348703cf7650dd2e55a16fa29d8 100644 (file)
--- a/Workspace/Siman-Common/src/org/splat/service/technical/ProjectSettingsServiceImpl.java
+++ b/Workspace/Siman-Common/src/org/splat/service/technical/ProjectSettingsServiceImpl.java
@@ -801,13 +801,21 @@ public class ProjectSettingsServiceImpl implements ProjectSettingsService {
                                                        slist.toArray(new ProjectSettingsService.Step[slist
                                                                        .size()]));
                                        if (uses != null) {
-                                               tdoc = maptype.get(uses);
-                                               if (tdoc == null) {
-                                                       LOG.warn("Undefined \"" + uses
-                                                                       + "\" document type.");
-                                               } else {
-                                                       tprop.setUses(tdoc);
+                                               // Parse uses attribute
+                                               String[] usesArr = uses.split(",");
+                                               List<DocumentType> usesTypesList = new ArrayList<DocumentType>();
+                                               for (String usesType: usesArr) {
+                                                       tdoc = maptype.get(usesType.trim());
+                                                       if (tdoc == null) {
+                                                               LOG.warn("Undefined \"" + usesType.trim()
+                                                                               + "\" document type.");
+                                                       } else {
+                                                               if (!usesTypesList.contains(tdoc)) {
+                                                                       usesTypesList.add(tdoc);
+                                                               }
+                                                       }
                                                }
+                                               tprop.setUses(usesTypesList.toArray(new DocumentType[]{}));
                                        }
                                        if (step != null) {
                                                tprop.setResult(step);