Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Struckmann2014-10-02 09:24:15 +0000
committerSebastian Struckmann2014-10-02 14:13:28 +0000
commit7b8634d99507ac3606e87641a52737a9b8a04890 (patch)
treee1f588654e87724cb4300a39879950fe5fc34985
parent536694e43eb648d95255711c172c7973fa9f28b8 (diff)
downloadorg.eclipse.jubula.core-7b8634d99507ac3606e87641a52737a9b8a04890.tar.gz
org.eclipse.jubula.core-7b8634d99507ac3606e87641a52737a9b8a04890.tar.xz
org.eclipse.jubula.core-7b8634d99507ac3606e87641a52737a9b8a04890.zip
Sprint task - Java API - Renamed o.e.j.toolkit.win.apps.* toolkits to winapps, added in generation process
-rw-r--r--org.eclipse.jubula.feature.api/feature.xml2
-rw-r--r--org.eclipse.jubula.feature/feature.xml2
-rw-r--r--org.eclipse.jubula.releng.client/pom.xml4
-rw-r--r--org.eclipse.jubula.toolkit.api.gen/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.toolkit.api.gen/resources/apigen.properties2
-rw-r--r--org.eclipse.jubula.toolkit.api.gen/src/org/eclipse/jubula/toolkit/api/gen/internal/NameLoader.java2
-rw-r--r--org.eclipse.jubula.toolkit.win.api/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.toolkit.win.apps.api/src/org/eclipse/jubula/toolkit/win/apps/internal/.keep0
-rw-r--r--org.eclipse.jubula.toolkit.win.apps.provider/src/org/eclipse/jubula/toolkit/win/apps/provider/I18nStrings.properties21
-rw-r--r--org.eclipse.jubula.toolkit.win.provider/src/org/eclipse/jubula/toolkit/win/provider/I18nStrings.properties77
-rw-r--r--org.eclipse.jubula.toolkit.winapps.api/.checkstyle (renamed from org.eclipse.jubula.toolkit.win.apps.api/.checkstyle)0
-rw-r--r--org.eclipse.jubula.toolkit.winapps.api/.classpath (renamed from org.eclipse.jubula.toolkit.win.apps.api/.classpath)0
-rw-r--r--org.eclipse.jubula.toolkit.winapps.api/.gitignore (renamed from org.eclipse.jubula.toolkit.win.apps.api/.gitignore)0
-rw-r--r--org.eclipse.jubula.toolkit.winapps.api/.project (renamed from org.eclipse.jubula.toolkit.win.apps.provider/.project)24
-rw-r--r--org.eclipse.jubula.toolkit.winapps.api/.settings/org.eclipse.wst.validation.prefs (renamed from org.eclipse.jubula.toolkit.win.apps.api/.settings/org.eclipse.wst.validation.prefs)0
-rw-r--r--org.eclipse.jubula.toolkit.winapps.api/META-INF/MANIFEST.MF (renamed from org.eclipse.jubula.toolkit.win.apps.api/META-INF/MANIFEST.MF)3
-rw-r--r--org.eclipse.jubula.toolkit.winapps.api/about.html (renamed from org.eclipse.jubula.toolkit.win.apps.api/about.html)0
-rw-r--r--org.eclipse.jubula.toolkit.winapps.api/build.properties (renamed from org.eclipse.jubula.toolkit.win.apps.api/build.properties)0
-rw-r--r--org.eclipse.jubula.toolkit.winapps.api/pom.xml (renamed from org.eclipse.jubula.toolkit.win.apps.api/pom.xml)2
-rw-r--r--org.eclipse.jubula.toolkit.winapps.api/src/org/eclipse/jubula/toolkit/winapps/internal/.keep (renamed from org.eclipse.jubula.toolkit.win.apps.api/src-gen/.keep)0
-rw-r--r--org.eclipse.jubula.toolkit.winapps.provider/.classpath (renamed from org.eclipse.jubula.toolkit.win.apps.provider/.classpath)0
-rw-r--r--org.eclipse.jubula.toolkit.winapps.provider/.gitignore (renamed from org.eclipse.jubula.toolkit.win.apps.provider/.gitignore)0
-rw-r--r--org.eclipse.jubula.toolkit.winapps.provider/.project (renamed from org.eclipse.jubula.toolkit.win.apps.api/.project)12
-rw-r--r--org.eclipse.jubula.toolkit.winapps.provider/META-INF/MANIFEST.MF (renamed from org.eclipse.jubula.toolkit.win.apps.provider/META-INF/MANIFEST.MF)4
-rw-r--r--org.eclipse.jubula.toolkit.winapps.provider/about.html (renamed from org.eclipse.jubula.toolkit.win.apps.provider/about.html)0
-rw-r--r--org.eclipse.jubula.toolkit.winapps.provider/build.properties (renamed from org.eclipse.jubula.toolkit.win.apps.provider/build.properties)0
-rw-r--r--org.eclipse.jubula.toolkit.winapps.provider/plugin.properties (renamed from org.eclipse.jubula.toolkit.win.apps.provider/plugin.properties)0
-rw-r--r--org.eclipse.jubula.toolkit.winapps.provider/plugin.xml (renamed from org.eclipse.jubula.toolkit.win.apps.provider/plugin.xml)4
-rw-r--r--org.eclipse.jubula.toolkit.winapps.provider/pom.xml (renamed from org.eclipse.jubula.toolkit.win.apps.provider/pom.xml)2
-rw-r--r--org.eclipse.jubula.toolkit.winapps.provider/resources/xml/ComponentConfiguration.xml (renamed from org.eclipse.jubula.toolkit.win.apps.provider/resources/xml/ComponentConfiguration.xml)0
-rw-r--r--org.eclipse.jubula.toolkit.winapps.provider/src/org/eclipse/jubula/toolkit/winapps/provider/Activator.java (renamed from org.eclipse.jubula.toolkit.win.apps.provider/src/org/eclipse/jubula/toolkit/win/apps/provider/Activator.java)2
-rw-r--r--org.eclipse.jubula.toolkit.winapps.provider/src/org/eclipse/jubula/toolkit/winapps/provider/I18nStrings.properties35
-rw-r--r--org.eclipse.jubula.toolkit.winapps.provider/src/org/eclipse/jubula/toolkit/winapps/provider/WinAppsToolkitProvider.java (renamed from org.eclipse.jubula.toolkit.win.apps.provider/src/org/eclipse/jubula/toolkit/win/apps/provider/WinAppsToolkitProvider.java)4
33 files changed, 130 insertions, 77 deletions
diff --git a/org.eclipse.jubula.feature.api/feature.xml b/org.eclipse.jubula.feature.api/feature.xml
index 0c55b01f6..584b86c0b 100644
--- a/org.eclipse.jubula.feature.api/feature.xml
+++ b/org.eclipse.jubula.feature.api/feature.xml
@@ -125,7 +125,7 @@ BREDEX GmbH - initial API and implementation and/or initial documentation
unpack="false"/>
<plugin
- id="org.eclipse.jubula.toolkit.win.apps.api"
+ id="org.eclipse.jubula.toolkit.winapps.api"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/org.eclipse.jubula.feature/feature.xml b/org.eclipse.jubula.feature/feature.xml
index 17bbe07f0..ee03bdac4 100644
--- a/org.eclipse.jubula.feature/feature.xml
+++ b/org.eclipse.jubula.feature/feature.xml
@@ -144,7 +144,7 @@ BREDEX GmbH - initial API and implementation and/or initial documentation
unpack="false"/>
<plugin
- id="org.eclipse.jubula.toolkit.win.apps.provider"
+ id="org.eclipse.jubula.toolkit.winapps.provider"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/org.eclipse.jubula.releng.client/pom.xml b/org.eclipse.jubula.releng.client/pom.xml
index f6a1f259b..7fe0a0173 100644
--- a/org.eclipse.jubula.releng.client/pom.xml
+++ b/org.eclipse.jubula.releng.client/pom.xml
@@ -55,8 +55,8 @@
<module>../org.eclipse.jubula.toolkit.swt.provider</module>
<module>../org.eclipse.jubula.toolkit.win.api</module>
<module>../org.eclipse.jubula.toolkit.win.provider</module>
- <module>../org.eclipse.jubula.toolkit.win.apps.api</module>
- <module>../org.eclipse.jubula.toolkit.win.apps.provider</module>
+ <module>../org.eclipse.jubula.toolkit.winapps.api</module>
+ <module>../org.eclipse.jubula.toolkit.winapps.provider</module>
<module>../org.eclipse.jubula.toolkit.common</module>
<module>../org.eclipse.jubula.client.ua.cheatsheets</module>
<module>../org.eclipse.jubula.client.ua.welcome</module>
diff --git a/org.eclipse.jubula.toolkit.api.gen/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.api.gen/META-INF/MANIFEST.MF
index 0eaa808f9..b48884ce9 100644
--- a/org.eclipse.jubula.toolkit.api.gen/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.api.gen/META-INF/MANIFEST.MF
@@ -22,5 +22,5 @@ Require-Bundle: org.apache.commons.logging;bundle-version="[1.0.0,2.0.0)",
org.eclipse.jubula.toolkit.rcp.provider;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.swing.provider;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.swt.provider;bundle-version="[2.4.0,2.5.0)",
- org.eclipse.jubula.toolkit.win.apps.provider;bundle-version="[2.4.0,2.5.0)",
+ org.eclipse.jubula.toolkit.winapps.provider;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.win.provider;bundle-version="[2.4.0,2.5.0)"
diff --git a/org.eclipse.jubula.toolkit.api.gen/resources/apigen.properties b/org.eclipse.jubula.toolkit.api.gen/resources/apigen.properties
index 5fed3558a..654c2e6f7 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, html, javafx
+api.gen.toolkit.names=base, concrete, html, javafx, rcp, swing, swt, win, winapps
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
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
index 0a069aebc..0ce6b012d 100644
--- 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
@@ -191,7 +191,7 @@ public class NameLoader {
*/
public 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$
- .replace("ios", "mobile.ios").replace("winApps", "win.apps"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ .replace("ios", "mobile.ios"); //$NON-NLS-1$ //$NON-NLS-2$
}
/**
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 26e04730a..7f8e81700 100644
--- a/org.eclipse.jubula.toolkit.win.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.win.api/META-INF/MANIFEST.MF
@@ -7,6 +7,9 @@ Bundle-Vendor: Eclipse Jubula
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
+Export-Package: org.eclipse.jubula.toolkit.win,
+ org.eclipse.jubula.toolkit.win.widgets,
+ org.eclipse.jubula.toolkit.win.internal.impl
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.base.api;bundle-version="[2.4.0,2.5.0)",
diff --git a/org.eclipse.jubula.toolkit.win.apps.api/src/org/eclipse/jubula/toolkit/win/apps/internal/.keep b/org.eclipse.jubula.toolkit.win.apps.api/src/org/eclipse/jubula/toolkit/win/apps/internal/.keep
deleted file mode 100644
index e69de29bb..000000000
--- a/org.eclipse.jubula.toolkit.win.apps.api/src/org/eclipse/jubula/toolkit/win/apps/internal/.keep
+++ /dev/null
diff --git a/org.eclipse.jubula.toolkit.win.apps.provider/src/org/eclipse/jubula/toolkit/win/apps/provider/I18nStrings.properties b/org.eclipse.jubula.toolkit.win.apps.provider/src/org/eclipse/jubula/toolkit/win/apps/provider/I18nStrings.properties
deleted file mode 100644
index 65cd2fb3f..000000000
--- a/org.eclipse.jubula.toolkit.win.apps.provider/src/org/eclipse/jubula/toolkit/win/apps/provider/I18nStrings.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2013 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
-###############################################################################
-org.eclipse.jubula.rc.dotnet.components.controltype.ButtonInternetExplorer = Button
-org.eclipse.jubula.rc.dotnet.components.controltype.ButtonXAML = Button
-org.eclipse.jubula.rc.dotnet.components.controltype.CheckBoxInternetExplorer = Check Box
-org.eclipse.jubula.rc.dotnet.components.controltype.CheckBoxXAML = Check Box
-org.eclipse.jubula.rc.dotnet.components.controltype.ComboBoxInternetExplorer = Combo Box
-org.eclipse.jubula.rc.dotnet.components.controltype.ComboBoxXAML = Combo Box
-org.eclipse.jubula.rc.dotnet.components.controltype.EditInternetExplorer = Text Field
-org.eclipse.jubula.rc.dotnet.components.controltype.EditXAML = Text Field
-org.eclipse.jubula.rc.dotnet.components.controltype.ListInternetExplorer = List
-org.eclipse.jubula.rc.dotnet.components.controltype.ListXAML = List
-org.eclipse.jubula.rc.dotnet.components.controltype.RadioButtonInternetExplorer = Radio Button
-org.eclipse.jubula.rc.dotnet.components.controltype.RadioButtonXAML = Radio Button
-org.eclipse.jubula.rc.dotnet.components.controltype.TextInternetExplorer = Label
-org.eclipse.jubula.rc.dotnet.components.controltype.TextXAML = Label \ No newline at end of file
diff --git a/org.eclipse.jubula.toolkit.win.provider/src/org/eclipse/jubula/toolkit/win/provider/I18nStrings.properties b/org.eclipse.jubula.toolkit.win.provider/src/org/eclipse/jubula/toolkit/win/provider/I18nStrings.properties
index 3bfbff8b2..172065c18 100644
--- a/org.eclipse.jubula.toolkit.win.provider/src/org/eclipse/jubula/toolkit/win/provider/I18nStrings.properties
+++ b/org.eclipse.jubula.toolkit.win.provider/src/org/eclipse/jubula/toolkit/win/provider/I18nStrings.properties
@@ -5,39 +5,62 @@
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
###############################################################################
-org.eclipse.jubula.rc.dotnet.components.controltype.ButtonWinForm = Button
-org.eclipse.jubula.rc.dotnet.components.controltype.CheckBoxWinForm = Check Box
-org.eclipse.jubula.rc.dotnet.components.controltype.RadioButtonWinForm = Radio Button
-org.eclipse.jubula.rc.dotnet.components.controltype.EditWinForm = Text Field
-org.eclipse.jubula.rc.dotnet.components.controltype.DocumentWinForm = Text Area
-org.eclipse.jubula.rc.dotnet.components.controltype.TextWinForm = Label
-org.eclipse.jubula.rc.dotnet.components.controltype.TreeWinForm = Tree
-org.eclipse.jubula.rc.dotnet.components.controltype.TableWinForm = Table
-org.eclipse.jubula.rc.dotnet.components.controltype.TabWinForm = Tab
-org.eclipse.jubula.rc.dotnet.components.controltype.ListWinForm = List
-org.eclipse.jubula.rc.dotnet.components.controltype.ComboBoxWinForm = Combo Box
-org.eclipse.jubula.rc.dotnet.components.controltype.ButtonWPF = Button
-org.eclipse.jubula.rc.dotnet.components.controltype.CheckBoxWPF = Check Box
-org.eclipse.jubula.rc.dotnet.components.controltype.RadioButtonWPF = Radio Button
-org.eclipse.jubula.rc.dotnet.components.controltype.EditWPF = Text Field
-org.eclipse.jubula.rc.dotnet.components.controltype.DocumentWPF = Text Area
-org.eclipse.jubula.rc.dotnet.components.controltype.TextWPF = Label
-org.eclipse.jubula.rc.dotnet.components.controltype.TreeWPF = Tree
-org.eclipse.jubula.rc.dotnet.components.controltype.TableWPF = Table
-org.eclipse.jubula.rc.dotnet.components.controltype.TabWPF = Tab
-org.eclipse.jubula.rc.dotnet.components.controltype.ListWPF = List
-org.eclipse.jubula.rc.dotnet.components.controltype.ComboBoxWPF = Combo Box
+org.eclipse.jubula.rc.dotnet.components.controltype.ButtonWinForm = Win Form Button Component
+org.eclipse.jubula.rc.dotnet.components.controltype.CheckBoxWinForm = Win Form Check Box Component
+org.eclipse.jubula.rc.dotnet.components.controltype.RadioButtonWinForm = Win Form Radio Button
+org.eclipse.jubula.rc.dotnet.components.controltype.EditWinForm = Win Form Text Field
+org.eclipse.jubula.rc.dotnet.components.controltype.DocumentWinForm = Win Form Text Area
+org.eclipse.jubula.rc.dotnet.components.controltype.TextWinForm = Win Form Label
+org.eclipse.jubula.rc.dotnet.components.controltype.TreeWinForm = Win Form Tree
+org.eclipse.jubula.rc.dotnet.components.controltype.TableWinForm = Win Form Table
+org.eclipse.jubula.rc.dotnet.components.controltype.TabWinForm = Win Form Tab Component
+org.eclipse.jubula.rc.dotnet.components.controltype.ListWinForm = Win Form List
+org.eclipse.jubula.rc.dotnet.components.controltype.ComboBoxWinForm = Win Form Combo Component
+org.eclipse.jubula.rc.dotnet.components.controltype.ButtonWPF = WPF Button
+org.eclipse.jubula.rc.dotnet.components.controltype.CheckBoxWPF = WPF WPF Check Box
+org.eclipse.jubula.rc.dotnet.components.controltype.RadioButtonWPF = WPF Radio Button
+org.eclipse.jubula.rc.dotnet.components.controltype.EditWPF = WPF Component with Text Input
+org.eclipse.jubula.rc.dotnet.components.controltype.DocumentWPF = WPF Text Area
+org.eclipse.jubula.rc.dotnet.components.controltype.TextWPF = WPF Component with Text
+org.eclipse.jubula.rc.dotnet.components.controltype.TreeWPF = WPF Tree
+org.eclipse.jubula.rc.dotnet.components.controltype.TableWPF = WPF Table
+org.eclipse.jubula.rc.dotnet.components.controltype.TabWPF = WPF Tab
+org.eclipse.jubula.rc.dotnet.components.controltype.ListWPF = WPF List
+org.eclipse.jubula.rc.dotnet.components.controltype.ComboBoxWPF = WPF Combo Box
org.eclipse.jubula.rc.dotnet.components.controltype.Button = Button
org.eclipse.jubula.rc.dotnet.components.controltype.CheckBox = Check Box
org.eclipse.jubula.rc.dotnet.components.controltype.RadioButton = Radio Button
-org.eclipse.jubula.rc.dotnet.components.controltype.Edit = Text Field
+org.eclipse.jubula.rc.dotnet.components.controltype.Edit = Component with Text Input
org.eclipse.jubula.rc.dotnet.components.controltype.Document = Text Area
-org.eclipse.jubula.rc.dotnet.components.controltype.Text = Label
+org.eclipse.jubula.rc.dotnet.components.controltype.Text = Component with Text
org.eclipse.jubula.rc.dotnet.components.controltype.Tree = Tree
org.eclipse.jubula.rc.dotnet.components.controltype.Table = Table
-org.eclipse.jubula.rc.dotnet.components.controltype.Tab = Tab
+org.eclipse.jubula.rc.dotnet.components.controltype.Tab = Tab Component
org.eclipse.jubula.rc.dotnet.components.controltype.List = List
-org.eclipse.jubula.rc.dotnet.components.controltype.ComboBox = Combo Box
+org.eclipse.jubula.rc.dotnet.components.controltype.ComboBox = Combo Component
org.eclipse.jubula.rc.dotnet.components.controltype.Application = Application
org.eclipse.jubula.rc.dotnet.components.controltype.Menu = Menu
-Application = Application \ No newline at end of file
+Application = Application
+com.bredexsw.guidancer.rc.dotnet.components.controltype.ButtonWinForm = Win Form Button
+com.bredexsw.guidancer.rc.dotnet.components.controltype.ButtonWPF = WPF Button
+com.bredexsw.guidancer.rc.dotnet.components.controltype.ButtonWin32 = Button Win 32
+com.bredexsw.guidancer.rc.dotnet.components.controltype.CheckBoxWinForm = Win Form Check Box
+com.bredexsw.guidancer.rc.dotnet.components.controltype.CheckBoxWPF = WPF Check Box
+com.bredexsw.guidancer.rc.dotnet.components.controltype.RadioButtonWinForm = Win Form Radio Button
+com.bredexsw.guidancer.rc.dotnet.components.controltype.RadioButtonWPF = WPF Radio Button
+com.bredexsw.guidancer.rc.dotnet.components.controltype.EditWinForm = Win Form Text Field
+com.bredexsw.guidancer.rc.dotnet.components.controltype.EditWPF = WPF Text Field
+com.bredexsw.guidancer.rc.dotnet.components.controltype.DocumentWinForm = Win Form Document
+com.bredexsw.guidancer.rc.dotnet.components.controltype.DocumentWPF = WPF Document
+com.bredexsw.guidancer.rc.dotnet.components.controltype.TextWinForm = Win Form Label
+com.bredexsw.guidancer.rc.dotnet.components.controltype.TextWPF = WPF Label
+com.bredexsw.guidancer.rc.dotnet.components.controltype.TreeWinForm = Win Form Tree
+com.bredexsw.guidancer.rc.dotnet.components.controltype.TreeWPF = WPF Tree
+com.bredexsw.guidancer.rc.dotnet.components.controltype.TabWinForm = Win Form Tab
+com.bredexsw.guidancer.rc.dotnet.components.controltype.TabWPF = WPF Tab
+com.bredexsw.guidancer.rc.dotnet.components.controltype.ListWinForm = Win Form List
+com.bredexsw.guidancer.rc.dotnet.components.controltype.ListWPF = WPF List
+com.bredexsw.guidancer.rc.dotnet.components.controltype.TableWinForm = Win Form Table
+com.bredexsw.guidancer.rc.dotnet.components.controltype.TableWPF = WPF Table
+com.bredexsw.guidancer.rc.dotnet.components.controltype.ComboBoxWinForm = Win Form Combo Box
+com.bredexsw.guidancer.rc.dotnet.components.controltype.ComboBoxWPF = WPF Combo Box \ No newline at end of file
diff --git a/org.eclipse.jubula.toolkit.win.apps.api/.checkstyle b/org.eclipse.jubula.toolkit.winapps.api/.checkstyle
index 7e922b196..7e922b196 100644
--- a/org.eclipse.jubula.toolkit.win.apps.api/.checkstyle
+++ b/org.eclipse.jubula.toolkit.winapps.api/.checkstyle
diff --git a/org.eclipse.jubula.toolkit.win.apps.api/.classpath b/org.eclipse.jubula.toolkit.winapps.api/.classpath
index e29f56c12..e29f56c12 100644
--- a/org.eclipse.jubula.toolkit.win.apps.api/.classpath
+++ b/org.eclipse.jubula.toolkit.winapps.api/.classpath
diff --git a/org.eclipse.jubula.toolkit.win.apps.api/.gitignore b/org.eclipse.jubula.toolkit.winapps.api/.gitignore
index 9d12075e6..9d12075e6 100644
--- a/org.eclipse.jubula.toolkit.win.apps.api/.gitignore
+++ b/org.eclipse.jubula.toolkit.winapps.api/.gitignore
diff --git a/org.eclipse.jubula.toolkit.win.apps.provider/.project b/org.eclipse.jubula.toolkit.winapps.api/.project
index 0a0c0a5b8..c2e3c5245 100644
--- a/org.eclipse.jubula.toolkit.win.apps.provider/.project
+++ b/org.eclipse.jubula.toolkit.winapps.api/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.jubula.toolkit.win.apps.provider</name>
+ <name>org.eclipse.jubula.toolkit.winapps.api</name>
<comment></comment>
<projects>
</projects>
@@ -31,9 +31,16 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
+ <linkedResources>
+ <link>
+ <name>.settings</name>
+ <type>2</type>
+ <locationURI>copy_PARENT/org.eclipse.jubula.project.configuration/settings/1.6</locationURI>
+ </link>
+ </linkedResources>
<filteredResources>
<filter>
- <id>1409218333740</id>
+ <id>0</id>
<name></name>
<type>10</type>
<matcher>
@@ -42,11 +49,10 @@
</matcher>
</filter>
</filteredResources>
- <linkedResources>
- <link>
- <name>.settings</name>
- <type>2</type>
- <locationURI>PARENT-1-PROJECT_LOC/org.eclipse.jubula.project.configuration/settings/1.7</locationURI>
- </link>
- </linkedResources>
+ <variableList>
+ <variable>
+ <name>copy_PARENT</name>
+ <value>$%7BPARENT-2-PROJECT_LOC%7D/repos/org.eclipse.jubula.core</value>
+ </variable>
+ </variableList>
</projectDescription>
diff --git a/org.eclipse.jubula.toolkit.win.apps.api/.settings/org.ecli