INTEGRATION: CWS qadev27 (1.11.12); FILE MERGED

2006/11/01 10:59:40 cn 1.11.12.3: #i69355# fix for broken objects
2006/10/23 14:02:08 cn 1.11.12.2: #i69335 bugfixing in reading objdsc from jar files
2006/09/07 10:34:57 cn 1.11.12.1: #i69355# bugfix in getting objdsc while parsing jar files

qadevOOo/runner/helper/APIDescGetter.java

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: APIDescGetter.java,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: obo $ $Date: 2006-01-19 14:23:38 $
+ *  last change: $Author: vg $ $Date: 2006-11-21 14:11:13 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -464,9 +464,15 @@ public class APIDescGetter extends DescGetter {
                 java.util.Enumeration e = f.entries();
 
                 while (e.hasMoreElements()) {
+
                     String entry = e.nextElement().toString();
 
-                    if (entry.endsWith("." + shortName.trim() + ".csv")) {
+                    if (debug) {
+                        System.out.println("### Read from connetion: " + entry);
+                    }
+
+                    if ((entry.lastIndexOf("/" + module + "/") != -1) &&
+                        entry.endsWith("." + shortName.trim() + ".csv")) {
                         InputStream input = this.getClass()
                                                 .getResourceAsStream("/" +
                                                                      entry);
@@ -485,11 +491,8 @@ public class APIDescGetter extends DescGetter {
                 while (buf.ready() && !found) {
                     String entry = buf.readLine();
 
-                    if (debug) {
-                        System.out.println("Read: " + entry);
-                    }
-
                     if (entry.endsWith(shortName.trim() + ".csv")) {
+                        System.out.println("FOUND  ####");
                         InputStream input = this.getClass()
                                                 .getResourceAsStream("/objdsc/" +
                                                                      module +
@@ -567,7 +570,7 @@ public class APIDescGetter extends DescGetter {
         for (int i = 0; i < files.length; i++) {
             if (files[i].endsWith("." + shortName + ".csv")) {
                 found = files[i];
-
+                System.out.println("found " + found);
                 break;
             }
         }
@@ -797,4 +800,4 @@ public class APIDescGetter extends DescGetter {
 
         return removed.contains(moduleName);
     }
-}
+}
\ No newline at end of file