Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.jubula.toolkit.base.provider/resources/xml/ComponentConfiguration.xml6
-rw-r--r--org.eclipse.jubula.toolkit.concrete.provider/resources/xml/ComponentConfiguration.xml6
-rw-r--r--org.eclipse.jubula.toolkit.gef.provider/resources/xml/ComponentConfiguration.xml4
-rw-r--r--org.eclipse.jubula.toolkit.html.provider/resources/xml/ComponentConfiguration.xml6
-rw-r--r--org.eclipse.jubula.toolkit.ios.provider/resources/xml/ComponentConfiguration.xml5
-rw-r--r--org.eclipse.jubula.toolkit.javafx.provider/resources/xml/ComponentConfiguration.xml4
-rw-r--r--org.eclipse.jubula.toolkit.mobile.provider/resources/xml/ComponentConfiguration.xml5
-rw-r--r--org.eclipse.jubula.toolkit.rcp.provider/resources/xml/ComponentConfiguration.xml6
-rw-r--r--org.eclipse.jubula.toolkit.swing.provider/resources/xml/ComponentConfiguration.xml6
-rw-r--r--org.eclipse.jubula.toolkit.swt.provider/resources/xml/ComponentConfiguration.xml6
-rw-r--r--org.eclipse.jubula.toolkit.win.provider/resources/xml/ComponentConfiguration.xml4
-rw-r--r--org.eclipse.jubula.toolkit.winapps.provider/resources/xml/ComponentConfiguration.xml4
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/internal/utils/generator/AbstractComponentBuilder.java25
13 files changed, 28 insertions, 59 deletions
diff --git a/org.eclipse.jubula.toolkit.base.provider/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.base.provider/resources/xml/ComponentConfiguration.xml
index d40182587..e71e5af75 100644
--- a/org.eclipse.jubula.toolkit.base.provider/resources/xml/ComponentConfiguration.xml
+++ b/org.eclipse.jubula.toolkit.base.provider/resources/xml/ComponentConfiguration.xml
@@ -4,11 +4,7 @@
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
- -->
-
-<!-- CAUTION: don't format any entries, especially don't use line breaks!
- The value of the formated item may contain formating characters like tabs or
- newlines, making them unusable for class or data lookup!-->
+ -->
<compSystem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../org.eclipse.jubula.toolkit.common/resources/xml/ToolkitComponentConfiguration.xsd">
<configVersion> <majorVersion>4</majorVersion>
<minorVersion>0</minorVersion>
diff --git a/org.eclipse.jubula.toolkit.concrete.provider/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.concrete.provider/resources/xml/ComponentConfiguration.xml
index 6c6640288..bf73f27a9 100644
--- a/org.eclipse.jubula.toolkit.concrete.provider/resources/xml/ComponentConfiguration.xml
+++ b/org.eclipse.jubula.toolkit.concrete.provider/resources/xml/ComponentConfiguration.xml
@@ -4,11 +4,7 @@
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
- -->
-
-<!-- CAUTION: don't format any entries, especially don't use line breaks!
- The value of the formated item may contain formating characters like tabs or
- newlines, making them unusable for class or data lookup!-->
+ -->
<compSystem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../org.eclipse.jubula.toolkit.common/resources/xml/ToolkitComponentConfiguration.xsd"> <configVersion>
<majorVersion>4</majorVersion>
<minorVersion>6</minorVersion>
diff --git a/org.eclipse.jubula.toolkit.gef.provider/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.gef.provider/resources/xml/ComponentConfiguration.xml
index 9ada38114..1b5a2d173 100644
--- a/org.eclipse.jubula.toolkit.gef.provider/resources/xml/ComponentConfiguration.xml
+++ b/org.eclipse.jubula.toolkit.gef.provider/resources/xml/ComponentConfiguration.xml
@@ -5,10 +5,6 @@
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
-->
-
-<!-- CAUTION: don't format any entries, especially don't use line breaks!
- The value of the formated item may contain formating characters like tabs or
- newlines, making them unusable for class or data lookup!-->
<compSystem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../org.eclipse.jubula.toolkit.common/resources/xml/ToolkitComponentConfiguration.xsd">
<configVersion>
<majorVersion>4</majorVersion>
diff --git a/org.eclipse.jubula.toolkit.html.provider/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.html.provider/resources/xml/ComponentConfiguration.xml
index 477f61ae1..5556e8892 100644
--- a/org.eclipse.jubula.toolkit.html.provider/resources/xml/ComponentConfiguration.xml
+++ b/org.eclipse.jubula.toolkit.html.provider/resources/xml/ComponentConfiguration.xml
@@ -6,12 +6,6 @@
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
-->
- <!--
- CAUTION: don't format any entries, especially don't use line breaks!
- The value of the formated item may contain formating characters like
- tabs or newlines, making them unusable for class or data lookup!
- Browser independent WEB configuration
- -->
<compSystem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../org.eclipse.jubula.toolkit.common/resources/xml/ToolkitComponentConfiguration.xsd">
<configVersion>
<majorVersion>1</majorVersion>
diff --git a/org.eclipse.jubula.toolkit.ios.provider/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.ios.provider/resources/xml/ComponentConfiguration.xml
index ec0b2dcfa..633bd88eb 100644
--- a/org.eclipse.jubula.toolkit.ios.provider/resources/xml/ComponentConfiguration.xml
+++ b/org.eclipse.jubula.toolkit.ios.provider/resources/xml/ComponentConfiguration.xml
@@ -6,11 +6,6 @@
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
-->
-<!--
- CAUTION: don't format any entries, especially don't use line breaks!
- The value of the formated item may contain formating characters like
- tabs or newlines, making them unusable for class or data lookup!
- -->
<compSystem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../jubula/org.eclipse.jubula.toolkit.common/resources/xml/ToolkitComponentConfiguration.xsd">
<configVersion>
<majorVersion>1</majorVersion>
diff --git a/org.eclipse.jubula.toolkit.javafx.provider/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.javafx.provider/resources/xml/ComponentConfiguration.xml
index c17207447..eaf43393f 100644
--- a/org.eclipse.jubula.toolkit.javafx.provider/resources/xml/ComponentConfiguration.xml
+++ b/org.eclipse.jubula.toolkit.javafx.provider/resources/xml/ComponentConfiguration.xml
@@ -5,10 +5,6 @@
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
-->
-
-<!-- CAUTION: don't format any entries, especially don't use line breaks!
- The value of the formated item may contain formating characters like tabs or
- newlines, making them unusable for class or data lookup!-->
<compSystem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../org.eclipse.jubula.toolkit.common/resources/xml/ToolkitComponentConfiguration.xsd"> <configVersion>
<majorVersion>4</majorVersion>
<minorVersion>0</minorVersion>
diff --git a/org.eclipse.jubula.toolkit.mobile.provider/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.mobile.provider/resources/xml/ComponentConfiguration.xml
index 70231fc02..fa1052ba9 100644
--- a/org.eclipse.jubula.toolkit.mobile.provider/resources/xml/ComponentConfiguration.xml
+++ b/org.eclipse.jubula.toolkit.mobile.provider/resources/xml/ComponentConfiguration.xml
@@ -6,11 +6,6 @@
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
-->
-<!--
- CAUTION: don't format any entries, especially don't use line breaks!
- The value of the formated item may contain formating characters like
- tabs or newlines, making them unusable for class or data lookup!
- -->
<compSystem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../jubula/org.eclipse.jubula.toolkit.common/resources/xml/ToolkitComponentConfiguration.xsd">
<configVersion>
<majorVersion>1</majorVersion>
diff --git a/org.eclipse.jubula.toolkit.rcp.provider/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.rcp.provider/resources/xml/ComponentConfiguration.xml
index bd3bf5023..16fa969c2 100644
--- a/org.eclipse.jubula.toolkit.rcp.provider/resources/xml/ComponentConfiguration.xml
+++ b/org.eclipse.jubula.toolkit.rcp.provider/resources/xml/ComponentConfiguration.xml
@@ -4,11 +4,7 @@
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
- -->
-
-<!-- CAUTION: don't format any entries, especially don't use line breaks!
- The value of the formated item may contain formating characters like tabs or
- newlines, making them unusable for class or data lookup!-->
+ -->
<compSystem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../org.eclipse.jubula.toolkit.common/resources/xml/ToolkitComponentConfiguration.xsd"> <configVersion>
<majorVersion>2</majorVersion>
<minorVersion>0</minorVersion>
diff --git a/org.eclipse.jubula.toolkit.swing.provider/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.swing.provider/resources/xml/ComponentConfiguration.xml
index d4ec51d96..b4e5307f7 100644
--- a/org.eclipse.jubula.toolkit.swing.provider/resources/xml/ComponentConfiguration.xml
+++ b/org.eclipse.jubula.toolkit.swing.provider/resources/xml/ComponentConfiguration.xml
@@ -4,11 +4,7 @@
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
- -->
-
-<!-- CAUTION: don't format any entries, especially don't use line breaks!
- The value of the formated item may contain formating characters like tabs or
- newlines, making them unusable for class or data lookup!-->
+ -->
<compSystem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../org.eclipse.jubula.toolkit.common/resources/xml/ToolkitComponentConfiguration.xsd"> <configVersion>
<majorVersion>4</majorVersion>
<minorVersion>0</minorVersion>
diff --git a/org.eclipse.jubula.toolkit.swt.provider/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.swt.provider/resources/xml/ComponentConfiguration.xml
index 1b4db43a9..9c8f6b481 100644
--- a/org.eclipse.jubula.toolkit.swt.provider/resources/xml/ComponentConfiguration.xml
+++ b/org.eclipse.jubula.toolkit.swt.provider/resources/xml/ComponentConfiguration.xml
@@ -4,11 +4,7 @@
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
- -->
-
-<!-- CAUTION: don't format any entries, especially don't use line breaks!
- The value of the formated item may contain formating characters like tabs or
- newlines, making them unusable for class or data lookup!-->
+ -->
<compSystem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../org.eclipse.jubula.toolkit.common/resources/xml/ToolkitComponentConfiguration.xsd"> <configVersion>
<majorVersion>4</majorVersion>
<minorVersion>1</minorVersion>
diff --git a/org.eclipse.jubula.toolkit.win.provider/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.win.provider/resources/xml/ComponentConfiguration.xml
index c68aa428a..966081b65 100644
--- a/org.eclipse.jubula.toolkit.win.provider/resources/xml/ComponentConfiguration.xml
+++ b/org.eclipse.jubula.toolkit.win.provider/resources/xml/ComponentConfiguration.xml
@@ -6,10 +6,6 @@
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
-->
-
-<!-- CAUTION: don't format any entries, especially don't use line breaks!
- The value of the formated item may contain formating characters like tabs or
- newlines, making them unusable for class or data lookup!-->
<compSystem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../jubula/org.eclipse.jubula.toolkit.common/resources/xml/ToolkitComponentConfiguration.xsd">
<configVersion>
<majorVersion>1</majorVersion>
diff --git a/org.eclipse.jubula.toolkit.winapps.provider/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.winapps.provider/resources/xml/ComponentConfiguration.xml
index 0fee2adf8..1dd7e105f 100644
--- a/org.eclipse.jubula.toolkit.winapps.provider/resources/xml/ComponentConfiguration.xml
+++ b/org.eclipse.jubula.toolkit.winapps.provider/resources/xml/ComponentConfiguration.xml
@@ -6,10 +6,6 @@
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
-->
-
-<!-- CAUTION: don't format any entries, especially don't use line breaks!
- The value of the formated item may contain formating characters like tabs or
- newlines, making them unusable for class or data lookup!-->
<compSystem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../org.eclipse.jubula.toolkit.common/resources/xml/ToolkitComponentConfiguration.xsd">
<configVersion>
<majorVersion>1</majorVersion>
diff --git a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/internal/utils/generator/AbstractComponentBuilder.java b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/internal/utils/generator/AbstractComponentBuilder.java
index fedccb76d..fc409d888 100644
--- a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/internal/utils/generator/AbstractComponentBuilder.java
+++ b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/internal/utils/generator/AbstractComponentBuilder.java
@@ -11,6 +11,7 @@
package org.eclipse.jubula.tools.internal.utils.generator;
import java.io.BufferedInputStream;
+import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -72,8 +73,28 @@ public class AbstractComponentBuilder {
* @return a CompSystem
*/
protected CompSystem createCompSystem(InputStream inputStream) {
- InputStreamReader reader = new InputStreamReader(inputStream);
- CompSystem compSystem = (CompSystem)m_xStream.fromXML(reader);
+ BufferedReader reader = new BufferedReader(
+ (new InputStreamReader(inputStream)));
+ String string = ""; //$NON-NLS-1$
+ String line = null;
+ try {
+ do {
+ line = reader.readLine();
+ if (line != null) {
+ string += line;
+ }
+ } while (line != null);
+ reader.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ string = string.replaceAll("[\r\n]+", " "); //$NON-NLS-1$ //$NON-NLS-2$
+ string = string.replace("\t", " "); //$NON-NLS-1$ //$NON-NLS-2$
+ string = string.replaceAll("[^\\S\\r\\n]+", " "); //$NON-NLS-1$ //$NON-NLS-2$
+ string = string.replaceAll(">\\s", ">"); //$NON-NLS-1$ //$NON-NLS-2$
+ string = string.replaceAll("\\s<", "<"); //$NON-NLS-1$ //$NON-NLS-2$
+
+ CompSystem compSystem = (CompSystem)m_xStream.fromXML(string);
return compSystem;
}

Back to the top