INTEGRATION: CWS qadev12 (1.2.16); FILE MERGED

2003/09/24 16:13:05 sg 1.2.16.2: #112239#CHG: added recursive scenario parsing
2003/09/12 15:58:57 sg 1.2.16.1: #112239# CHG: read scenario files recursively

1 files changed, 11 insertions, 2 deletions

diff --git a/qadevOOo/runner/share/DescGetter.java b/qadevOOo/runner/share/DescGetter.java
index 8e13f38575a2..405c90dc0235 100644
--- a/qadevOOo/runner/share/DescGetter.java
+++ b/qadevOOo/runner/share/DescGetter.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DescGetter.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change:$Date: 2003-05-27 12:04:04 $
+ *  last change:$Date: 2003-10-06 12:40:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -85,6 +85,7 @@ public abstract class DescGetter {
         String line = "";
         BufferedReader scenario = null;
         DescEntry[] entries = null;
+
         try {
             scenario = new BufferedReader(new FileReader(url));
         } catch (java.io.FileNotFoundException fnfe) {
@@ -97,6 +98,14 @@ public abstract class DescGetter {
                     entryList.add(getDescriptionForSingleJob(
                                     line.substring(3).trim(), descPath, debug));
                 }
+                else if (line.startsWith("-sce")) {
+                    DescEntry[] subs = getScenario(
+                                    line.substring(5,line.length()).trim(),
+                                                        descPath, debug);
+                    for (int i=0; i<subs.length; i++) {
+                        entryList.add(subs[i]);
+                    }
+                }
                 line = scenario.readLine();
             } catch (java.io.IOException ioe) {
                 if (debug)