Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Struckmann2014-09-12 08:43:55 -0400
committerSebastian Struckmann2014-09-12 08:49:43 -0400
commitf7b2ee8d2d8569810100b2da427a5ea505f8f915 (patch)
treee013ccd0484d27cb56b96edc9ab4ab0502963a73
parentbb760b9fa3ae75c598f8b4a935fb9196acaa323a (diff)
downloadorg.eclipse.jubula.core-f7b2ee8d2d8569810100b2da427a5ea505f8f915.tar.gz
org.eclipse.jubula.core-f7b2ee8d2d8569810100b2da427a5ea505f8f915.tar.xz
org.eclipse.jubula.core-f7b2ee8d2d8569810100b2da427a5ea505f8f915.zip
Sprint task - Java API - Generation uses internationalized names; output into correct bundles
-rw-r--r--org.eclipse.jubula.toolkit.api.gen/resources/apigen.properties4
-rw-r--r--org.eclipse.jubula.toolkit.api.gen/resources/nameMappings.properties2
-rw-r--r--org.eclipse.jubula.toolkit.api.gen/src/org/eclipse/jubula/toolkit/api/gen/internal/APIGenerator.java38
-rw-r--r--org.eclipse.jubula.toolkit.api.gen/src/org/eclipse/jubula/toolkit/api/gen/internal/GenerationInfo.java94
-rw-r--r--org.eclipse.jubula.toolkit.api.gen/src/org/eclipse/jubula/toolkit/api/gen/internal/NameLoader.java151
-rw-r--r--org.eclipse.jubula.toolkit.api.gen/src/org/eclipse/jubula/toolkit/api/gen/internal/NameMappingLoader.java81
-rw-r--r--org.eclipse.jubula.toolkit.api.gen/templates/ClassGenerator.javajet31
-rw-r--r--org.eclipse.jubula.toolkit.api/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.toolkit.api/src/org/eclipse/jubula/toolkit/datatype/Variable.java (renamed from org.eclipse.jubula.toolkit.api/src/org/eclipse/jubula/toolkit/api/datatype/Variable.java)2
-rw-r--r--org.eclipse.jubula.toolkit.base.api/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/internal/annotations/RealizedType.java (renamed from org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/api/internal/annotations/RealizedType.java)2
-rw-r--r--org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/internal/annotations/TesterClass.java (renamed from org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/api/internal/annotations/TesterClass.java)2
-rw-r--r--org.eclipse.jubula.toolkit.base.provider/src/org/eclipse/jubula/toolkit/base/provider/I18nStrings.properties2
-rw-r--r--org.eclipse.jubula.toolkit.concrete.api/.gitignore1
-rw-r--r--org.eclipse.jubula.toolkit.concrete.api/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.toolkit.html.api/.gitignore1
-rw-r--r--org.eclipse.jubula.toolkit.html.api/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.toolkit.html.provider/src/org/eclipse/jubula/toolkit/html/provider/I18nStrings.properties1
-rw-r--r--org.eclipse.jubula.toolkit.javafx.api/.gitignore1
-rw-r--r--org.eclipse.jubula.toolkit.javafx.api/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.toolkit.javafx.provider/src/org/eclipse/jubula/toolkit/javafx/provider/I18nStrings.properties1
-rw-r--r--org.eclipse.jubula.toolkit.mobile.api/.gitignore1
-rw-r--r--org.eclipse.jubula.toolkit.mobile.api/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.toolkit.mobile.ios.api/.gitignore1
-rw-r--r--org.eclipse.jubula.toolkit.rcp.api/.gitignore1
-rw-r--r--org.eclipse.jubula.toolkit.rcp.gef.api/.gitignore1
-rw-r--r--org.eclipse.jubula.toolkit.rcp.gef.api/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.toolkit.swing.api/.gitignore1
-rw-r--r--org.eclipse.jubula.toolkit.swing.api/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.toolkit.swt.api/.gitignore1
-rw-r--r--org.eclipse.jubula.toolkit.swt.provider/src/org/eclipse/jubula/toolkit/swt/provider/I18nStrings.properties3
-rw-r--r--org.eclipse.jubula.toolkit.win.api/.gitignore1
-rw-r--r--org.eclipse.jubula.toolkit.win.api/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.toolkit.win.apps.api/.gitignore1
-rw-r--r--org.eclipse.jubula.toolkit.win.apps.api/META-INF/MANIFEST.MF3
35 files changed, 318 insertions, 136 deletions
diff --git a/org.eclipse.jubula.toolkit.api.gen/resources/apigen.properties b/org.eclipse.jubula.toolkit.api.gen/resources/apigen.properties
index 790944a25..d4c9a8174 100644
--- a/org.eclipse.jubula.toolkit.api.gen/resources/apigen.properties
+++ b/org.eclipse.jubula.toolkit.api.gen/resources/apigen.properties
@@ -6,7 +6,7 @@
# http://www.eclipse.org/legal/epl-v10.html
###############################################################################
# Comma-separated list of toolkits to generate
-api.gen.toolkit.names=base, concrete, swing, swt, rcp, rcp.gef, html, javafx
+api.gen.toolkit.names=base, concrete, swing, swt, rcp, html, javafx
api.gen.toolkit.name.scheme=../org.eclipse.jubula.toolkit.{0}.provider
# name of the xml file used to describe a toolkit
api.gen.toolkit.xml.conf=resources/xml/ComponentConfiguration.xml
@@ -15,4 +15,4 @@ api.gen.toolkit.resourcebundle.path=src
# fully-qualified name of resource bundle
api.gen.toolkit.resourcebundle.fqn=org.eclipse.jubula.toolkit.{0}.provider.I18nStrings
api.gen.toolkit.output={0}
-api.gen.toolkit.generation.dir=../org.eclipse.jubula.toolkit.base.api/src-gen/org/eclipse/jubula/toolkit/base/internal/
+api.gen.toolkit.generation.dir=../org.eclipse.jubula.toolkit.{0}.api/src-gen/org/eclipse/jubula/toolkit/{0}/internal/
diff --git a/org.eclipse.jubula.toolkit.api.gen/resources/nameMappings.properties b/org.eclipse.jubula.toolkit.api.gen/resources/nameMappings.properties
index ed2ceb067..c10f11656 100644
--- a/org.eclipse.jubula.toolkit.api.gen/resources/nameMappings.properties
+++ b/org.eclipse.jubula.toolkit.api.gen/resources/nameMappings.properties
@@ -6,4 +6,4 @@
# http://www.eclipse.org/legal/epl-v10.html
###############################################################################
# Comma-separated list of toolkits to generate
-guidancer.datatype.Variable=org.eclipse.jubula.toolkit.api.datatype.Variable
+guidancer.datatype.Variable=org.eclipse.jubula.toolkit.datatype.Variable
diff --git a/org.eclipse.jubula.toolkit.api.gen/src/org/eclipse/jubula/toolkit/api/gen/internal/APIGenerator.java b/org.eclipse.jubula.toolkit.api.gen/src/org/eclipse/jubula/toolkit/api/gen/internal/APIGenerator.java
index 531c66756..30c989408 100644
--- a/org.eclipse.jubula.toolkit.api.gen/src/org/eclipse/jubula/toolkit/api/gen/internal/APIGenerator.java
+++ b/org.eclipse.jubula.toolkit.api.gen/src/org/eclipse/jubula/toolkit/api/gen/internal/APIGenerator.java
@@ -13,10 +13,10 @@ package org.eclipse.jubula.toolkit.api.gen.internal;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.text.MessageFormat;
import java.util.List;
import org.eclipse.jubula.toolkit.api.gen.ClassGenerator;
-import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.utils.generator.CompSystemProcessor;
import org.eclipse.jubula.tools.utils.generator.ComponentInfo;
import org.eclipse.jubula.tools.utils.generator.ToolkitConfig;
@@ -35,7 +35,7 @@ public class APIGenerator {
* Constructor
*/
private APIGenerator() {
-
+ // hidden
}
/**
@@ -44,30 +44,33 @@ public class APIGenerator {
*/
public static void main(String[] args) {
ConfigLoader loader = ConfigLoader.getInstance();
- String generationDir = loader.getGenerationDir();
+ String generationBaseDir = loader.getGenerationDir();
ToolkitConfig config = loader.getToolkitConfig();
CompSystemProcessor processor = new CompSystemProcessor(config);
List<ComponentInfo> compInfos = processor.getCompInfos(false);
for (ComponentInfo compInfo : compInfos) {
- createClass(compInfo.getComponent(), generationDir);
+ Component component = compInfo.getComponent();
+ createClass(component, generationBaseDir);
}
}
/**
* creates class for component
* @param component the component
- * @param generationDir directory for generation
+ * @param generationBaseDirTemplate directory for generation
*/
- private static void createClass(Component component, String generationDir) {
- NameMappingLoader nameLoader = NameMappingLoader.getInstance();
- String[] splitName = splitName(component.getType());
- String path = nameLoader.getDesiredName(splitName[0]
- .replace(StringConstants.DOT, StringConstants.SLASH));
- String className = nameLoader.getDesiredName(splitName[1]);
- File dir = new File(generationDir + path);
+ private static void createClass(Component component,
+ String generationBaseDirTemplate) {
+ GenerationInfo genInfo = new GenerationInfo(component);
+ String path = genInfo.getDirectoryPathExtension();
+ String className = genInfo.getClassName();
+ String generationBaseDir = MessageFormat.format(
+ generationBaseDirTemplate,
+ new Object[] {genInfo.getToolkitName()});
+ File dir = new File(generationBaseDir + path);
File file = new File(dir, className + ".java"); //$NON-NLS-1$
- String content = classGenerator.generate(component);
+ String content = classGenerator.generate(genInfo);
if (!file.exists()) {
try {
@@ -89,13 +92,4 @@ public class APIGenerator {
System.exit(1);
}
}
-
- /**
- * splits the class name of the full qualified name
- * @param fullQualifiedName the full qualified name
- * @return the class name
- */
- public static String[] splitName(String fullQualifiedName) {
- return fullQualifiedName.split("\\.(?=[^\\.]+$)"); //$NON-NLS-1$
- }
} \ No newline at end of file
diff --git a/org.eclipse.jubula.toolkit.api.gen/src/org/eclipse/jubula/toolkit/api/gen/internal/GenerationInfo.java b/org.eclipse.jubula.toolkit.api.gen/src/org/eclipse/jubula/toolkit/api/gen/internal/GenerationInfo.java
new file mode 100644
index 000000000..6e6629fd5
--- /dev/null
+++ b/org.eclipse.jubula.toolkit.api.gen/src/org/eclipse/jubula/toolkit/api/gen/internal/GenerationInfo.java
@@ -0,0 +1,94 @@
+package org.eclipse.jubula.toolkit.api.gen.internal;
+
+import org.eclipse.jubula.tools.constants.StringConstants;
+import org.eclipse.jubula.tools.xml.businessmodell.Component;
+
+/**
+ * Contains all necessary information for API generation of a component
+ * @author BREDEX GmbH
+ */
+public class GenerationInfo {
+
+ /** the component */
+ private Component m_component;
+
+ /** the class name */
+ private String m_className;
+
+ /** the package name */
+ private String m_packageNameExtension;
+
+ /** the directory path extension */
+ private String m_directoryPathExtension;
+
+ /** the toolkit name */
+ private String m_toolkitName;
+
+ /**
+ * Contains all necessary information for API generation of a component
+ * @param component the component
+ */
+ public GenerationInfo(Component component) {
+ m_component = component;
+ m_toolkitName = component.getToolkitDesriptor().getName().toLowerCase();
+ NameLoader nameLoader = NameLoader.getInstance();
+ m_className = nameLoader.getClassName(m_component.getType());
+ m_packageNameExtension = nameLoader.getPackageNameExtension(
+ component, m_toolkitName);
+ m_directoryPathExtension = m_packageNameExtension;
+ m_packageNameExtension = executeExceptions(m_packageNameExtension);
+ m_directoryPathExtension = executeExceptions(m_directoryPathExtension)
+ .replace(StringConstants.DOT, StringConstants.SLASH);
+ m_toolkitName = executeExceptions(m_toolkitName);
+ }
+
+ /**
+ * modifies a string such that it fits into api naming patterns
+ * @param string the string
+ * @return the adjusted string
+ */
+ private String executeExceptions(String string) {
+ return string.replace("abstract", "base").replace("gef", "rcp.gef"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ }
+
+ /**
+ * Returns the component
+ * @return the component
+ */
+ public Component getComponent() {
+ return m_component;
+ }
+
+ /**
+ * Returns the class name
+ * @return the class name
+ */
+ public String getClassName() {
+ return m_className;
+ }
+
+ /**
+ * Returns the package name
+ * @return the package name
+ */
+ public String getPackageNameExtension() {
+ return m_packageNameExtension;
+ }
+
+ /**
+ * Returns the directory path extension
+ * @return the directory path extension
+ */
+ public String getDirectoryPathExtension() {
+ return m_directoryPathExtension;
+ }
+
+ /**
+ * Returns the toolkit name
+ * @return the toolkit name
+ */
+ public String getToolkitName() {
+ return m_toolkitName;
+ }
+
+}
diff --git a/org.eclipse.jubula.toolkit.api.gen/src/org/eclipse/jubula/toolkit/api/gen/internal/NameLoader.java b/org.eclipse.jubula.toolkit.api.gen/src/org/eclipse/jubula/toolkit/api/gen/internal/NameLoader.java
new file mode 100644
index 000000000..30108faee
--- /dev/null
+++ b/org.eclipse.jubula.toolkit.api.gen/src/org/eclipse/jubula/toolkit/api/gen/internal/NameLoader.java
@@ -0,0 +1,151 @@
+/*******************************************************************************
+ * Copyright (c) 2014 BREDEX GmbH.
+ * All rights reserved. This program and the accompanying materials
+ * 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
+ *
+ * Contributors:
+ * BREDEX GmbH - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.jubula.toolkit.api.gen.internal;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Properties;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.WordUtils;
+import org.eclipse.jubula.tools.constants.StringConstants;
+import org.eclipse.jubula.tools.i18n.CompSystemI18n;
+import org.eclipse.jubula.tools.xml.businessmodell.Component;
+
+
+/**
+ * Loads the configuration for the API generation from the properties file. It
+ * is expected that the properties reside in
+ * <code>resources/apigen.properties</code>.
+ *
+ * @author BREDEX GmbH
+ * @created 11.09.2014
+ */
+public class NameLoader {
+ /**
+ * <code>RESOURCES_APIGEN_PROPERTIES</code>
+ */
+ private static final String RESOURCES_NAMEMAPPINGS_PROPERTIES =
+ "resources/nameMappings.properties"; //$NON-NLS-1$
+ /**
+ * <code>instance</code> the singleton instance
+ */
+ private static NameLoader instance = null;
+ /**
+ * the mapping properties
+ */
+ private Properties m_mappingProperties;
+
+ /**
+ * The constructor.
+ */
+ private NameLoader() {
+ try {
+ URL resourceURL = NameLoader.class.getClassLoader()
+ .getResource(RESOURCES_NAMEMAPPINGS_PROPERTIES);
+
+ m_mappingProperties = new Properties();
+ m_mappingProperties.load(resourceURL.openStream());
+ } catch (IOException e) {
+ throw new IllegalArgumentException(e);
+ }
+ }
+
+ /**
+ * @return the singleton instance
+ */
+ public static NameLoader getInstance() {
+ if (instance == null) {
+ instance = new NameLoader();
+ }
+ return instance;
+ }
+
+ /**
+ * Checks in the name mappings property file whether there is a mapping for a
+ * given string and returns it and if not, returns the original string
+ * @param name original name
+ * @return the name which should be used in api
+ */
+ public String translateFromCompSystem(String name) {
+ String mapEntry = m_mappingProperties.getProperty(name);
+ if (mapEntry != null) {
+ return mapEntry;
+ }
+ String desiredName = CompSystemI18n.getString(name);
+ desiredName = desiredName.replace(
+ StringConstants.MINUS, StringConstants.SPACE)
+ .replace(
+ StringConstants.LEFT_PARENTHESES, StringConstants.SPACE)
+ .replace(
+ StringConstants.RIGHT_PARENTHESES, StringConstants.SPACE)
+ .replace(
+ StringConstants.SLASH, StringConstants.SPACE);
+ desiredName = WordUtils.capitalizeFully(desiredName);
+ desiredName = StringUtils.deleteWhitespace(desiredName);
+ desiredName = WordUtils.uncapitalize(desiredName);
+ return desiredName;
+ }
+
+ /**
+ * Checks in the name mappings property file whether there is a mapping for a
+ * given string and returns it and if not, returns the original string
+ * @param name original name
+ * @return the name which should be used in api
+ */
+ public String getFromNameMappings(String name) {
+ String mapEntry = m_mappingProperties.getProperty(name);
+ if (mapEntry != null) {
+ return mapEntry;
+ }
+ return name;
+ }
+
+ /**
+ * @param component the component
+ * @param toolkitName the toolkit name
+ * @return the name extension of the api package name for the component
+ */
+ public String getPackageNameExtension(Component component,
+ String toolkitName) {
+ String extension = StringUtils.substringAfter(
+ component.getType(), toolkitName);
+ extension = StringUtils.substringBeforeLast(
+ extension, StringConstants.DOT);
+ return extension;
+ }
+
+ /**
+ * @param name the class name in comp system
+ * @return the name of the class in the api
+ */
+ public String getClassName(String name) {
+ String mapEntry = m_mappingProperties.getProperty(name);
+ if (mapEntry != null) {
+ return mapEntry;
+ }
+ String desiredName = CompSystemI18n.getString(name);
+ desiredName = desiredName
+ .replace(StringConstants.SLASH, StringConstants.SPACE);
+ if (desiredName.startsWith(StringConstants.LEFT_PARENTHESES)) {
+ desiredName = StringUtils.substringAfter(
+ desiredName, StringConstants.RIGHT_PARENTHESES);
+ }
+ desiredName = desiredName
+ .replace(StringConstants.LEFT_PARENTHESES,
+ StringConstants.SPACE)
+ .replace(StringConstants.RIGHT_PARENTHESES,
+ StringConstants.SPACE);
+ desiredName = WordUtils.capitalizeFully(desiredName);
+ desiredName = StringUtils.deleteWhitespace(desiredName);
+ return desiredName;
+ }
+}
diff --git a/org.eclipse.jubula.toolkit.api.gen/src/org/eclipse/jubula/toolkit/api/gen/internal/NameMappingLoader.java b/org.eclipse.jubula.toolkit.api.gen/src/org/eclipse/jubula/toolkit/api/gen/internal/NameMappingLoader.java
deleted file mode 100644
index a025e739e..000000000
--- a/org.eclipse.jubula.toolkit.api.gen/src/org/eclipse/jubula/toolkit/api/gen/internal/NameMappingLoader.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 BREDEX GmbH.
- * All rights reserved. This program and the accompanying materials
- * 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
- *
- * Contributors:
- * BREDEX GmbH - initial API and implementation and/or initial documentation
- *******************************************************************************/
-package org.eclipse.jubula.toolkit.api.gen.internal;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Properties;
-
-
-/**
- * Loads the configuration for the API generation from the properties file. It
- * is expected that the properties reside in
- * <code>resources/apigen.properties</code>.
- *
- * @author BREDEX GmbH
- * @created 16.09.2005
- * @version $Revision: 12986 $
- */
-public class NameMappingLoader {
- /**
- * <code>RESOURCES_APIGEN_PROPERTIES</code>
- */
- private static final String RESOURCES_NAMEMAPPINGS_PROPERTIES =
- "resources/nameMappings.properties"; //$NON-NLS-1$
- /**
- * <code>instance</code> the singleton instance
- */
- private static NameMappingLoader instance = null;
- /**
- * the mapping properties
- */
- private Properties m_mappingProperties;
-
- /**
- * The constructor.
- */
- private NameMappingLoader() {
- try {
- URL resourceURL = NameMappingLoader.class.getClassLoader()
- .getResource(RESOURCES_NAMEMAPPINGS_PROPERTIES);
-
- m_mappingProperties = new Properties();
- m_mappingProperties.load(resourceURL.openStream());
- } catch (IOException e) {
- throw new IllegalArgumentException(e);
- }
- }
-
- /**
- * @return the singleton instance
- */
- public static NameMappingLoader getInstance() {
- if (instance == null) {
- instance = new NameMappingLoader();
- }
- return instance;
- }
-
- /**
- * Checks in the name mappings property file whether there is a mapping for a
- * given string and returns it and if not, returns the original string
- * @param name original name
- * @return the name which should be used in api
- */
- public String getDesiredName(String name) {
- String mapEntry = m_mappingProperties.getProperty(name);
- if (mapEntry != null) {
- return mapEntry;
- }
- String desiredName = name.replace("abstract", "base");
- return desiredName;
- }
-}
diff --git a/org.eclipse.jubula.toolkit.api.gen/templates/ClassGenerator.javajet b/org.eclipse.jubula.toolkit.api.gen/templates/ClassGenerator.javajet
index f4f0b7f22..a1b6a2ef4 100644
--- a/org.eclipse.jubula.toolkit.api.gen/templates/ClassGenerator.javajet
+++ b/org.eclipse.jubula.toolkit.api.gen/templates/ClassGenerator.javajet
@@ -1,17 +1,18 @@
<%@ jet
package="org.eclipse.jubula.toolkit.api.gen"
imports="java.util.*
- org.eclipse.jubula.toolkit.api.gen.internal.APIGenerator
- org.eclipse.jubula.toolkit.api.gen.internal.NameMappingLoader
+ org.eclipse.jubula.toolkit.api.gen.internal.GenerationInfo
+ org.eclipse.jubula.toolkit.api.gen.internal.NameLoader
org.eclipse.jubula.tools.xml.businessmodell.*"
class="ClassGenerator"%>
<%
- Component component = (Component)argument;
- NameMappingLoader nameLoader = NameMappingLoader.getInstance();
+ GenerationInfo genInfo = (GenerationInfo)argument;
+ Component component = genInfo.getComponent();
+ String toolkitName = genInfo.getToolkitName();
+ String packageNameExtension = genInfo.getPackageNameExtension();
+ String className = genInfo.getClassName();
+ NameLoader nameLoader = NameLoader.getInstance();
List<Action> actions = component.getActions();
- String[] splitName = APIGenerator.splitName(component.getType());
- String path = nameLoader.getDesiredName(splitName[0]);
- String name = nameLoader.getDesiredName(splitName[1]);
List<String> realizedTypes = component.getRealizedTypes();
String realizedType = realizedTypes.size() > 0 ? realizedTypes.get(0) : null;
String testerClass = "";
@@ -29,24 +30,24 @@ class="ClassGenerator"%>
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package <%="org.eclipse.jubula.toolkit.base.internal." + path%>;
+package <%="org.eclipse.jubula.toolkit." + toolkitName + ".internal" + packageNameExtension%>;
-import org.eclipse.jubula.toolkit.base.api.internal.annotations.RealizedType;
-import org.eclipse.jubula.toolkit.base.api.internal.annotations.TesterClass;
+import org.eclipse.jubula.toolkit.base.internal.annotations.RealizedType;
+import org.eclipse.jubula.toolkit.base.internal.annotations.TesterClass;
@RealizedType(realizedType="<%=realizedType%>")
@TesterClass(testerClass="<%=testerClass%>")
-public class <%=name%> {
+public class <%=className%> {
Object m_component;
- public <%=name%>(Object component) {
+ public <%=className%>(Object component) {
m_component = component;
}
<%
Iterator<Action> actionsIterator = actions.iterator();
while (actionsIterator.hasNext()) {
Action action = actionsIterator.next();
- String actionName = nameLoader.getDesiredName(action.getMethod());
+ String actionName = nameLoader.translateFromCompSystem(action.getName());
List<Param> params = action.getParams();
%>
<%if (action.isDeprecated()) {%>@Deprecated<%}%>
@@ -55,8 +56,8 @@ public class <%=name%> {
Iterator<Param> paramIterator = params.iterator();
while (paramIterator.hasNext()) {
Param param = paramIterator.next();
- String paramType = nameLoader.getDesiredName(param.getType());
- String paramName = nameLoader.getDesiredName(param.getName().replace(".",""));
+ String paramType = nameLoader.getFromNameMappings(param.getType());
+ String paramName = nameLoader.translateFromCompSystem(param.getName());
%>
<%=paramType%> <%=paramName%><%if(paramIterator.hasNext()){%>,<%}%>
<%
diff --git a/org.eclipse.jubula.toolkit.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.api/META-INF/MANIFEST.MF
index 9d8839fa1..fc3d4dcc1 100644
--- a/org.eclipse.jubula.toolkit.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.api/META-INF/MANIFEST.MF
@@ -7,5 +7,5 @@ Bundle-Vendor: Eclipse Jubula
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Export-Package: org.eclipse.jubula.toolkit.api.datatype,
+Export-Package: org.eclipse.jubula.toolkit.datatype,
org.eclipse.jubula.toolkit.enums
diff --git a/org.eclipse.jubula.toolkit.api/src/org/eclipse/jubula/toolkit/api/datatype/Variable.java b/org.eclipse.jubula.toolkit.api/src/org/eclipse/jubula/toolkit/datatype/Variable.java
index d2de8bcf8..030478222 100644
--- a/org.eclipse.jubula.toolkit.api/src/org/eclipse/jubula/toolkit/api/datatype/Variable.java
+++ b/org.eclipse.jubula.toolkit.api/src/org/eclipse/jubula/toolkit/datatype/Variable.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.toolkit.api.datatype;
+package org.eclipse.jubula.toolkit.datatype;
/**
* @author BREDEX GmbH
diff --git a/org.eclipse.jubula.toolkit.base.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.base.api/META-INF/MANIFEST.MF
index 681d29aa3..b797f6beb 100644
--- a/org.eclipse.jubula.toolkit.base.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.base.api/META-INF/MANIFEST.MF
@@ -7,8 +7,9 @@ Bundle-Vendor: Eclipse Jubula
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
+Export-Package: org.eclipse.jubula.toolkit.base.config,
+ org.eclipse.jubula.toolkit.base.internal.annotations
Require-Bundle: org.eclipse.jubula.client.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.tools;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)"
-Export-Package: org.eclipse.jubula.toolkit.base.config
diff --git a/org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/api/internal/annotations/RealizedType.java b/org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/internal/annotations/RealizedType.java
index fced99027..c2754b263 100644
--- a/org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/api/internal/annotations/RealizedType.java
+++ b/org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/internal/annotations/RealizedType.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.toolkit.base.api.internal.annotations;
+package org.eclipse.jubula.toolkit.base.internal.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/api/internal/annotations/TesterClass.java b/org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/internal/annotations/TesterClass.java
index 7ea3b14bd..fb0130707 100644
--- a/org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/api/internal/annotations/TesterClass.java
+++ b/org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/internal/annotations/TesterClass.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.toolkit.base.api.internal.annotations;
+package org.eclipse.jubula.toolkit.base.internal.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/org.eclipse.jubula.toolkit.base.provider/src/org/eclipse/jubula/toolkit/base/provider/I18nStrings.properties b/org.eclipse.jubula.toolkit.base.provider/src/org/eclipse/jubula/toolkit/base/provider/I18nStrings.properties
index 46a9c2413..bae6510c5 100644
--- a/org.eclipse.jubula.toolkit.base.provider/src/org/eclipse/jubula/toolkit/base/provider/I18nStrings.properties
+++ b/org.eclipse.jubula.toolkit.base.provider/src/org/eclipse/jubula/toolkit/base/provider/I18nStrings.properties
@@ -49,7 +49,7 @@ CompSystem.ExpandByTextPath=Expand Node by Textpath
CompSystem.ExtendSelection=Extend Selection
CompSystem.FileAccess=File Access
CompSystem.HasFocus=Has Focus
-CompSystem.Index=Index/Indices
+CompSystem.Index=Index
CompSystem.IndexPath=Indexpath
CompSystem.InputText=Replace Text
CompSystem.InputTextDirect=Input Text
diff --git a/org.eclipse.jubula.toolkit.concrete.api/.gitignore b/org.eclipse.jubula.toolkit.concrete.api/.gitignore
index 934e0e06f..9d12075e6 100644
--- a/org.eclipse.jubula.toolkit.concrete.api/.gitignore
+++ b/org.eclipse.jubula.toolkit.concrete.api/.gitignore
@@ -1,2 +1,3 @@
/bin
/target
+/src-gen
diff --git a/org.eclipse.jubula.toolkit.concrete.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.concrete.api/META-INF/MANIFEST.MF
index cec1a01ce..8a6076ffe 100644
--- a/org.eclipse.jubula.toolkit.concrete.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.concrete.api/META-INF/MANIFEST.MF
@@ -8,4 +8,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Require-Bundle: org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
- org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)"
+ org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)",
+ org.eclipse.jubula.toolkit.base.api;bundle-version="[2.4.0,2.5.0)"
diff --git a/org.eclipse.jubula.toolkit.html.api/.gitignore b/org.eclipse.jubula.toolkit.html.api/.gitignore
index 934e0e06f..9d12075e6 100644
--- a/org.eclipse.jubula.toolkit.html.api/.gitignore
+++ b/org.eclipse.jubula.toolkit.html.api/.gitignore
@@ -1,2 +1,3 @@
/bin
/target
+/src-gen
diff --git a/org.eclipse.jubula.toolkit.html.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.html.api/META-INF/MANIFEST.MF
index 9bdb6bf9f..52a2869f3 100644
--- a/org.eclipse.jubula.toolkit.html.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.html.api/META-INF/MANIFEST.MF
@@ -8,4 +8,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Require-Bundle: org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
- org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)"
+ org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)",
+ org.eclipse.jubula.toolkit.base.api;bundle-version="[2.4.0,2.5.0)"
diff --git a/org.eclipse.jubula.toolkit.html.provider/src/org/eclipse/jubula/toolkit/html/provider/I18nStrings.properties b/org.eclipse.jubula.toolkit.html.provider/src/org/eclipse/jubula/toolkit/html/provider/I18nStrings.properties
index abf232bd0..433c0459d 100644
--- a/org.eclipse.jubula.toolkit.html.provider/src/org/eclipse/jubula/toolkit/html/provider/I18nStrings.properties
+++ b/org.eclipse.jubula.toolkit.html.provider/src/org/eclipse/jubula/toolkit/html/provider/I18nStrings.properties
@@ -47,6 +47,7 @@ html.forms.label.Header4=HTML Header4
html.forms.label.Header5=HTML Header5
html.forms.label.Header6=HTML Header6
html.forms.label.Paragraph=HTML Paragraph
+html.forms.label.Pre=HTML Pre
html.forms.select.List=HTML List
html.forms.select.ComboBox=HTML ComboBox
html.Div=HTML Div
diff --git a/org.eclipse.jubula.toolkit.javafx.api/.gitignore b/org.eclipse.jubula.toolkit.javafx.api/.gitignore
index 934e0e06f..9d12075e6 100644
--- a/org.eclipse.jubula.toolkit.javafx.api/.gitignore
+++ b/org.eclipse.jubula.toolkit.javafx.api/.gitignore
@@ -1,2 +1,3 @@
/bin
/target
+/src-gen
diff --git a/org.eclipse.jubula.toolkit.javafx.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.javafx.api/META-INF/MANIFEST.MF
index 22aa04c7e..0cbb863e5 100644
--- a/org.eclipse.jubula.toolkit.javafx.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.javafx.api/META-INF/MANIFEST.MF
@@ -8,4 +8,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Require-Bundle: org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
- org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)"
+ org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)",
+ org.eclipse.jubula.toolkit.base.api;bundle-version="[2.4.0,2.5.0)"
diff --git a/org.eclipse.jubula.toolkit.javafx.provider/src/org/eclipse/jubula/toolkit/javafx/provider/I18nStrings.properties b/org.eclipse.jubula.toolkit.javafx.provider/src/org/eclipse/jubula/toolkit/javafx/provider/I18nStrings.properties
index 1e89cbcb7..5b3b5b840 100644
--- a/org.eclipse.jubula.toolkit.javafx.provider/src/org/eclipse/jubula/toolkit/javafx/provider/I18nStrings.properties
+++ b/org.eclipse.jubula.toolkit.javafx.provider/src/org/eclipse/jubula/toolkit/javafx/provider/I18nStrings.properties
@@ -34,4 +34,5 @@ javafx.scene.control.ProgressIndicator=(JavaFX) Progress Indicator
javafx.scene.control.ProgressBar=(JavaFX) Progress Bar
javafx.scene.control.MenuBar=(JavaFX) Menu Bar
javafx.scene.control.ListView=(JavaFX) List View
+javafx.scene.image.ImageView=(JavaFX) Image View
javafx.stage.Stage =(JavaFX) Application \ No newline at end of file
diff --git a/org.eclipse.jubula.toolkit.mobile.api/.gitignore b/org.eclipse.jubula.toolkit.mobile.api/.gitignore
index 934e0e06f..9d12075e6 100644
--- a/org.eclipse.jubula.toolkit.mobile.api/.gitignore
+++ b/org.eclipse.jubula.toolkit.mobile.api/.gitignore
@@ -1,2 +1,3 @@
/bin
/target
+/src-gen
diff --git a/org.eclipse.jubula.toolkit.mobile.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.mobile.api/META-INF/MANIFEST.MF
index ebec09780..f198c355e 100644
--- a/org.eclipse.jubula.toolkit.mobile.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.mobile.api/META-INF/MANIFEST.MF
@@ -8,4 +8,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Require-Bundle: org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
- org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)"
+ org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)",
+ org.eclipse.jubula.toolkit.base.api;bundle-version="[2.4.0,2.5.0)"
diff --git a/org.eclipse.jubula.toolkit.mobile.ios.api/.gitignore b/org.eclipse.jubula.toolkit.mobile.ios.api/.gitignore
index 934e0e06f..9d12075e6 100644
--- a/org.eclipse.jubula.toolkit.mobile.ios.api/.gitignore
+++ b/org.eclipse.jubula.toolkit.mobile.ios.api/.gitignore
@@ -1,2 +1,3 @@
/bin
/target
+/src-gen
diff --git a/org.eclipse.jubula.toolkit.rcp.api/.gitignore b/org.eclipse.jubula.toolkit.rcp.api/.gitignore
index 934e0e06f..9d12075e6 100644
--- a/org.eclipse.jubula.toolkit.rcp.api/.gitignore
+++ b/org.eclipse.jubula.toolkit.rcp.api/.gitignore
@@ -1,2 +1,3 @@
/bin
/target
+/src-gen
diff --git a/org.eclipse.jubula.toolkit.rcp.gef.api/.gitignore b/org.eclipse.jubula.toolkit.rcp.gef.api/.gitignore
index 934e0e06f..9d12075e6 100644
--- a/org.eclipse.jubula.toolkit.rcp.gef.api/.gitignore
+++ b/org.eclipse.jubula.toolkit.rcp.gef.api/.gitignore
@@ -1,2 +1,3 @@
/bin
/target
+/src-gen
diff --git a/org.eclipse.jubula.toolkit.rcp.gef.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.rcp.gef.api/META-INF/MANIFEST.MF
index 6066cc6ab..43e3e81f8 100644
--- a/org.eclipse.jubula.toolkit.rcp.gef.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.rcp.gef.api/META-INF/MANIFEST.MF
@@ -8,4 +8,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Require-Bundle: org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
- org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)"
+ org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)",
+ org.eclipse.jubula.toolkit.base.api;bundle-version="[2.4.0,2.5.0)"
diff --git a/org.eclipse.jubula.toolkit.swing.api/.gitignore b/org.eclipse.jubula.toolkit.swing.api/.gitignore
index 934e0e06f..9d12075e6 100644
--- a/org.eclipse.jubula.toolkit.swing.api/.gitignore
+++ b/org.eclipse.jubula.toolkit.swing.api/.gitignore
@@ -1,2 +1,3 @@
/bin
/target
+/src-gen
diff --git a/org.eclipse.jubula.toolkit.swing.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.swing.api/META-INF/MANIFEST.MF
index 1463fc28f..c492aaa8c 100644
--- a/org.eclipse.jubula.toolkit.swing.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.swing.api/META-INF/MANIFEST.MF
@@ -8,4 +8,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Require-Bundle: org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
- org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)"
+ org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)",
+ org.eclipse.jubula.toolkit.base.api;bundle-version="[2.4.0,2.5.0)"
diff --git a/org.eclipse.jubula.toolkit.swt.api/.gitignore b/org.eclipse.jubula.toolkit.swt.api/.gitignore
index 934e0e06f..9d12075e6 100644
--- a/org.eclipse.jubula.toolkit.swt.api/.gitignore
+++ b/org.eclipse.jubula.toolkit.swt.api/.gitignore
@@ -1,2 +1,3 @@
/bin
/target
+/src-gen
diff --git a/org.eclipse.jubula.toolkit.swt.provider/src/org/eclipse/jubula/toolkit/swt/provider/I18nStrings.properties b/org.eclipse.jubula.toolkit.swt.provider/src/org/eclipse/jubula/toolkit/swt/provider/I18nStrings.properties
index 7c539f47f..6b267e9e1 100644
--- a/org.eclipse.jubula.toolkit.swt.provider/src/org/eclipse/jubula/toolkit/swt/provider/I18nStrings.properties
+++ b/org.eclipse.jubula.toolkit.swt.provider/src/org/eclipse/jubula/toolkit/swt/provider/I18nStrings.properties
@@ -26,10 +26,11 @@ guidancer.abstract.SwtLabel=(SWT) Label
guidancer.abstract.SwtItem=(SWT) Item
guidancer.abstract.SwtTabFolder=(SWT) Tabbed Pane
guidancer.abstract.SwtText=(SWT) Text Field/Text Area/Editor Pane/Text Pane
+org.eclipse.swt.widgets.Canvas=(SWT) Canvas
org.eclipse.swt.widgets.SwtTree=Tree Table
org.eclipse.swt.widgets.Link=(SWT) Link
org.eclipse.swt.widgets.Spinner=(SWT) Spinner
org.eclipse.swt.widgets.Slider=(SWT) Slider
org.eclipse.swt.widgets.Scale=(SWT) Scale
org.eclipse.swt.widgets.DateTime=(SWT) DateTime
-org.eclipse.swt.widgets.Progressbar=(SWT) Progress Bar \ No newline at end of file
+org.eclipse.swt.widgets.ProgressBar=(SWT) Progress Bar \ No newline at end of file
diff --git a/org.eclipse.jubula.toolkit.win.api/.gitignore b/org.eclipse.jubula.toolkit.win.api/.gitignore
index 934e0e06f..9d12075e6 100644
--- a/org.eclipse.jubula.toolkit.win.api/.gitignore
+++ b/org.eclipse.jubula.toolkit.win.api/.gitignore
@@ -1,2 +1,3 @@
/bin
/target
+/src-gen
diff --git a/org.eclipse.jubula.toolkit.win.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.win.api/META-INF/MANIFEST.MF
index afe075fb5..587f178ba 100644
--- a/org.eclipse.jubula.toolkit.win.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.win.api/META-INF/MANIFEST.MF
@@ -8,4 +8,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Require-Bundle: org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
- org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)"
+ org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)",
+ org.eclipse.jubula.toolkit.base.api;bundle-version="[2.4.0,2.5.0)"
diff --git a/org.eclipse.jubula.toolkit.win.apps.api/.gitignore b/org.eclipse.jubula.toolkit.win.apps.api/.gitignore
index 934e0e06f..9d12075e6 100644
--- a/org.eclipse.jubula.toolkit.win.apps.api/.gitignore
+++ b/org.eclipse.jubula.toolkit.win.apps.api/.gitignore
@@ -1,2 +1,3 @@
/bin
/target
+/src-gen
diff --git a/org.eclipse.jubula.toolkit.win.apps.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.win.apps.api/META-INF/MANIFEST.MF
index 353117cf5..e7d2c320d 100644
--- a/org.eclipse.jubula.toolkit.win.apps.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.win.apps.api/META-INF/MANIFEST.MF
@@ -8,4 +8,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Require-Bundle: org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
- org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)"
+ org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)",
+ org.eclipse.jubula.toolkit.base.api;bundle-version="[2.4.0,2.5.0)"

Back to the top