INTEGRATION: CWS qadev16 (1.6.6); FILE MERGED

2004/02/11 13:05:25 sw 1.6.6.2: #i25366#
2004/02/05 09:55:00 sw 1.6.6.1: #i24566#

qadevOOo/runner/helper/APIDescGetter.java

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: APIDescGetter.java,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change:$Date: 2003-12-11 11:32:12 $
+ *  last change:$Date: 2004-03-19 14:28:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -93,12 +93,37 @@ public class APIDescGetter extends DescGetter {
                 return null;
             }
 
-            DescEntry entry = getDescriptionForSingleJob(job, descPath, debug);
+            // special in case several Interfaces are given comma separated
+            if (job.indexOf(",") < 0) {
+                DescEntry entry = getDescriptionForSingleJob(job, descPath,
+                                                             debug);
 
-            if (entry != null) {
-                return new DescEntry[] { entry };
+                if (entry != null) {
+                    return new DescEntry[] { entry };
+                } else {
+                    return null;
+                }
             } else {
-                return null;
+                ArrayList subs = getSubInterfaces(job);
+                String partjob = job.substring(0, job.indexOf(",")).trim();
+                DescEntry entry = getDescriptionForSingleJob(partjob, descPath,
+                                                             debug);
+
+                if (entry != null) {
+                    for (int i = 0; i < entry.SubEntryCount; i++) {
+                        String subEntry = entry.SubEntries[i].longName;
+                        int cpLength = entry.longName.length();
+                        subEntry = subEntry.substring(cpLength+2,subEntry.length());
+
+                        if (subs.contains(subEntry)) {
+                            entry.SubEntries[i].isToTest = true;
+                        }
+                    }
+
+                    return new DescEntry[] { entry };
+                } else {
+                    return null;
+                }
             }
         }
 
@@ -385,11 +410,9 @@ public class APIDescGetter extends DescGetter {
 
         java.net.URL url = this.getClass().getResource("/objdsc/" + module);
 
-        if ((url == null) && debug) {
-            System.out.println("Classpath doesn't contain descriptions for" +
-                               " module '" + module + "'.");
-
-            return null;
+        if (url == null) {
+            return setErrorDescription(theEntry,
+                                       "Couldn't find module " + module);
         }
 
         try {
@@ -411,6 +434,8 @@ public class APIDescGetter extends DescGetter {
                                                                      entry);
                         csvFile = new BufferedReader(
                                           new InputStreamReader(input));
+
+                        break;
                     }
                 }
             } else {
@@ -444,6 +469,12 @@ public class APIDescGetter extends DescGetter {
             e.printStackTrace();
         }
 
+        if (csvFile == null) {
+            return setErrorDescription(theEntry,
+                                       "Couldn't find component " +
+                                       theEntry.entryName);
+        }
+
         DescEntry[] subEntries = getSubEntries(csvFile, theEntry, debug);
 
         theEntry.SubEntryCount = subEntries.length;
@@ -525,4 +556,19 @@ public class APIDescGetter extends DescGetter {
 
         return aEntry;
     }
+
+    protected ArrayList getSubInterfaces(String job) {
+        ArrayList namesList = new ArrayList();
+        StringTokenizer st = new StringTokenizer(job, ",");
+
+        for (int i = 0; st.hasMoreTokens(); i++) {
+            String token = st.nextToken();
+
+            if (token.indexOf(".") < 0) {
+                namesList.add(token);
+            }
+        }
+
+        return namesList;
+    }
 }
\ No newline at end of file