CWS-TOOLING: integrate CWS qadev38

2009-08-26 09:09:14 +0200 lla  r275394 : #i104497# fix broken unoapi tests
2009-08-25 15:16:34 +0200 lla  r275362 : #i102426# OfficePriver fix
2009-08-25 15:14:19 +0200 lla  r275361 : #i104496# cleanups

2 files changed, 53 insertions, 27 deletions

diff --git a/qadevOOo/runner/helper/APIDescGetter.java b/qadevOOo/runner/helper/APIDescGetter.java
index 1486721d34f7..036487fb9856 100644
--- a/qadevOOo/runner/helper/APIDescGetter.java
+++ b/qadevOOo/runner/helper/APIDescGetter.java
@@ -326,7 +326,6 @@ public class APIDescGetter extends DescGetter
                 // String meth_name = line.substring(line.lastIndexOf(";") + 2, line.length() - 1);
 
                 DescEntry methDesc = createDescEntry(meth_name, ifc_name, parent);
-                meth_names.add(methDesc);
 
                 if (!ifc_name.equals(old_ifc_name))
                 {
@@ -365,37 +364,13 @@ public class APIDescGetter extends DescGetter
                         ifc_name = ifc_name.substring(0, ifc_name.indexOf("#"));
                     }
 
-                    StringTokenizer st = new StringTokenizer(ifc_name, ":");
-                    String className = "";
-
-                    int count = 3;
-
-                    if (ifc_name.startsWith("drafts"))
-                    {
-                        count = 4;
-                    }
-
-                    for (int i = 0; st.hasMoreTokens(); i++)
-                    {
-                        String token = st.nextToken();
-
-                        // skipping (drafts.)com.sun.star
-                        if (i >= count)
-                        {
-                            if (!st.hasMoreTokens())
-                            {
-                                // inserting '_' before the last token
-                                token = "_" + token;
-                            }
-
-                            className += ("." + token);
-                        }
-                    }
+                    String className = createClassName(ifc_name);
 
                     ifcDesc.EntryType = entryType;
                     ifcDesc.entryName = "ifc" + className;
                     ifcDesc.longName = parent.entryName + "::" + ifc_name;
                 }
+                meth_names.add(methDesc);
 
             }
             catch (java.io.IOException ioe)
@@ -430,6 +405,37 @@ public class APIDescGetter extends DescGetter
 
         return getDescArray(makeArray(ifc_names));
     }
+    private static String createClassName(String _ifc_name)
+    {
+        StringTokenizer st = new StringTokenizer(_ifc_name, ":");
+        String className = "";
+
+        int count = 3;
+
+        if (_ifc_name.startsWith("drafts"))
+        {
+            count = 4;
+        }
+
+        for (int i = 0; st.hasMoreTokens(); i++)
+        {
+            String token = st.nextToken();
+
+            // skipping (drafts.)com.sun.star
+            if (i >= count)
+            {
+                if (!st.hasMoreTokens())
+                {
+                    // inserting '_' before the last token
+                    token = "_" + token;
+                }
+
+                className += ("." + token);
+            }
+        }
+        return className;
+    }
+
     private static String entryType;
 
     private static DescEntry createDescEntry(String meth_name, String ifc_name, DescEntry parent)
diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/runner/helper/OfficeProvider.java
index c47413070e34..5653c882a1f3 100644
--- a/qadevOOo/runner/helper/OfficeProvider.java
+++ b/qadevOOo/runner/helper/OfficeProvider.java
@@ -91,6 +91,7 @@ public class OfficeProvider implements AppProvider
             OfficeWatcherPing owp = new OfficeWatcherPing((OfficeWatcher) param.get(PropertyName.OFFICE_WATCHER));
             owp.start();
 
+            deleteFilesAndDirector (new File(copyLayer));
             FileTools.copyDirectory(new File(userLayer), new File(copyLayer), new String[]
                     {
                         "temp"
@@ -581,6 +582,7 @@ public class OfficeProvider implements AppProvider
                 final String copyLayer = (String) param.get("copyLayer");
                 if (userLayer != null && copyLayer != null)
                 {
+                    deleteFilesAndDirector(new File(userLayer));
                     final File copyFile = new File(copyLayer);
                     dbg("copy '" + copyFile + "' -> '" + userLayer + "'");
                     FileTools.copyDirectory(copyFile, new File(userLayer), new String[]
@@ -823,4 +825,22 @@ public class OfficeProvider implements AppProvider
             }
         }
     }
+
+private void deleteFilesAndDirector(File file)
+        {
+            File f = file;
+            if(f.isDirectory())
+            {
+                File files[] = f.listFiles();
+                for(int i = 0; i < files.length; i++)
+                {
+                    deleteFilesAndDirector(files[i]);
+                }
+                f.delete();
+            }
+            else if (f.isFile())
+            {
+                f.delete();
+            }
+        }
 }