diff options
125 files changed, 604 insertions, 1092 deletions
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/AbstractMonitoring.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/AbstractMonitoring.java index 5fff549f3..dd5f60285 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/AbstractMonitoring.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/AbstractMonitoring.java @@ -33,14 +33,15 @@ public abstract class AbstractMonitoring implements IMonitoring { /** the autId */ private String m_autId; - /** - * File referring the installtion directory. Used to find support - * files. + + /** + * File referring the installation directory. Used to find support files. */ private File m_installationDir; /** MonitoringDataStore which contains the configuration maps */ private MonitoringDataStore m_mds = MonitoringDataStore.getInstance(); + /** * {@inheritDoc} */ diff --git a/org.eclipse.jubula.examples.extension.rcp.feature/.gitignore b/org.eclipse.jubula.examples.extension.rcp.feature/.gitignore new file mode 100644 index 000000000..64af1f50f --- /dev/null +++ b/org.eclipse.jubula.examples.extension.rcp.feature/.gitignore @@ -0,0 +1,3 @@ +/build +/bin +/target diff --git a/org.eclipse.jubula.examples.extension.rcp.feature/feature.xml b/org.eclipse.jubula.examples.extension.rcp.feature/feature.xml index 9530e8415..bd52da2b8 100644 --- a/org.eclipse.jubula.examples.extension.rcp.feature/feature.xml +++ b/org.eclipse.jubula.examples.extension.rcp.feature/feature.xml @@ -30,5 +30,12 @@ BREDEX GmbH - initial API and implementation and/or initial documentation install-size="0" version="0.0.0" unpack="false"/> + + <fragment + id="org.eclipse.jubula.examples.extension.rcp.rc" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> </feature> diff --git a/org.eclipse.jubula.examples.extension.rcp.gef.logic.identifier/.classpath b/org.eclipse.jubula.examples.extension.rcp.gef.logic.identifier/.classpath index 1fa3e6803..5e4c1fe99 100644 --- a/org.eclipse.jubula.examples.extension.rcp.gef.logic.identifier/.classpath +++ b/org.eclipse.jubula.examples.extension.rcp.gef.logic.identifier/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/org.eclipse.jubula.examples.extension.rcp.gef.logic.identifier/.project b/org.eclipse.jubula.examples.extension.rcp.gef.logic.identifier/.project index ed95e3563..370556acd 100644 --- a/org.eclipse.jubula.examples.extension.rcp.gef.logic.identifier/.project +++ b/org.eclipse.jubula.examples.extension.rcp.gef.logic.identifier/.project @@ -20,10 +20,16 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>net.sf.eclipsecs.core.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> </natures> <linkedResources> <link> diff --git a/org.eclipse.jubula.examples.extension.rcp.gef.logic.identifier/src/org/eclipse/jubula/examples/extension/rcp/gef/logic/identifier/Activator.java b/org.eclipse.jubula.examples.extension.rcp.gef.logic.identifier/src/org/eclipse/jubula/examples/extension/rcp/gef/logic/identifier/Activator.java index 407f18962..6456aa36b 100644 --- a/org.eclipse.jubula.examples.extension.rcp.gef.logic.identifier/src/org/eclipse/jubula/examples/extension/rcp/gef/logic/identifier/Activator.java +++ b/org.eclipse.jubula.examples.extension.rcp.gef.logic.identifier/src/org/eclipse/jubula/examples/extension/rcp/gef/logic/identifier/Activator.java @@ -18,43 +18,37 @@ import org.osgi.framework.BundleContext; */ public class Activator extends Plugin { - // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.gef.examples.logic.identifier"; //$NON-NLS-1$ - - // The shared instance - private static Activator plugin; - - /** - * The constructor - */ - public Activator() { - // empty - } - - /* - * (non-Javadoc) - * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } + /** The plug-in ID */ + public static final String PLUGIN_ID = "org.eclipse.jubula.examples.extension.rcp.gef.logic.identifier"; //$NON-NLS-1$ + + /** The shared instance */ + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + // empty + } + + /** {@inheritDoc} */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /** {@inheritDoc} */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } } diff --git a/org.eclipse.jubula.examples.extension.rcp.rc/.classpath b/org.eclipse.jubula.examples.extension.rcp.rc/.classpath index 4c70f99a5..5e4c1fe99 100644 --- a/org.eclipse.jubula.examples.extension.rcp.rc/.classpath +++ b/org.eclipse.jubula.examples.extension.rcp.rc/.classpath @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> - <classpathentry kind="lib" path="lib/org.eclipse.jubula.rc.common.jar"/> - <classpathentry kind="lib" path="lib/org.eclipse.jubula.rc.swt.jar"/> - <classpathentry kind="lib" path="lib/org.eclipse.jubula.tools.jar"/> - <classpathentry kind="lib" path="/org.eclipse.jubula.project.compatibility/local-compatibility-repo/org/eclipse/jubula/project/compatibility/org.eclipse.swt/3.1/org.eclipse.swt-3.1.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/org.eclipse.jubula.examples.extension.rcp.rc/.project b/org.eclipse.jubula.examples.extension.rcp.rc/.project index 1da4f87fd..d26327175 100644 --- a/org.eclipse.jubula.examples.extension.rcp.rc/.project +++ b/org.eclipse.jubula.examples.extension.rcp.rc/.project @@ -11,12 +11,23 @@ </arguments> </buildCommand> <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> <name>net.sf.eclipsecs.core.CheckstyleBuilder</name> <arguments> </arguments> </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> </natures> diff --git a/org.eclipse.jubula.examples.extension.rcp.rc/META-INF/MANIFEST.MF b/org.eclipse.jubula.examples.extension.rcp.rc/META-INF/MANIFEST.MF new file mode 100644 index 000000000..6b3d03208 --- /dev/null +++ b/org.eclipse.jubula.examples.extension.rcp.rc/META-INF/MANIFEST.MF @@ -0,0 +1,8 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: org.eclipse.jubula.examples.extension.rcp.rc +Bundle-SymbolicName: org.eclipse.jubula.examples.extension.rcp.rc;singleton:=true +Bundle-Version: 2.0.0.qualifier +Fragment-Host: org.eclipse.jubula.rc.rcp.swt +Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Require-Bundle: org.eclipse.jubula.rc.common diff --git a/org.eclipse.jubula.examples.extension.rcp.rc/lib/.gitignore b/org.eclipse.jubula.examples.extension.rcp.rc/lib/.gitignore deleted file mode 100644 index c77820313..000000000 --- a/org.eclipse.jubula.examples.extension.rcp.rc/lib/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/org.eclipse.jubula.rc.common.jar -/org.eclipse.jubula.rc.swt.jar -/org.eclipse.jubula.tools.jar diff --git a/org.eclipse.jubula.examples.extension.rcp.rc/lib/.keep b/org.eclipse.jubula.examples.extension.rcp.rc/lib/.keep deleted file mode 100644 index e69de29bb..000000000 --- a/org.eclipse.jubula.examples.extension.rcp.rc/lib/.keep +++ /dev/null diff --git a/org.eclipse.jubula.examples.extension.rcp.rc/src/org/eclipse/jubula/rc/common/adapter/SWTExtensionExampleAdapterFactory.java b/org.eclipse.jubula.examples.extension.rcp.rc/src/org/eclipse/jubula/rc/common/adapter/SWTExtensionExampleAdapterFactory.java new file mode 100644 index 000000000..bae493284 --- /dev/null +++ b/org.eclipse.jubula.examples.extension.rcp.rc/src/org/eclipse/jubula/rc/common/adapter/SWTExtensionExampleAdapterFactory.java @@ -0,0 +1,39 @@ +/******************************************************************************* + * Copyright (c) 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 + * + * Contributors: + * BREDEX GmbH - initial API and implementation + *******************************************************************************/ +package org.eclipse.jubula.rc.common.adapter; + +import org.eclipse.jubula.rc.common.adaptable.IAdapterFactory; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IComponent; +import org.eclipse.jubula.rc.swt.tester.adapter.WidgetAdapter; +import org.eclipse.swt.widgets.Group; + +/** + * Adapter Factory for new adapters. This class makes your new adapters usable + * for testing. One factory could be used for all adapters implemented. + * + * @author BREDEX GmbH + */ +public class SWTExtensionExampleAdapterFactory implements IAdapterFactory { + /** {@inheritDoc} */ + public Class[] getSupportedClasses() { + return new Class[] { Group.class }; + } + + /** {@inheritDoc} */ + public Object getAdapter(Class targetedClass, Object objectToAdapt) { + if (targetedClass.isAssignableFrom(IComponent.class)) { + if (objectToAdapt instanceof Group) { + return new WidgetAdapter(objectToAdapt); + } + } + return null; + } +} diff --git a/org.eclipse.jubula.examples.extension.rcp.rc/src/org/eclipse/jubula/rc/swt/implclasses/GroupImplClass.java b/org.eclipse.jubula.examples.extension.rcp.rc/src/org/eclipse/jubula/rc/swt/tester/GroupTester.java index d96e2e773..0d0030cff 100644 --- a/org.eclipse.jubula.examples.extension.rcp.rc/src/org/eclipse/jubula/rc/swt/implclasses/GroupImplClass.java +++ b/org.eclipse.jubula.examples.extension.rcp.rc/src/org/eclipse/jubula/rc/swt/tester/GroupTester.java @@ -8,10 +8,9 @@ * Contributors: * BREDEX GmbH - initial API and implementation and/or initial documentation *******************************************************************************/ -package org.eclipse.jubula.rc.swt.implclasses; +package org.eclipse.jubula.rc.swt.tester; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Group; +import org.eclipse.jubula.rc.common.tester.WidgetTester; /** * Tester Class for the RcpAccessor. This class realizes the technical access to @@ -23,37 +22,9 @@ import org.eclipse.swt.widgets.Group; * @author BREDEX GmbH * */ -public class GroupImplClass extends AbstractControlImplClass { - /** the managed component */ - private Group m_group; - - /** - * getter for the new supported component - * - * @return the component - */ - public Control getComponent() { - return m_group; - } - +public class GroupTester extends WidgetTester { /** - * as Group is no component which by default displays any kind of - * descriptive text, this method should return null - * - * @return null in case of a non-textual component + * this could really be empty if you only want to support Group as an + * graphics component. */ - public String[] getTextArrayFromComponent() { - return null; - } - - /** - * setter for the new supported component - * - * @param graphics - * the ui object to set - */ - public void setComponent(Object graphics) { - m_group = (Group) graphics; - - } }
\ No newline at end of file diff --git a/org.eclipse.jubula.examples.extension.rcp.toolkit/resources/xml/CommonComponentConfiguration.xsd b/org.eclipse.jubula.examples.extension.rcp.toolkit/resources/xml/CommonComponentConfiguration.xsd deleted file mode 100644 index 1567cf7cd..000000000 --- a/org.eclipse.jubula.examples.extension.rcp.toolkit/resources/xml/CommonComponentConfiguration.xsd +++ /dev/null @@ -1,85 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-
- <xs:element name="method" type="xs:string"/>
- <xs:element name="type" type="xs:string"/>
- <xs:element name="defaultValue" type="xs:string"/>
-
- <xs:element name="param">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="type" />
- <xs:element minOccurs="0" ref="defaultValue" />
- <xs:element minOccurs="0" ref="valueSet" />
- </xs:sequence>
- <xs:attribute name="name" use="required" />
- </xs:complexType>
- </xs:element>
-
- <xs:element name="valueSet">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" ref="element" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- - <xs:element name="defaultMapping"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="typeFactory"> - <xs:attribute name="logicalName" use="required" type="xs:ID"/> - <xs:attribute name="technicalName" use="required"/> - </xs:extension> - </xs:complexContent> - </xs:complexType> - </xs:element> - - <xs:element name="typeFactory" type="xs:string"/> -
- <xs:element name="element">
- <xs:complexType>
- <xs:attribute name="name" use="required" />
- <xs:attribute name="value" use="required" />
- </xs:complexType>
- </xs:element>
-
- <xs:element name="postExecutionCommand" type="xs:string" />
-
- <xs:element name="action">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="method" />
- <xs:element minOccurs="0" maxOccurs="unbounded"
- ref="param" />
- <xs:element minOccurs="0" ref="postExecutionCommand" />
- </xs:sequence>
- <xs:attribute name="name" use="required" />
- <xs:attribute name="clientAction">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="changed" use="required" />
- <xs:attribute name="deprecated">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="realizes" type="xs:string"/>
- <xs:element name="extends" type="xs:string"/>
- - <xs:complexType name="typeFactory"> - <xs:sequence> - <xs:element ref="typeFactory"/> - </xs:sequence> - </xs:complexType> -
-</xs:schema>
\ No newline at end of file diff --git a/org.eclipse.jubula.examples.extension.rcp.toolkit/resources/xml/MyComponentConfiguration.xml b/org.eclipse.jubula.examples.extension.rcp.toolkit/resources/xml/ComponentConfiguration.xml index 9bf2ab461..aa4bb04e4 100644 --- a/org.eclipse.jubula.examples.extension.rcp.toolkit/resources/xml/MyComponentConfiguration.xml +++ b/org.eclipse.jubula.examples.extension.rcp.toolkit/resources/xml/ComponentConfiguration.xml @@ -9,18 +9,15 @@ <!--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="ToolkitComponentConfiguration.xsd"> +<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> <minorVersion>38</minorVersion> - <majorCustomVersion>0</majorCustomVersion> - <minorCustomVersion>0</minorCustomVersion> </configVersion> <toolkitComponent type="org.eclipse.swt.widgets.Group" visible="true"> <realizes>guidancer.abstract.Widget</realizes> - <testerClass>org.eclipse.jubula.rc.swt.implclasses.GroupImplClass</testerClass> + <testerClass>org.eclipse.jubula.rc.swt.tester.GroupTester</testerClass> <componentClass name="org.eclipse.swt.widgets.Group" /> </toolkitComponent> diff --git a/org.eclipse.jubula.examples.extension.rcp.toolkit/resources/xml/ToolkitComponentConfiguration.xsd b/org.eclipse.jubula.examples.extension.rcp.toolkit/resources/xml/ToolkitComponentConfiguration.xsd deleted file mode 100644 index 8677581a9..000000000 --- a/org.eclipse.jubula.examples.extension.rcp.toolkit/resources/xml/ToolkitComponentConfiguration.xsd +++ /dev/null @@ -1,107 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified">
- <xs:include schemaLocation="CommonComponentConfiguration.xsd" />
- <xs:element name="compSystem">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="configVersion" />
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="abstractComponent" />
- <xs:element ref="toolkitComponent" />
- </xs:choice>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="configVersion">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="majorVersion" />
- <xs:element ref="minorVersion" />
- <xs:element ref="majorCustomVersion" />
- <xs:element ref="minorCustomVersion" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="majorVersion" type="xs:string" />
- <xs:element name="minorVersion" type="xs:string" />
- <xs:element name="majorCustomVersion" type="xs:string" />
- <xs:element name="minorCustomVersion" type="xs:string" />
- <xs:element name="toolkitComponent">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" ref="defaultMapping" />
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="realizes" />
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="extends" />
- <xs:element ref="testerClass" />
- <xs:element minOccurs="0" maxOccurs="1" ref="componentClass" />
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="action" />
- </xs:sequence>
- <xs:attribute name="type" use="required" type="xs:ID" />
- <xs:attribute name="visible" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- <xs:enumeration value="false" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="observable" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- <xs:enumeration value="false" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="changed" />
- <xs:attribute name="deprecated">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="abstractComponent">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="realizes" />
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="extends" />
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="action" />
- </xs:sequence>
- <xs:attribute name="type" use="required" type="xs:ID" />
- <xs:attribute name="visible" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- <xs:enumeration value="false" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="changed" />
- <xs:attribute name="deprecated">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="testerClass" type="xs:string" />
- <xs:element name="componentClass">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="property" />
- </xs:sequence>
- <xs:attribute name="name" use="required" type="xs:string" />
- </xs:complexType>
- </xs:element>
- <xs:element name="property">
- <xs:complexType>
- <xs:attribute name="name" use="required" type="xs:string" />
- <xs:attribute name="value" use="required" type="xs:string" />
- </xs:complexType>
- </xs:element>
</xs:schema>
diff --git a/org.eclipse.jubula.examples.extension.rcp.toolkit/src/org/eclipse/jubula/examples/extension/rcp/toolkit/provider/RcpExtensionProvider.java b/org.eclipse.jubula.examples.extension.rcp.toolkit/src/org/eclipse/jubula/examples/extension/rcp/toolkit/provider/RcpExtensionProvider.java index 976a3cf2b..66c98a2ad 100644 --- a/org.eclipse.jubula.examples.extension.rcp.toolkit/src/org/eclipse/jubula/examples/extension/rcp/toolkit/provider/RcpExtensionProvider.java +++ b/org.eclipse.jubula.examples.extension.rcp.toolkit/src/org/eclipse/jubula/examples/extension/rcp/toolkit/provider/RcpExtensionProvider.java @@ -11,55 +11,40 @@ package org.eclipse.jubula.examples.extension.rcp.toolkit.provider; import java.net.URL; -import java.util.Map; import java.util.ResourceBundle; import org.eclipse.jubula.examples.extension.rcp.toolkit.Activator; -import org.eclipse.jubula.toolkit.common.IToolKitProvider; +import org.eclipse.jubula.toolkit.common.AbstractToolkitProvider; import org.eclipse.jubula.toolkit.common.utils.ToolkitUtils; -import org.eclipse.swt.widgets.Composite; - /** * Toolkit Provider Class * - * This class provides the Jubula Client with all necessary information: - * which new components have been added by the user (see the - * ComponentConfiguration.xml), from what kind of components they inherit and - * where to search for translatable keys. + * This class provides the ITE with all necessary information: which new + * components have been added by the user (see the ComponentConfiguration.xml), + * from what kind of components they inherit and where to search for + * translatable keys. * * @author BREDEX GmbH * */ -public class RcpExtensionProvider implements IToolKitProvider { +public class RcpExtensionProvider extends AbstractToolkitProvider { /** the bundle location */ public static final String BUNDLE = "org.eclipse.jubula.examples.extension.rcp.toolkit.i18n.i18n"; //$NON-NLS-1$ - - /** - * As this should be a toolkit extension instead of a seperated toolkit, you - * do not have to implement your own AUT-Configuration dialog. - * {@inheritDoc} - */ - public Composite getAutConfigDialog(Composite arg0, int arg1, Map arg2, - String arg3) { - return null; - } /** * this method returns the path where the client searches for your client * toolkit extension XML-file. This file contains all necessary information - * for the client. - * {@inheritDoc} + * for the client. {@inheritDoc} */ public URL getComponentConfigurationFileURL() { return ToolkitUtils.getURL(Activator.getDefault(), - "resources/xml/MyComponentConfiguration.xml"); //$NON-NLS-1$ + "resources/xml/ComponentConfiguration.xml"); //$NON-NLS-1$ } /** * this method should return a i18n properties file location for - * translatable strings. - * {@inheritDoc} + * translatable strings. {@inheritDoc} */ public ResourceBundle getI18nResourceBundle() { return ResourceBundle.getBundle(BUNDLE); diff --git a/org.eclipse.jubula.examples.extension.swing.feature/.gitignore b/org.eclipse.jubula.examples.extension.swing.feature/.gitignore new file mode 100644 index 000000000..64af1f50f --- /dev/null +++ b/org.eclipse.jubula.examples.extension.swing.feature/.gitignore @@ -0,0 +1,3 @@ +/build +/bin +/target diff --git a/org.eclipse.jubula.examples.extension.swing.feature/feature.xml b/org.eclipse.jubula.examples.extension.swing.feature/feature.xml index bb4f2d803..b10d8446c 100644 --- a/org.eclipse.jubula.examples.extension.swing.feature/feature.xml +++ b/org.eclipse.jubula.examples.extension.swing.feature/feature.xml @@ -30,5 +30,12 @@ BREDEX GmbH - initial API and implementation and/or initial documentation install-size="0" version="0.0.0" unpack="false"/> + + <fragment + id="org.eclipse.jubula.examples.extension.swing.rc" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> </feature> diff --git a/org.eclipse.jubula.examples.extension.swing.rc.adapter/.project b/org.eclipse.jubula.examples.extension.swing.rc.adapter/.project deleted file mode 100644 index fd3c193f9..000000000 --- a/org.eclipse.jubula.examples.extension.swing.rc.adapter/.project +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.jubula.examples.extension.swing.rc.adapter</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/org.eclipse.jubula.examples.extension.swing.rc.adapter/bin/org/eclipse/jubula/rc/common/adapter/ComponentToStringAdapter.class b/org.eclipse.jubula.examples.extension.swing.rc.adapter/bin/org/eclipse/jubula/rc/common/adapter/ComponentToStringAdapter.class Binary files differdeleted file mode 100644 index 6de9c3761..000000000 --- a/org.eclipse.jubula.examples.extension.swing.rc.adapter/bin/org/eclipse/jubula/rc/common/adapter/ComponentToStringAdapter.class +++ /dev/null diff --git a/org.eclipse.jubula.examples.extension.swing.rc.adapter/bin/org/eclipse/jubula/rc/common/adapter/SwingAdapterFactory.class b/org.eclipse.jubula.examples.extension.swing.rc.adapter/bin/org/eclipse/jubula/rc/common/adapter/SwingAdapterFactory.class Binary files differdeleted file mode 100644 index 1a1bd2817..000000000 --- a/org.eclipse.jubula.examples.extension.swing.rc.adapter/bin/org/eclipse/jubula/rc/common/adapter/SwingAdapterFactory.class +++ /dev/null diff --git a/org.eclipse.jubula.examples.extension.swing.rc.adapter/.classpath b/org.eclipse.jubula.examples.extension.swing.rc.renderer/.classpath index 9e4492d61..5e4c1fe99 100644 --- a/org.eclipse.jubula.examples.extension.swing.rc.adapter/.classpath +++ b/org.eclipse.jubula.examples.extension.swing.rc.renderer/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.jubula.rc.common"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/org.eclipse.jubula.examples.extension.swing.rc.renderer/.gitignore b/org.eclipse.jubula.examples.extension.swing.rc.renderer/.gitignore new file mode 100644 index 000000000..64af1f50f --- /dev/null +++ b/org.eclipse.jubula.examples.extension.swing.rc.renderer/.gitignore @@ -0,0 +1,3 @@ +/build +/bin +/target diff --git a/org.eclipse.jubula.examples.extension.swing.rc.renderer/.project b/org.eclipse.jubula.examples.extension.swing.rc.renderer/.project new file mode 100644 index 000000000..7363ad22d --- /dev/null +++ b/org.eclipse.jubula.examples.extension.swing.rc.renderer/.project @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.jubula.examples.extension.swing.rc.renderer</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>net.sf.eclipsecs.core.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + </natures> +</projectDescription> diff --git a/org.eclipse.jubula.examples.extension.swing.rc.adapter/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jubula.examples.extension.swing.rc.renderer/.settings/org.eclipse.jdt.core.prefs index b9dbedb54..b9dbedb54 100644 --- a/org.eclipse.jubula.examples.extension.swing.rc.adapter/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jubula.examples.extension.swing.rc.renderer/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.jubula.examples.extension.swing.rc.renderer/META-INF/MANIFEST.MF b/org.eclipse.jubula.examples.extension.swing.rc.renderer/META-INF/MANIFEST.MF new file mode 100644 index 000000000..966d8b4c7 --- /dev/null +++ b/org.eclipse.jubula.examples.extension.swing.rc.renderer/META-INF/MANIFEST.MF @@ -0,0 +1,7 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: org.eclipse.jubula.examples.extension.swing.rc.adapter +Bundle-SymbolicName: org.eclipse.jubula.examples.extension.swing.rc.renderer;singleton:=true +Bundle-Version: 2.0.0.qualifier +Fragment-Host: org.eclipse.jubula.rc.swing +Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/org.eclipse.jubula.examples.extension.swing.rc.adapter/src/org/eclipse/jubula/rc/common/adapter/ComponentToStringAdapter.java b/org.eclipse.jubula.examples.extension.swing.rc.renderer/src/org/eclipse/jubula/rc/common/adapter/ComponentToStringAdapter.java index 2c700be0c..2c700be0c 100644 --- a/org.eclipse.jubula.examples.extension.swing.rc.adapter/src/org/eclipse/jubula/rc/common/adapter/ComponentToStringAdapter.java +++ b/org.eclipse.jubula.examples.extension.swing.rc.renderer/src/org/eclipse/jubula/rc/common/adapter/ComponentToStringAdapter.java diff --git a/org.eclipse.jubula.examples.extension.swing.rc.adapter/src/org/eclipse/jubula/rc/common/adapter/SwingAdapterFactory.java b/org.eclipse.jubula.examples.extension.swing.rc.renderer/src/org/eclipse/jubula/rc/common/adapter/SwingAdapterFactory.java index 7b3a08368..680487b21 100644 --- a/org.eclipse.jubula.examples.extension.swing.rc.adapter/src/org/eclipse/jubula/rc/common/adapter/SwingAdapterFactory.java +++ b/org.eclipse.jubula.examples.extension.swing.rc.renderer/src/org/eclipse/jubula/rc/common/adapter/SwingAdapterFactory.java @@ -15,17 +15,18 @@ import java.awt.Component; import org.eclipse.jubula.rc.common.adaptable.IAdapterFactory; /** - * Example Swing Adapter Factory + * Example Swing Adapter Factory */ public class SwingAdapterFactory implements IAdapterFactory { /** * a list of supported renderer classes to adapt */ - private static final Class[] supportedRendererClasses = new Class[] { Component.class }; + private static final Class[] SUPPORTED_RENDERER_CLASSES = + new Class[] { Component.class }; /** {@inheritDoc} */ public Class[] getSupportedClasses() { - return supportedRendererClasses; + return SUPPORTED_RENDERER_CLASSES; } /** {@inheritDoc} */ diff --git a/org.eclipse.jubula.examples.extension.swing.rc/.classpath b/org.eclipse.jubula.examples.extension.swing.rc/.classpath index f6bc64d21..5e4c1fe99 100644 --- a/org.eclipse.jubula.examples.extension.swing.rc/.classpath +++ b/org.eclipse.jubula.examples.extension.swing.rc/.classpath @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> - <classpathentry kind="lib" path="lib/org.eclipse.jubula.tools.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> - <classpathentry kind="lib" path="lib/org.eclipse.jubula.rc.common.jar"/> - <classpathentry kind="lib" path="lib/org.eclipse.jubula.rc.swing.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/org.eclipse.jubula.examples.extension.swing.rc/.project b/org.eclipse.jubula.examples.extension.swing.rc/.project index 32e4d6b46..2057e6a3e 100644 --- a/org.eclipse.jubula.examples.extension.swing.rc/.project +++ b/org.eclipse.jubula.examples.extension.swing.rc/.project @@ -11,12 +11,23 @@ </arguments> </buildCommand> <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> <name>net.sf.eclipsecs.core.CheckstyleBuilder</name> <arguments> </arguments> </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> </natures> diff --git a/org.eclipse.jubula.examples.extension.swing.rc/build.properties b/org.eclipse.jubula.examples.extension.swing.rc/build.properties index 867b936fb..f85b6a4bf 100644 --- a/org.eclipse.jubula.examples.extension.swing.rc/build.properties +++ b/org.eclipse.jubula.examples.extension.swing.rc/build.properties @@ -8,5 +8,4 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ - .,\ - fragment.xml + . diff --git a/org.eclipse.jubula.examples.extension.swing.rc/fragment.xml b/org.eclipse.jubula.examples.extension.swing.rc/fragment.xml deleted file mode 100644 index 01ebd15f8..000000000 --- a/org.eclipse.jubula.examples.extension.swing.rc/fragment.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.4"?> -<!-- - Copyright (c) 2012 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 - --> -<fragment> - <extension - point="org.eclipse.ui.startup"> - <startup - class="FragmentStarterClass"> - </startup> - </extension> - -</fragment> diff --git a/org.eclipse.jubula.examples.extension.swing.rc/lib/.gitignore b/org.eclipse.jubula.examples.extension.swing.rc/lib/.gitignore deleted file mode 100644 index cffe35690..000000000 --- a/org.eclipse.jubula.examples.extension.swing.rc/lib/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/org.eclipse.jubula.rc.common.jar -/org.eclipse.jubula.rc.swing.jar -/org.eclipse.jubula.tools.jar diff --git a/org.eclipse.jubula.examples.extension.swing.rc/lib/.keep b/org.eclipse.jubula.examples.extension.swing.rc/lib/.keep deleted file mode 100644 index e69de29bb..000000000 --- a/org.eclipse.jubula.examples.extension.swing.rc/lib/.keep +++ /dev/null diff --git a/org.eclipse.jubula.examples.extension.swing.rc/pom.xml b/org.eclipse.jubula.examples.extension.swing.rc/pom.xml deleted file mode 100644 index 3cdca5eeb..000000000 --- a/org.eclipse.jubula.examples.extension.swing.rc/pom.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>org.eclipse.jubula.releng.client</artifactId> - <groupId>org.eclipse.jubula</groupId> - <version>2.0.0-SNAPSHOT</version> - <relativePath>../org.eclipse.jubula.releng.client</relativePath> - </parent> - <groupId>org.eclipse.jubula</groupId> - <artifactId>org.eclipse.jubula.examples.extension.swing.rc</artifactId> - <version>2.0.0-SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-maven-plugin</artifactId> - <version>${tycho-version}</version> - <extensions>true</extensions> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <version>${tycho-version}</version> - <configuration> - <resolver>p2</resolver> - <pomDependencies>consider</pomDependencies> - <target> - <artifact> - <groupId>${project.groupId}</groupId> - <artifactId>${project.artifactId}</artifactId> - <version>${project.version}</version> - <classifier>../org.eclipse.jubula.project.configuration/target/definitions/indigo+nightly</classifier> - </artifact> - </target> - <environments> - <environment> - <os>win32</os> - <ws>win32</ws> - <arch>x86</arch> - </environment> - <environment> - <os>win32</os> - <ws>win32</ws> - <arch>x86_64</arch> - </environment> - <environment> - <os>linux</os> - <ws>gtk</ws> - <arch>x86_64</arch> - </environment> - <environment> - <os>linux</os> - <ws>gtk</ws> - <arch>x86</arch> - </environment> - <environment> - <os>macosx</os> - <ws>cocoa</ws> - <arch>x86_64</arch> - </environment> - </environments> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/org.eclipse.jubula.examples.extension.swing.rc/src/org/eclipse/jubula/rc/common/adapter/ExtensionAdapterFactory.java b/org.eclipse.jubula.examples.extension.swing.rc/src/org/eclipse/jubula/rc/common/adapter/SwingExtensionExampleAdapterFactory.java index 097be1b22..8754ae951 100644 --- a/org.eclipse.jubula.examples.extension.swing.rc/src/org/eclipse/jubula/rc/common/adapter/ExtensionAdapterFactory.java +++ b/org.eclipse.jubula.examples.extension.swing.rc/src/org/eclipse/jubula/rc/common/adapter/SwingExtensionExampleAdapterFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 BREDEX GmbH. + * Copyright (c) 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 @@ -13,34 +13,28 @@ package org.eclipse.jubula.rc.common.adapter; import javax.swing.JSlider; import org.eclipse.jubula.rc.common.adaptable.IAdapterFactory; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IComponentAdapter; -import org.eclipse.jubula.rc.swing.tester.JSliderAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IComponent; +import org.eclipse.jubula.rc.swing.tester.adapter.JComponentAdapter; + /** - * Adapterfactory for new adapters. - * This class makes your new adapters usable for testing. - * One factory could be used for all adapters implemented. + * Adapter Factory for new adapters. This class makes your new adapters usable + * for testing. One factory could be used for all adapters implemented. + * * @author BREDEX GmbH - * */ -public class ExtensionAdapterFactory implements IAdapterFactory { - - /** - * {@inheritDoc} - */ +public class SwingExtensionExampleAdapterFactory implements IAdapterFactory { + /** {@inheritDoc} */ public Class[] getSupportedClasses() { return new Class[] { JSlider.class }; } - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ public Object getAdapter(Class targetedClass, Object objectToAdapt) { - if (targetedClass.isAssignableFrom(IComponentAdapter.class)) { + if (targetedClass.isAssignableFrom(IComponent.class)) { if (objectToAdapt instanceof JSlider) { - return new JSliderAdapter(objectToAdapt); + return new JComponentAdapter(objectToAdapt); } } return null; } - } diff --git a/org.eclipse.jubula.examples.extension.swing.rc/src/org/eclipse/jubula/rc/swing/tester/JSliderAdapter.java b/org.eclipse.jubula.examples.extension.swing.rc/src/org/eclipse/jubula/rc/swing/tester/JSliderAdapter.java deleted file mode 100644 index 217f92caf..000000000 --- a/org.eclipse.jubula.examples.extension.swing.rc/src/org/eclipse/jubula/rc/swing/tester/JSliderAdapter.java +++ /dev/null @@ -1,37 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012 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 - *******************************************************************************/ -package org.eclipse.jubula.rc.swing.tester; - -import org.eclipse.jubula.rc.swing.tester.adapter.WidgetAdapter; -/** - * This is a adapter which wraps the graphics component (in this case the JSlider) - * into a general form. This is needed for the TesterClasses which use the adapter - * instead of the real graphics component. - * - * In Swing we could extend the <code>WidgetAdapter</code> because all parents from - * Swing types are from type <code>JComponent</code>. - * - * @author BREDEX GmbH - * - */ -public class JSliderAdapter extends WidgetAdapter { - - /** - * This constructor uses his super constructor since we use an - * existing adapter. - * @param objectToAdapt the graphics component - */ - public JSliderAdapter(Object objectToAdapt) { - super(objectToAdapt); - - } - -} diff --git a/org.eclipse.jubula.examples.extension.swing.rc/src/org/eclipse/jubula/rc/swing/tester/JSliderTester.java b/org.eclipse.jubula.examples.extension.swing.rc/src/org/eclipse/jubula/rc/swing/tester/JSliderTester.java index 3a0e672b1..e9b901e00 100644 --- a/org.eclipse.jubula.examples.extension.swing.rc/src/org/eclipse/jubula/rc/swing/tester/JSliderTester.java +++ b/org.eclipse.jubula.examples.extension.swing.rc/src/org/eclipse/jubula/rc/swing/tester/JSliderTester.java @@ -11,19 +11,19 @@ package org.eclipse.jubula.rc.swing.tester; import org.eclipse.jubula.rc.common.tester.WidgetTester; + /** - * Tester Class for the AutStarter. This class realizes the technical access to + * Tester Class for the AUT-Agent. This class realizes the technical access to * provide testability for new component type: JSlider. By implementing the - * class "WidgetTester" you have nothing to implement to enable testability - * of your new component on the "Graphics Component"-level. - * That means all actions which are available for - * the Jubula "Graphics Component" should work for your new component. + * class "WidgetTester" you have nothing to implement to enable testability of + * your new component on the "Graphics Component"-level. That means all actions + * which are available for the "Graphics Component" should work for your new + * component. * * @author BREDEX GmbH * */ public class JSliderTester extends WidgetTester { - /** * this could really be empty if you only want to support JSlider as an * graphics component. diff --git a/org.eclipse.jubula.examples.extension.swing.toolkit/.project b/org.eclipse.jubula.examples.extension.swing.toolkit/.project index bebadc906..674bb2f2c 100644 --- a/org.eclipse.jubula.examples.extension.swing.toolkit/.project +++ b/org.eclipse.jubula.examples.extension.swing.toolkit/.project @@ -20,10 +20,16 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>net.sf.eclipsecs.core.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> </natures> <linkedResources> <link> diff --git a/org.eclipse.jubula.examples.extension.swing.toolkit/pom.xml b/org.eclipse.jubula.examples.extension.swing.toolkit/pom.xml deleted file mode 100644 index 315380198..000000000 --- a/org.eclipse.jubula.examples.extension.swing.toolkit/pom.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>org.eclipse.jubula.releng.client</artifactId> - <groupId>org.eclipse.jubula</groupId> - <version>2.0.0-SNAPSHOT</version> - <relativePath>../org.eclipse.jubula.releng.client</relativePath> - </parent> - <groupId>org.eclipse.jubula</groupId> - <artifactId>org.eclipse.jubula.examples.extension.swing.toolkit</artifactId> - <version>2.0.0-SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-maven-plugin</artifactId> - <version>${tycho-version}</version> - <extensions>true</extensions> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <version>${tycho-version}</version> - <configuration> - <resolver>p2</resolver> - <pomDependencies>consider</pomDependencies> - <target> - <artifact> - <groupId>${project.groupId}</groupId> - <artifactId>${project.artifactId}</artifactId> - <version>${project.version}</version> - <classifier>../org.eclipse.jubula.project.configuration/target/definitions/indigo+nightly</classifier> - </artifact> - </target> - <environments> - <environment> - <os>win32</os> - <ws>win32</ws> - <arch>x86</arch> - </environment> - <environment> - <os>win32</os> - <ws>win32</ws> - <arch>x86_64</arch> - </environment> - <environment> - <os>linux</os> - <ws>gtk</ws> - <arch>x86_64</arch> - </environment> - <environment> - <os>linux</os> - <ws>gtk</ws> - <arch>x86</arch> - </environment> - <environment> - <os>macosx</os> - <ws>cocoa</ws> - <arch>x86_64</arch> - </environment> - </environments> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/org.eclipse.jubula.examples.extension.swing.toolkit/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.examples.extension.swing.toolkit/resources/xml/ComponentConfiguration.xml index 1909c11fd..31e5e6526 100644 --- a/org.eclipse.jubula.examples.extension.swing.toolkit/resources/xml/ComponentConfiguration.xml +++ b/org.eclipse.jubula.examples.extension.swing.toolkit/resources/xml/ComponentConfiguration.xml @@ -9,14 +9,12 @@ <!-- 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="ComponentConfiguration.xsd">
+<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>
<minorVersion>36</minorVersion>
</configVersion>
- <!-- Concrete components -->
-
<toolkitComponent type="javax.swing.JSlider" visible="true">
<realizes>guidancer.abstract.Widget</realizes>
<testerClass>org.eclipse.jubula.rc.swing.tester.JSliderTester</testerClass>
diff --git a/org.eclipse.jubula.examples.extension.swing.toolkit/resources/xml/ComponentConfiguration.xsd b/org.eclipse.jubula.examples.extension.swing.toolkit/resources/xml/ComponentConfiguration.xsd deleted file mode 100644 index ba64a8543..000000000 --- a/org.eclipse.jubula.examples.extension.swing.toolkit/resources/xml/ComponentConfiguration.xsd +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-<xs:include schemaLocation="../../../ToolkitSupportPlugin/resources/xml/ToolkitComponentConfiguration.xsd"/>
-
-</xs:schema>
diff --git a/org.eclipse.jubula.examples.extension.swing.toolkit/src/org/eclipse/jubula/examples/extension/swing/toolkit/provider/MyToolkitProvider.java b/org.eclipse.jubula.examples.extension.swing.toolkit/src/org/eclipse/jubula/examples/extension/swing/toolkit/provider/MyToolkitProvider.java index 3469e9508..a97bb0b18 100644 --- a/org.eclipse.jubula.examples.extension.swing.toolkit/src/org/eclipse/jubula/examples/extension/swing/toolkit/provider/MyToolkitProvider.java +++ b/org.eclipse.jubula.examples.extension.swing.toolkit/src/org/eclipse/jubula/examples/extension/swing/toolkit/provider/MyToolkitProvider.java @@ -36,7 +36,7 @@ public class MyToolkitProvider implements IToolKitProvider { public static final String BUNDLE = "org.eclipse.jubula.examples.extension.swing.toolkit.i18n.i18n"; //$NON-NLS-1$ /** - * As this should be a toolkit extension instead of a seperated toolkit, you + * As this should be a toolkit extension instead of a separated toolkit, you * do not have to implement your own AUT-Configuration dialog. {@inheritDoc} */ public Composite getAutConfigDialog(Composite arg0, int arg1, diff --git a/org.eclipse.jubula.examples/buildScript.xml b/org.eclipse.jubula.examples/buildScript.xml index bed31de82..001bca034 100644 --- a/org.eclipse.jubula.examples/buildScript.xml +++ b/org.eclipse.jubula.examples/buildScript.xml @@ -23,12 +23,17 @@ <property name="Meters" value="com.bredexsw.guidancer.examples.aut.meters"/> <property name="GEFExample" value="com.bredexsw.guidancer.examples.aut.gef"/> - <property name="ExampleSwingExtensionClient" value="org.eclipse.jubula.examples.extension.swing.toolkit"/> - <property name="ExampleSwingExtensionFeature" value="org.eclipse.jubula.examples.extension.swing.feature"/> - <property name="ExampleSwingExtensionServer" value="org.eclipse.jubula.examples.extension.swing.rc"/> - <property name="ExampleSwingExtensionAUT" value="org.eclipse.jubula.examples.extension.swing.aut"/> + <property name="ExampleSwingExtensionAUT" value="org.eclipse.jubula.examples.extension.swing.aut"/> + <property name="ExampleSwingExtensionClient" value="org.eclipse.jubula.examples.extension.swing.toolkit"/> + <property name="ExampleSwingExtensionRC" value="org.eclipse.jubula.examples.extension.swing.rc"/> + <property name="ExampleSwingExtensionFeature" value="org.eclipse.jubula.examples.extension.swing.feature"/> - <property name="ExampleGEFIdentifierExample" value="org.eclipse.jubula.examples.extension.rcp.gef.logic.identifier"/> + <property name="ExampleRCPExtensionClient" value="org.eclipse.jubula.examples.extension.rcp.toolkit"/> + <property name="ExampleRCPExtensionRC" value="org.eclipse.jubula.examples.extension.rcp.rc"/> + <property name="ExampleRCPExtensionFeature" value="org.eclipse.jubula.examples.extension.rcp.feature"/> + + <property name="ExampleSwingRendererAdapterRC" value="org.eclipse.jubula.examples.extension.swing.rc.renderer"/> + <property name="ExampleGEFIdentifierExample" value="org.eclipse.jubula.examples.extension.rcp.gef.logic.identifier"/> <target name="build" depends="clean, createDirStructure, @@ -122,7 +127,6 @@ <ant dir="../${DvdTool}" antfile="buildScript.xml" target="clean" inheritAll="false" /> <ant dir="../${guidancerWS}/${Meters}" antfile="buildScript.xml" target="clean" inheritAll="false" /> <ant dir="../${guidancerWS}/${GEFExample}" antfile="buildScript.xml" target="clean" inheritAll="false" /> - <ant dir="../${ExampleSwingExtensionAUT}" antfile="buildScript.xml" target="clean" inheritAll="false" /> </target> <target name="markAsExecutable"> @@ -149,29 +153,7 @@ </copy> </target> - <target name="releaseExampleSwingServerExtension"> - <copy todir="../${ExampleSwingExtensionServer}/lib" overwrite="true"> - <fileset file="${release}/server/plugins/org.eclipse.jubula.rc.common_*.jar"/> - <mapper type="merge" to="org.eclipse.jubula.rc.common.jar"/> - </copy> - <copy todir="../${ExampleSwingExtensionServer}/lib" overwrite="true"> - <fileset file="${release}/server/plugins/org.eclipse.jubula.rc.swing_*.jar"/> - <mapper type="merge" to="org.eclipse.jubula.rc.swing.jar"/> - </copy> - <copy todir="../${ExampleSwingExtensionServer}/lib" overwrite="true"> - <fileset dir="${release}/server/plugins/"> - <include name="org.eclipse.jubula.tools_*.jar"/> - </fileset> - <mapper type="merge" to="org.eclipse.jubula.tools.jar"/> - </copy> - - <mkdir dir="${examples.development.dir}/extension/bin"/> - <copy todir="${examples.development.dir}/extension/bin"> - <fileset dir="../${ExampleSwingExtensionServer}/target" includes="*.jar"/> - </copy> - </target> - - <target name="releaseDevelopment" depends="releaseExampleSwingExtensionAUT, releaseExampleSwingServerExtension"> + <target name="releaseDevelopment" depends="releaseExampleSwingExtensionAUT"> <mkdir dir="${examples.development.dir}/gef"/> <zip destfile="${examples.development.dir}/gef/${ExampleGEFIdentifierExample}.zip"> <zipfileset dir="../${ExampleGEFIdentifierExample}" prefix="${ExampleGEFIdentifierExample}"/> @@ -180,13 +162,22 @@ <mkdir dir="${examples.development.dir}/extension"/> <property name="extensionSourceDir" value="${examples.development.dir}/extension/src"/> <mkdir dir="${extensionSourceDir}"/> - <zip destfile="${extensionSourceDir}/eclipseProjects_ExampleSwingClientExtension.zip"> + <zip destfile="${extensionSourceDir}/eclipseProjects_ExampleSwingExtension.zip"> <zipfileset dir="../${ExampleSwingExtensionClient}" prefix="${ExampleSwingExtensionClient}" excludes="build, build/**, target, target/**, buildScript.xml, pom.xml"/> - <zipfileset dir="../${ExampleSwingExtensionFeature}" prefix="${ExampleSwingExtensionFeature}" excludes="build, build/**, target, target/**, buildScript.xml, pom.xml"/> + <zipfileset dir="../${ExampleSwingExtensionRC}" prefix="${ExampleSwingExtensionRC}" excludes="build, build/**, target, target/**, buildScript.xml, pom.xml"/> + <zipfileset dir="../${ExampleSwingExtensionFeature}" prefix="${ExampleSwingExtensionFeature}" excludes="build, build/**, target, target/**, buildScript.xml, pom.xml"/> + </zip> + + <zip destfile="${extensionSourceDir}/eclipseProjects_ExampleRCPExtension.zip"> + <zipfileset dir="../${ExampleRCPExtensionClient}" prefix="${ExampleRCPExtensionClient}" excludes="build, build/**, target, target/**, buildScript.xml, pom.xml"/> + <zipfileset dir="../${ExampleRCPExtensionRC}" prefix="${ExampleRCPExtensionRC}" excludes="build, build/**, target, target/**, buildScript.xml, pom.xml"/> + <zipfileset dir="../${ExampleRCPExtensionFeature}" prefix="${ExampleRCPExtensionFeature}" excludes="build, build/**, target, target/**, buildScript.xml, pom.xml"/> </zip> - <zip destfile="${extensionSourceDir}/eclipseProjects_ExampleSwingServerExtension.zip"> - <zipfileset dir="../${ExampleSwingExtensionServer}" prefix="${ExampleSwingExtensionServer}" excludes="build, build/**, target, target/**, buildScript.xml, pom.xml"/> + + <zip destfile="${extensionSourceDir}/eclipseProjects_ExampleSwingRendererExtension.zip"> + <zipfileset dir="../${ExampleSwingRendererAdapterRC}" prefix="${ExampleSwingRendererAdapterRC}" excludes="build, build/**, target, target/**, buildScript.xml, pom.xml"/> </zip> + <zip destfile="${extensionSourceDir}/eclipseProjects_ExampleSwingAUT.zip"> <zipfileset dir="../${ExampleSwingExtensionAUT}" prefix="${ExampleSwingExtensionAUT}" /> </zip> diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/AbstractMenuTester.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/AbstractMenuTester.java index 33ba0b4d1..cc6750cd7 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/AbstractMenuTester.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/AbstractMenuTester.java @@ -17,8 +17,8 @@ import org.eclipse.jubula.rc.common.driver.ClickOptions; import org.eclipse.jubula.rc.common.driver.RobotTiming; import org.eclipse.jubula.rc.common.exception.StepExecutionException; import org.eclipse.jubula.rc.common.logger.AutServerLogger; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuAdapter; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuItemAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuComponent; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuItemComponent; import org.eclipse.jubula.rc.common.util.MatchUtil; import org.eclipse.jubula.rc.common.util.MenuUtilBase; import org.eclipse.jubula.rc.common.util.Verifier; @@ -52,8 +52,8 @@ public abstract class AbstractMenuTester extends AbstractUITester { * It is saved as Component so it must be casted. * @return the MenuAdapter */ - public IMenuAdapter getMenuAdapter() { - return (IMenuAdapter) getComponent(); + public IMenuComponent getMenuAdapter() { + return (IMenuComponent) getComponent(); } /** * Checks if the specified menu item is enabled. @@ -77,7 +77,7 @@ public abstract class AbstractMenuTester extends AbstractUITester { public void verifyEnabled(String[] menuItem, String operator, boolean enabled) { checkPathLength(menuItem.length); - final IMenuItemAdapter item = navigateToMenuItem( + final IMenuItemComponent item = navigateToMenuItem( getAndCheckMenu(), menuItem, operator); checkIsNull(item); try { @@ -92,7 +92,7 @@ public abstract class AbstractMenuTester extends AbstractUITester { * * @param item the MenuItemAdapter which should be checked */ - private void checkIsNull(final IMenuItemAdapter item) { + private void checkIsNull(final IMenuItemComponent item) { if (item.getRealComponent() == null) { throwMenuItemNotFound(); } @@ -117,7 +117,7 @@ public abstract class AbstractMenuTester extends AbstractUITester { */ public void verifyEnabledByIndexpath(int[] menuItem, boolean enabled) { checkPathLength(menuItem.length); - final IMenuItemAdapter item = navigateToMenuItem( + final IMenuItemComponent item = navigateToMenuItem( getAndCheckMenu(), menuItem); checkIsNull(item); try { @@ -150,7 +150,7 @@ public abstract class AbstractMenuTester extends AbstractUITester { public void verifyExists(String[] menuItem, String operator, boolean exists) { checkPathLength(menuItem.length); - final IMenuItemAdapter item = navigateToMenuItem( + final IMenuItemComponent item = navigateToMenuItem( getAndCheckMenu(), menuItem, operator); try { Verifier.equals(exists, item.isExisting()); @@ -176,7 +176,7 @@ public abstract class AbstractMenuTester extends AbstractUITester { */ public void verifyExistsByIndexpath(int[] menuItem, boolean exists) { checkPathLength(menuItem.length); - final IMenuItemAdapter item = navigateToMenuItem( + final IMenuItemComponent item = navigateToMenuItem( getAndCheckMenu(), menuItem); try { Verifier.equals(exists, item.isExisting()); @@ -207,7 +207,7 @@ public abstract class AbstractMenuTester extends AbstractUITester { public void verifySelected(String[] menuItem, String operator, boolean selected) { checkPathLength(menuItem.length); - final IMenuItemAdapter item = navigateToMenuItem( + final IMenuItemComponent item = navigateToMenuItem( getAndCheckMenu(), menuItem, operator); checkIsNull(item); try { @@ -237,7 +237,7 @@ public abstract class AbstractMenuTester extends AbstractUITester { */ public void verifySelectedByIndexpath(int[] menuItem, boolean selected) { checkPathLength(menuItem.length); - final IMenuItemAdapter item = navigateToMenuItem( + final IMenuItemComponent item = navigateToMenuItem( getAndCheckMenu(), menuItem); checkIsNull(item); try { @@ -257,7 +257,7 @@ public abstract class AbstractMenuTester extends AbstractUITester { checkPathLength(indexItems.length); try { - final IMenuItemAdapter item = navigateToMenuItem( + final IMenuItemComponent item = navigateToMenuItem( getAndCheckMenu(), indexItems); checkIsNull(item); @@ -289,7 +289,7 @@ public abstract class AbstractMenuTester extends AbstractUITester { throw new StepExecutionException("empty path to menuitem not allowed", //$NON-NLS-1$ EventFactory.createActionError()); } - IMenuItemAdapter item = navigateToMenuItem(getAndCheckMenu(), + IMenuItemComponent item = navigateToMenuItem(getAndCheckMenu(), menuItems, operator); if (item == null) { try { @@ -312,7 +312,7 @@ public abstract class AbstractMenuTester extends AbstractUITester { * @throws StepExecutionException * if the active window has no menu bar. */ - protected IMenuAdapter getAndCheckMenu() throws StepExecutionException { + protected IMenuComponent getAndCheckMenu() throws StepExecutionException { Object menu = getMenuAdapter().getRealComponent(); // Verify that the active window has a menu bar if (menu == null) { @@ -340,9 +340,9 @@ public abstract class AbstractMenuTester extends AbstractUITester { * @param textPath the text path used for opening the menu * @param operator the operator which was used for opening the menu */ - protected void closeMenu(IMenuAdapter menuBar, String[] textPath, + protected void closeMenu(IMenuComponent menuBar, String[] textPath, String operator) { - IMenuItemAdapter menuitem = findMenu(menuBar, + IMenuItemComponent menuitem = findMenu(menuBar, getIndexForName(menuBar, textPath[0], operator)); if (menuitem.getRealComponent() != null) { getRobot().click( @@ -361,8 +361,8 @@ public abstract class AbstractMenuTester extends AbstractUITester { * @param menuBar the main menu * @param path the integer based path used for opening the menu */ - protected void closeMenu(IMenuAdapter menuBar, int[] path) { - IMenuItemAdapter menuitem = findMenu(menuBar, path[0]); + protected void closeMenu(IMenuComponent menuBar, int[] path) { + IMenuItemComponent menuitem = findMenu(menuBar, path[0]); if (menuitem.getRealComponent() != null) { getRobot().click( menuitem.getRealComponent(), @@ -381,12 +381,12 @@ public abstract class AbstractMenuTester extends AbstractUITester { * @param operator the operator for the matching * @return the index for the specific menu entry */ - protected int getIndexForName(IMenuAdapter menu, String name, + protected int getIndexForName(IMenuComponent menu, String name, String operator) { - IMenuItemAdapter [] subElements = menu.getItems(); + IMenuItemComponent [] subElements = menu.getItems(); int downcount = 0; for (int j = 0; j < subElements.length; j++) { - IMenuItemAdapter tempMenu = (IMenuItemAdapter)subElements[j]; + IMenuItemComponent tempMenu = (IMenuItemComponent)subElements[j]; if (tempMenu.isSeparator()) { downcount++; } @@ -429,11 +429,11 @@ public abstract class AbstractMenuTester extends AbstractUITester { * @param operator operator used for matching * @return the adapter at the end of the specified path or a adapter that contains no component. */ - protected IMenuItemAdapter navigateToMenuItem( - IMenuAdapter menuBar, String[] path, String operator) { + protected IMenuItemComponent navigateToMenuItem( + IMenuComponent menuBar, String[] path, String operator) { checkPathLength(path.length); - IMenuAdapter currentmenu = menuBar; - IMenuItemAdapter currentMenuItem = null; + IMenuComponent currentmenu = menuBar; + IMenuItemComponent currentMenuItem = null; final int pathLength = path.length; final int beforeLast = pathLength - 1; @@ -465,12 +465,12 @@ public abstract class AbstractMenuTester extends AbstractUITester { * @param path the path where to navigate in the menu. * @return -the adapter at the end of the specified path or a adapter that contains no component. */ - protected IMenuItemAdapter navigateToMenuItem( - IMenuAdapter menubar, int[] path) { + protected IMenuItemComponent navigateToMenuItem( + IMenuComponent menubar, int[] path) { checkPathLength(path.length); - IMenuAdapter currentmenu = menubar; - IMenuItemAdapter currentMenuItem = null; + IMenuComponent currentmenu = menubar; + IMenuItemComponent currentMenuItem = null; final int pathLength = path.length; final int beforeLast = pathLength - 1; @@ -503,9 +503,9 @@ public abstract class AbstractMenuTester extends AbstractUITester { * @param pathIndex the index from the next menu item * @return the wanted menu item in a adapter */ - private IMenuItemAdapter getNextMenuItem(IMenuAdapter currentmenu, + private IMenuItemComponent getNextMenuItem(IMenuComponent currentmenu, final int pathIndex) { - IMenuItemAdapter currentMenuItem; + IMenuItemComponent currentMenuItem; if (pathIndex < 0) { throwInvalidPathException(); } @@ -518,13 +518,13 @@ public abstract class AbstractMenuTester extends AbstractUITester { * @param idx index of the current wanted item * @return the next IMenuItemAdapter from the next cascade */ - private IMenuItemAdapter findMenu(IMenuAdapter menu, int idx) { + private IMenuItemComponent findMenu(IMenuComponent menu, int idx) { List visibleSubMenus = new ArrayList(); - IMenuItemAdapter[] subElements = menu.getItems(); + IMenuItemComponent[] subElements = menu.getItems(); for (int i = 0; i < subElements.length; ++i) { - IMenuItemAdapter menuitem = subElements[i]; + IMenuItemComponent menuitem = subElements[i]; if (menuitem.getRealComponent() != null && !menuitem.isSeparator() && menuitem.isShowing()) { visibleSubMenus.add(menuitem); @@ -534,7 +534,7 @@ public abstract class AbstractMenuTester extends AbstractUITester { if (idx >= visibleSubMenus.size() || idx < 0) { return newMenuItemAdapter(null); } - return (IMenuItemAdapter) visibleSubMenus.get(idx); + return (IMenuItemComponent) visibleSubMenus.get(idx); } /** @@ -562,6 +562,6 @@ public abstract class AbstractMenuTester extends AbstractUITester { * @param component the new MenuItem which is used by the next step * @return the adapted or casted MenuItem */ - protected abstract IMenuItemAdapter newMenuItemAdapter(Object component); + protected abstract IMenuItemComponent newMenuItemAdapter(Object component); }
\ No newline at end of file diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/AbstractTableTester.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/AbstractTableTester.java index 299955bd4..8c8ba1a7e 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/AbstractTableTester.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/AbstractTableTester.java @@ -18,7 +18,7 @@ import org.eclipse.jubula.rc.common.driver.DragAndDropHelper; import org.eclipse.jubula.rc.common.exception.StepExecutionException; import org.eclipse.jubula.rc.common.implclasses.table.Cell; import org.eclipse.jubula.rc.common.logger.AutServerLogger; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITableAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITableComponent; import org.eclipse.jubula.rc.common.util.IndexConverter; import org.eclipse.jubula.rc.common.util.MatchUtil; import org.eclipse.jubula.rc.common.util.Verifier; @@ -56,8 +56,8 @@ public abstract class AbstractTableTester * * @return the ITableAdapter of this table */ - private ITableAdapter getTableAdapter() { - return (ITableAdapter) getComponent(); + private ITableComponent getTableAdapter() { + return (ITableComponent) getComponent(); } /** @@ -82,7 +82,7 @@ public abstract class AbstractTableTester */ public void rcVerifyText(String text, String operator) throws StepExecutionException { - ITableAdapter adapter = getTableAdapter(); + ITableComponent adapter = getTableAdapter(); Cell cell = adapter.getSelectedCell(); final int implRow = cell.getRow(); final int implCol = cell.getCol(); @@ -106,7 +106,7 @@ public abstract class AbstractTableTester public void rcVerifyText(String text, String operator, final String row, final String rowOperator, final String col, final String colOperator) throws StepExecutionException { - ITableAdapter adapter = getTableAdapter(); + ITableComponent adapter = getTableAdapter(); final int implRow = adapter.getRowFromString(row, rowOperator); final int implCol = adapter.getColumnFromString(col, colOperator); String current; @@ -144,7 +144,7 @@ public abstract class AbstractTableTester final int yPos, final String yUnits, final String extendSelection, int button) throws StepExecutionException { - ITableAdapter adapter = getTableAdapter(); + ITableComponent adapter = getTableAdapter(); final int implRow = adapter.getRowFromString(row, rowOperator); final int implCol = adapter.getColumnFromString(col, colOperator); final boolean isExtendSelection = extendSelection.equals( @@ -210,7 +210,7 @@ public abstract class AbstractTableTester final String colOperator, final String value, final String operator, final String searchType, boolean exists) throws StepExecutionException { - ITableAdapter adapter = getTableAdapter(); + ITableComponent adapter = getTableAdapter(); final int implCol = adapter.getColumnFromString(col, colOperator); @@ -229,7 +229,7 @@ public abstract class AbstractTableTester * @param searchType searchType Determines where the search begins ("relative" or "absolute") * @return <code>true</code> it the value exists in the column */ - private boolean isValueExisting(ITableAdapter adapter, int implCol, + private boolean isValueExisting(ITableComponent adapter, int implCol, String value, String operator, final String searchType) { final int rowCount = adapter.getRowCount(); for (int i = getStartingRowIndex(searchType); @@ -268,7 +268,7 @@ public abstract class AbstractTableTester final String value, final String operator, final String searchType, boolean exists) throws StepExecutionException { - final ITableAdapter adapter = getTableAdapter(); + final ITableComponent adapter = getTableAdapter(); final int implRow = adapter.getRowFromString(row, rowOperator); boolean valueIsExisting = false; //if row is header @@ -454,7 +454,7 @@ public abstract class AbstractTableTester protected void selectRowByValue(String col, String colOperator, final String value, final String regexOp, final String extendSelection, final String searchType, ClickOptions co) { - ITableAdapter adapter = getTableAdapter(); + ITableComponent adapter = getTableAdapter(); final int implCol = adapter.getColumnFromString(col, colOperator); Integer implRow = null; final int rowCount = adapter.getRowCount(); @@ -525,7 +525,7 @@ public abstract class AbstractTableTester protected void selectCellByColValue(String row, String rowOperator, final String value, final String regex, final String extendSelection, final String searchType, ClickOptions co) { - ITableAdapter adapter = getTableAdapter(); + ITableComponent adapter = getTableAdapter(); final int implRow = adapter.getRowFromString(row, rowOperator); int colCount = adapter.getColumnCount(); Integer implCol = null; @@ -575,7 +575,7 @@ public abstract class AbstractTableTester */ public String rcReadValue(String variable, String row, String rowOperator, String col, String colOperator) { - ITableAdapter adapter = getTableAdapter(); + ITableComponent adapter = getTableAdapter(); final int implRow = adapter.getRowFromString(row, rowOperator); final int implCol = adapter.getColumnFromString(col, colOperator); @@ -607,7 +607,7 @@ public abstract class AbstractTableTester * @param button The mouse button */ public void rcClick(int count, int button) { - ITableAdapter adapter = getTableAdapter(); + ITableComponent adapter = getTableAdapter(); Cell cell = null; if (isMouseOverCell()) { cell = getCellAtMousePosition(); @@ -965,7 +965,7 @@ public abstract class AbstractTableTester */ protected void checkRowColBounds(int row, int column) throws StepExecutionException { - ITableAdapter adapter = getTableAdapter(); + ITableComponent adapter = getTableAdapter(); checkBounds(row, adapter.getRowCount()); // Corner case: Only check the bounds if the table is not being @@ -1015,7 +1015,7 @@ public abstract class AbstractTableTester */ private void inputText(final String text, boolean replace) throws StepExecutionException { - ITableAdapter adapter = getTableAdapter(); + ITableComponent adapter = getTableAdapter(); final Cell cell = adapter.getSelectedCell(); // Ensure that the cell is visible. diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/AbstractTextComponentTester.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/AbstractTextComponentTester.java index b044f2a3a..6416efbc8 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/AbstractTextComponentTester.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/AbstractTextComponentTester.java @@ -13,7 +13,7 @@ package org.eclipse.jubula.rc.common.tester; import org.apache.commons.lang.StringUtils; import org.eclipse.jubula.rc.common.CompSystemConstants; import org.eclipse.jubula.rc.common.exception.StepExecutionException; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITextComponentAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITextInputComponent; import org.eclipse.jubula.rc.common.util.MatchUtil; import org.eclipse.jubula.rc.common.util.Verifier; import org.eclipse.jubula.tools.objects.event.EventFactory; @@ -31,8 +31,8 @@ public class AbstractTextComponentTester * Gets the specific adapter * @return the specific adapter */ - private ITextComponentAdapter getTextCompAdapter() { - return (ITextComponentAdapter) getComponent(); + private ITextInputComponent getTextCompAdapter() { + return (ITextInputComponent) getComponent(); } /** diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/AbstractTextVerifiableTester.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/AbstractTextVerifiableTester.java index ba7a056d7..e8cf47717 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/AbstractTextVerifiableTester.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/AbstractTextVerifiableTester.java @@ -11,7 +11,7 @@ package org.eclipse.jubula.rc.common.tester; import org.eclipse.jubula.rc.common.exception.StepExecutionException; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITextVerifiable; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITextComponent; import org.eclipse.jubula.rc.common.util.Verifier; /** @@ -30,7 +30,7 @@ public abstract class AbstractTextVerifiableTester extends WidgetTester { * @return the text value. */ public String rcReadValue(String variable) { - return ((ITextVerifiable)getComponent()).getText(); + return ((ITextComponent)getComponent()).getText(); } /** @@ -42,7 +42,7 @@ public abstract class AbstractTextVerifiableTester extends WidgetTester { */ public void rcVerifyText(String text, String operator) throws StepExecutionException { - Verifier.match(((ITextVerifiable)getComponent()).getText(), text, + Verifier.match(((ITextComponent)getComponent()).getText(), text, operator); } diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/AbstractTreeTester.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/AbstractTreeTester.java index 3edda2319..cc2c5b0bf 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/AbstractTreeTester.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/AbstractTreeTester.java @@ -31,7 +31,7 @@ import org.eclipse.jubula.rc.common.implclasses.tree.SiblingTraverser; import org.eclipse.jubula.rc.common.implclasses.tree.StringNodePath; import org.eclipse.jubula.rc.common.implclasses.tree.TreeNodeOperation; import org.eclipse.jubula.rc.common.implclasses.tree.TreeNodeOperationConstraint; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITreeAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITreeComponent; import org.eclipse.jubula.rc.common.util.IndexConverter; import org.eclipse.jubula.rc.common.util.MatchUtil; import org.eclipse.jubula.rc.common.util.Verifier; @@ -60,8 +60,8 @@ public abstract class AbstractTreeTester extends WidgetTester { * This method is only casting the IComponentAdapter to the wanted ITreeAdapter * @return The ITreeAdapter out of the stored IComponentAdapter */ - private ITreeAdapter getTreeAdapter() { - return (ITreeAdapter)getComponent(); + private ITreeComponent getTreeAdapter() { + return (ITreeComponent)getComponent(); } @@ -150,7 +150,7 @@ public abstract class AbstractTreeTester extends WidgetTester { Validate.notNull(treePath); Validate.notNull(operation); - ITreeAdapter adapter = getTreeAdapter(); + ITreeComponent adapter = getTreeAdapter(); AbstractTreeOperationContext context = adapter.getContext(); AbstractTreeNodeTraverser traverser = @@ -656,7 +656,7 @@ public abstract class AbstractTreeTester extends WidgetTester { protected Object getStartNode(String pathType, int preAscend, AbstractTreeOperationContext context) { Object startNode; - ITreeAdapter tree = getTreeAdapter(); + ITreeComponent tree = getTreeAdapter(); if (pathType.equals( CompSystemConstants.TREE_PATH_TYPE_RELATIVE)) { startNode = getSelectedNode(context); diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/AbstractUITester.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/AbstractUITester.java index 7b9f8e4f0..8f8c183d8 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/AbstractUITester.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/AbstractUITester.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 BREDEX GmbH. + * Copyright (c) 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 @@ -10,20 +10,18 @@ *******************************************************************************/ package org.eclipse.jubula.rc.common.tester; - import org.eclipse.jubula.rc.common.AUTServer; import org.eclipse.jubula.rc.common.adaptable.AdapterFactoryRegistry; import org.eclipse.jubula.rc.common.driver.IRobot; import org.eclipse.jubula.rc.common.driver.IRobotFactory; import org.eclipse.jubula.rc.common.exception.RobotException; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IComponentAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IComponent; import org.eclipse.jubula.rc.common.tester.interfaces.ITester; import org.eclipse.jubula.tools.constants.TestDataConstants; /** * Implementation of basic functions for all tester classes. This class * gives the basic functions which are needed for testing. * - * * @author BREDEX GmbH */ public abstract class AbstractUITester implements ITester { @@ -35,11 +33,11 @@ public abstract class AbstractUITester implements ITester { protected static final char INDEX_LIST_SEP_CHAR = TestDataConstants.VALUE_CHAR_DEFAULT; - /** */ + /** the robot factory */ private IRobotFactory m_robotFactory; - /** */ - private IComponentAdapter m_component; + /** the component adapter */ + private IComponent m_adapter; /** * Gets the Robot. @@ -54,7 +52,7 @@ public abstract class AbstractUITester implements ITester { * @return The Robot factory. */ protected IRobotFactory getRobotFactory() { - m_robotFactory = m_component.getRobotFactory(); + m_robotFactory = m_adapter.getRobotFactory(); return m_robotFactory; } @@ -63,17 +61,22 @@ public abstract class AbstractUITester implements ITester { */ public void setComponent(Object graphicsComponent) { AdapterFactoryRegistry afr = AdapterFactoryRegistry.getInstance(); - m_component = null; - m_component = (IComponentAdapter) afr.getAdapter( - IComponentAdapter.class, graphicsComponent); + m_adapter = null; + m_adapter = (IComponent) afr.getAdapter( + IComponent.class, graphicsComponent); } /** - * Getter for the stored GraphicalComponent - * @return gets the stored IComponentAdapter + * @return the adapted graphical component instance */ - public IComponentAdapter getComponent() { - return m_component; + public IComponent getComponent() { + return m_adapter; } + /** + * @return the "real" graphical component instance + */ + public Object getRealComponent() { + return m_adapter.getRealComponent(); + } }
\ No newline at end of file diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/ButtonTester.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/ButtonTester.java index eb1f05000..535ad54b4 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/ButtonTester.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/ButtonTester.java @@ -11,7 +11,7 @@ package org.eclipse.jubula.rc.common.tester; import org.eclipse.jubula.rc.common.exception.StepExecutionException; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IButtonAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IButtonComponent; import org.eclipse.jubula.rc.common.util.MatchUtil; import org.eclipse.jubula.rc.common.util.Verifier; @@ -24,13 +24,11 @@ import org.eclipse.jubula.rc.common.util.Verifier; * */ public class ButtonTester extends AbstractTextVerifiableTester { - /** - * * @return the IButtonAdapter for the component. */ - private IButtonAdapter getButtonAdapter() { - return (IButtonAdapter)getComponent(); + private IButtonComponent getButtonAdapter() { + return (IButtonComponent)getComponent(); } /** diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/ComboBoxTester.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/ComboBoxTester.java index 2d3cb02e9..0d0d77746 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/ComboBoxTester.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/ComboBoxTester.java @@ -13,7 +13,7 @@ package org.eclipse.jubula.rc.common.tester; import org.apache.commons.lang.Validate; import org.eclipse.jubula.rc.common.CompSystemConstants; import org.eclipse.jubula.rc.common.exception.StepExecutionException; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IComboBoxAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IComboComponent; import org.eclipse.jubula.rc.common.util.IndexConverter; import org.eclipse.jubula.rc.common.util.MatchUtil; import org.eclipse.jubula.rc.common.util.Verifier; @@ -29,8 +29,8 @@ public class ComboBoxTester extends AbstractTextInputSupportTester { /** * @return the <code>IComboBoxAdapter</code> */ - private IComboBoxAdapter getCBAdapter() { - return (IComboBoxAdapter) getComponent(); + private IComboComponent getCBAdapter() { + return (IComboComponent) getComponent(); } diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/LabelTester.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/LabelTester.java index 4c7f7d6a1..afc9a4c69 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/LabelTester.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/LabelTester.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.jubula.rc.common.tester; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITextVerifiable; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITextComponent; /** * @@ -23,7 +23,7 @@ public class LabelTester extends AbstractTextVerifiableTester { * {@inheritDoc} */ public String[] getTextArrayFromComponent() { - ITextVerifiable label = (ITextVerifiable) getComponent(); + ITextComponent label = (ITextComponent) getComponent(); return new String[] {label.getText()}; } diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/ListTester.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/ListTester.java index fcff9d473..576a23a23 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/ListTester.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/ListTester.java @@ -19,7 +19,7 @@ import org.eclipse.jubula.rc.common.CompSystemConstants; import org.eclipse.jubula.rc.common.driver.ClickOptions; import org.eclipse.jubula.rc.common.driver.DragAndDropHelper; import org.eclipse.jubula.rc.common.exception.StepExecutionException; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IListAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IListComponent; import org.eclipse.jubula.rc.common.util.IndexConverter; import org.eclipse.jubula.rc.common.util.ListSelectionVerifier; import org.eclipse.jubula.rc.common.util.MatchUtil; @@ -69,8 +69,8 @@ public class ListTester extends AbstractTextVerifiableTester { * * @return the List Adapter */ - private IListAdapter getListAdapter() { - return ((IListAdapter) getComponent()); + private IListComponent getListAdapter() { + return ((IListComponent) getComponent()); } /** diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/TabbedPaneTester.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/TabbedPaneTester.java index c8b48aa06..e042c432c 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/TabbedPaneTester.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/TabbedPaneTester.java @@ -12,7 +12,7 @@ package org.eclipse.jubula.rc.common.tester; import org.eclipse.jubula.rc.common.driver.ClickOptions; import org.eclipse.jubula.rc.common.exception.StepExecutionException; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITabPaneAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITabbedComponent; import org.eclipse.jubula.rc.common.util.IndexConverter; import org.eclipse.jubula.rc.common.util.MatchUtil; import org.eclipse.jubula.rc.common.util.Verifier; @@ -31,8 +31,8 @@ public class TabbedPaneTester extends WidgetTester { * * @return the <code>ITabPane</code> */ - public ITabPaneAdapter getTabPane() { - return (ITabPaneAdapter)getComponent(); + public ITabbedComponent getTabPane() { + return (ITabbedComponent)getComponent(); } /** diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/WidgetTester.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/WidgetTester.java index 49dbe29dd..5adaa5e3c 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/WidgetTester.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/WidgetTester.java @@ -17,7 +17,7 @@ import org.eclipse.jubula.rc.common.driver.ClickOptions; import org.eclipse.jubula.rc.common.driver.IRobot; import org.eclipse.jubula.rc.common.driver.ClickOptions.ClickModifier; import org.eclipse.jubula.rc.common.exception.StepExecutionException; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IWidgetAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IWidgetComponent; import org.eclipse.jubula.rc.common.util.KeyStrokeUtil; import org.eclipse.jubula.rc.common.util.Verifier; import org.eclipse.jubula.tools.utils.TimeUtil; @@ -38,8 +38,8 @@ public class WidgetTester extends AbstractUITester { * Casts the IComponentAdapter to an IWidgetAdapter for better access * @return The widgetAdapter */ - private IWidgetAdapter getWidgetAdapter() { - return (IWidgetAdapter) getComponent(); + private IWidgetComponent getWidgetAdapter() { + return (IWidgetComponent) getComponent(); } /** @@ -83,7 +83,7 @@ public class WidgetTester extends AbstractUITester { public void rcVerifyProperty(final String name, String value, String operator) { - final IWidgetAdapter bean = (IWidgetAdapter) getComponent(); + final IWidgetComponent bean = (IWidgetComponent) getComponent(); bean.getPropteryValue(name); final String propToStr = bean.getPropteryValue(name); @@ -194,7 +194,7 @@ public class WidgetTester extends AbstractUITester { */ public String rcStorePropertyValue(String variableName, final String propertyName) { - IWidgetAdapter bean = (IWidgetAdapter) getComponent(); + IWidgetComponent bean = (IWidgetComponent) getComponent(); return bean.getPropteryValue(propertyName); } diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IButtonAdapter.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IButtonComponent.java index 885e002c1..baff41354 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IButtonAdapter.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IButtonComponent.java @@ -14,13 +14,7 @@ package org.eclipse.jubula.rc.common.tester.adapter.interfaces; * Interface for all necessary methods to test buttons. * It extends the <code>ITextVerifiable</code> to add button specific methods. * - * * @author BREDEX GmbH */ -public interface IButtonAdapter extends ITextVerifiable { - /** - * isSelected is mostly for RadioButtons and CheckBoxes - * @return <code>true</code> if the component is selected - */ - public boolean isSelected(); +public interface IButtonComponent extends ITextComponent, ISelectionComponent { }
\ No newline at end of file diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IComboBoxAdapter.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IComboComponent.java index 72950809d..aa8604727 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IComboBoxAdapter.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IComboComponent.java @@ -18,7 +18,7 @@ import org.eclipse.jubula.rc.common.exception.StepExecutionException; * @author BREDEX GmbH * */ -public interface IComboBoxAdapter extends ITextVerifiable { +public interface IComboComponent extends ITextComponent { /** * @return <code>true</code> if the combobox is editable, <code>false</code> * otherwise diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IComponentAdapter.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IComponent.java index e6eac3624..8d8c61f41 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IComponentAdapter.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IComponent.java @@ -15,21 +15,22 @@ import org.eclipse.jubula.rc.common.driver.IRobotFactory; /** * This is the main interface for classes which will hold or be the * component that implement the methods we need for this - * specific component to test . + * specific component to test. * * @author BREDEX GmbH */ -public interface IComponentAdapter { +public interface IComponent { /** * Gets the toolkit specific component + * * @return toolkit specific component */ public Object getRealComponent(); /** * Gets the toolkit specific RobotFactory + * * @return the RobotFactory */ public IRobotFactory getRobotFactory(); - }
\ No newline at end of file diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IListAdapter.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IListComponent.java index aaa72b91f..773465c20 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IListAdapter.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IListComponent.java @@ -13,13 +13,10 @@ package org.eclipse.jubula.rc.common.tester.adapter.interfaces; import org.eclipse.jubula.rc.common.driver.ClickOptions; /** - * * @author BREDEX GmbH - * */ -public interface IListAdapter extends ITextVerifiable { +public interface IListComponent extends ITextComponent { /** - * * @return The array of selected indices */ public int[] getSelectedIndices(); @@ -40,7 +37,6 @@ public interface IListAdapter extends ITextVerifiable { public String[] getSelectedValues(); /** - * * @return the list items as String array */ public String[] getValues(); diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IMenuAdapter.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IMenuComponent.java index 47800fb53..4bd234b0a 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IMenuAdapter.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IMenuComponent.java @@ -18,13 +18,13 @@ package org.eclipse.jubula.rc.common.tester.adapter.interfaces; * * @author BREDEX GmbH */ -public interface IMenuAdapter extends IComponentAdapter { +public interface IMenuComponent extends IComponent { /** * * @return the items of the menu */ - public IMenuItemAdapter[] getItems(); + public IMenuItemComponent[] getItems(); /** * Gets the amount of items in the menu diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IMenuItemAdapter.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IMenuItemComponent.java index e03aab51c..1653ea8b7 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IMenuItemAdapter.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IMenuItemComponent.java @@ -11,37 +11,28 @@ package org.eclipse.jubula.rc.common.tester.adapter.interfaces; /** - * Interface for all necessary methods for testing menuitems. + * Interface for all necessary methods for testing MenuItems. * * @author BREDEX GmbH */ -public interface IMenuItemAdapter extends IComponentAdapter { - +public interface IMenuItemComponent extends IComponent, ISelectionComponent { /** - * * @return the text which is saved in the item */ public String getText(); + /** - * - * @return <code>true</code> if the component is visible + * @return <code>true</code> if the component is enabled */ public boolean isEnabled(); + /** - * * @return <code>true</code> if the component exists * that means there is an item in this wrapper */ public boolean isExisting(); - /** - * - * @return <code>true</code> if the component is selected - * - */ - public boolean isSelected(); /** - * * @return <code>true</code> if the component is showing. If there is no * implementation for getting the display status also return * <code>true</code> @@ -51,10 +42,9 @@ public interface IMenuItemAdapter extends IComponentAdapter { /** Gets the menu of the menuitem * @return the menu which is attached to the item */ - public IMenuAdapter getMenu(); + public IMenuComponent getMenu(); /** - * * @return <code>true</code> if the menuitem has a submenu */ public boolean hasSubMenu(); @@ -73,11 +63,9 @@ public interface IMenuItemAdapter extends IComponentAdapter { public void selectMenuItem(); /** - * This method trys to open the the next Menu in the cascade + * This method tries to open the the next Menu in the cascade * * @return the next SubMenu in the Menu */ - public IMenuAdapter openSubMenu(); - - + public IMenuComponent openSubMenu(); } diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/ISelectionComponent.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/ISelectionComponent.java new file mode 100644 index 000000000..8c44870b3 --- /dev/null +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/ISelectionComponent.java @@ -0,0 +1,23 @@ +/******************************************************************************* + * Copyright (c) 2012 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 + *******************************************************************************/ +package org.eclipse.jubula.rc.common.tester.adapter.interfaces; + +/** + * Abstraction for all components which provide a selection concept. + * + * @author BREDEX GmbH + */ +public interface ISelectionComponent { + /** + * @return <code>true</code> if the component is selected + */ + public boolean isSelected(); +}
\ No newline at end of file diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/ITabPaneAdapter.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/ITabbedComponent.java index 49511ad73..14c9a82d0 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/ITabPaneAdapter.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/ITabbedComponent.java @@ -16,7 +16,7 @@ package org.eclipse.jubula.rc.common.tester.adapter.interfaces; * @author BREDEX GmbH * */ -public interface ITabPaneAdapter extends IWidgetAdapter { +public interface ITabbedComponent extends IWidgetComponent { /** * * @return the number of the tabs diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/ITableAdapter.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/ITableComponent.java index 830fc8b4f..d7227e0f8 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/ITableAdapter.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/ITableComponent.java @@ -20,7 +20,7 @@ import org.eclipse.jubula.rc.common.implclasses.table.Cell; * * @author BREDEX GmbH */ -public interface ITableAdapter extends ITextVerifiable { +public interface ITableComponent extends ITextComponent { /** diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/ITextVerifiable.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/ITextComponent.java index 066be4db1..8d9bbce4a 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/ITextVerifiable.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/ITextComponent.java @@ -1,10 +1,8 @@ package org.eclipse.jubula.rc.common.tester.adapter.interfaces; /** - * * @author BREDEX GmbH - * */ -public interface ITextVerifiable extends IWidgetAdapter { +public interface ITextComponent extends IWidgetComponent { /** * Gets the value of the component, or if there are more than the first diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/ITextComponentAdapter.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/ITextInputComponent.java index db86905ae..c4f6559f4 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/ITextComponentAdapter.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/ITextInputComponent.java @@ -14,7 +14,7 @@ package org.eclipse.jubula.rc.common.tester.adapter.interfaces; * @author BREDEX GmbH * */ -public interface ITextComponentAdapter extends ITextVerifiable { +public interface ITextInputComponent extends ITextComponent { /** * Sets the caret to a specific position. @@ -45,7 +45,6 @@ public interface ITextComponentAdapter extends ITextVerifiable { void selectAll(); /** - * * @return the value if the Text Component is editable */ boolean isEditable(); diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/ITreeAdapter.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/ITreeComponent.java index 847e6324b..174536854 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/ITreeAdapter.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/ITreeComponent.java @@ -17,7 +17,7 @@ import org.eclipse.jubula.rc.common.implclasses.tree.AbstractTreeOperationContex * * @author BREDEX GmbH */ -public interface ITreeAdapter extends IWidgetAdapter { +public interface ITreeComponent extends IWidgetComponent { /** * Gets the root node(s) of the tree. diff --git a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IWidgetAdapter.java b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IWidgetComponent.java index 22ae86b5d..87397d743 100644 --- a/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IWidgetAdapter.java +++ b/org.eclipse.jubula.rc.common/src/org/eclipse/jubula/rc/common/tester/adapter/interfaces/IWidgetComponent.java @@ -18,22 +18,18 @@ import org.eclipse.jubula.rc.common.tester.AbstractMenuTester; * * @author BREDEX GmbH */ -public interface IWidgetAdapter extends IComponentAdapter { - +public interface IWidgetComponent extends IComponent { /** - * * @return <code>true</code> if the component is visible */ public boolean isShowing(); /** - * * @return <code>true</code> if the component is enabled */ public boolean isEnabled(); /** - * * @return <code>true</code> if the component has focus */ public boolean hasFocus(); @@ -45,7 +41,6 @@ public interface IWidgetAdapter extends IComponentAdapter { */ public String getPropteryValue(String propertyname); - /** * Shows and returns the popup menu * diff --git a/org.eclipse.jubula.rc.swing/META-INF/MANIFEST.MF b/org.eclipse.jubula.rc.swing/META-INF/MANIFEST.MF index da47f134b..95246d4aa 100644 --- a/org.eclipse.jubula.rc.swing/META-INF/MANIFEST.MF +++ b/org.eclipse.jubula.rc.swing/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Jubula Remote Control - Swing -Bundle-SymbolicName: org.eclipse.jubula.rc.swing +Bundle-SymbolicName: org.eclipse.jubula.rc.swing;singleton:=true Bundle-Version: 2.0.0.qualifier Bundle-Vendor: Eclipse Jubula Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/common/adapter/SwingAdapterFactory.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/common/adapter/SwingAdapterFactory.java index c48d69d89..0288a923d 100644 --- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/common/adapter/SwingAdapterFactory.java +++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/common/adapter/SwingAdapterFactory.java @@ -26,7 +26,7 @@ import javax.swing.JTree; import javax.swing.text.JTextComponent; import org.eclipse.jubula.rc.common.adaptable.IAdapterFactory; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IComponentAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IComponent; import org.eclipse.jubula.rc.swing.tester.adapter.AbstractButtonAdapter; import org.eclipse.jubula.rc.swing.tester.adapter.JComboBoxAdapter; import org.eclipse.jubula.rc.swing.tester.adapter.JLabelAdapter; @@ -50,7 +50,7 @@ import org.eclipse.jubula.rc.swing.tester.adapter.JTreeAdapter; */ public class SwingAdapterFactory implements IAdapterFactory { /** - * + * the supported classes */ private static final Class[] SUPPORTEDCLASSES = new Class[] { JButton.class, JCheckBox.class, JRadioButton.class, @@ -59,20 +59,16 @@ public class SwingAdapterFactory implements IAdapterFactory { JList.class, JTextComponent.class, JComboBox.class, JLabel.class , JTabbedPane.class}; - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ public Class[] getSupportedClasses() { return SUPPORTEDCLASSES; } - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ public Object getAdapter(Class targetedClass, Object objectToAdapt) { - if (targetedClass.isAssignableFrom(IComponentAdapter.class)) { + if (targetedClass.isAssignableFrom(IComponent.class)) { - IComponentAdapter returnvalue = null; + IComponent returnvalue = null; if (objectToAdapt instanceof JButton) { returnvalue = new AbstractButtonAdapter(objectToAdapt); } else if (objectToAdapt instanceof JRadioButton) { diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/driver/RobotFactoryAwtImpl.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/driver/RobotFactoryAwtImpl.java index 97071aa47..cf7fd5c85 100644 --- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/driver/RobotFactoryAwtImpl.java +++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/driver/RobotFactoryAwtImpl.java @@ -26,21 +26,25 @@ import org.eclipse.jubula.rc.common.exception.RobotException; */ public class RobotFactoryAwtImpl implements IRobotFactory { /** - * The AWT/Swing Robot. + * The Robot. */ private IRobot m_robot; + /** * The AWT/Swing interceptor. */ private IRobotEventInterceptor m_interceptor; + /** * The AWT/Swing mouse motion tracker. */ private IMouseMotionTracker m_mouseMotionTracker; + /** * The AWT event thread queuer. */ private IEventThreadQueuer m_eventThreadQueuer; + /** * {@inheritDoc} */ @@ -50,6 +54,7 @@ public class RobotFactoryAwtImpl implements IRobotFactory { } return m_interceptor; } + /** * {@inheritDoc} */ @@ -59,6 +64,7 @@ public class RobotFactoryAwtImpl implements IRobotFactory { } return m_robot; } + /** * {@inheritDoc} */ @@ -68,6 +74,7 @@ public class RobotFactoryAwtImpl implements IRobotFactory { } return m_mouseMotionTracker; } + /** * {@inheritDoc} */ diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/JMenuBarTester.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/JMenuBarTester.java index ef54a10d0..cbbc96e2b 100644 --- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/JMenuBarTester.java +++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/JMenuBarTester.java @@ -26,9 +26,9 @@ import javax.swing.JPopupMenu; import javax.swing.MenuElement; import org.eclipse.jubula.rc.common.tester.AbstractMenuTester; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IComponentAdapter; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuAdapter; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuItemAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IComponent; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuComponent; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuItemComponent; import org.eclipse.jubula.rc.swing.tester.adapter.JMenuItemAdapter; import org.eclipse.jubula.rc.swing.tester.util.WindowHelper; @@ -122,7 +122,7 @@ public class JMenuBarTester extends AbstractMenuTester { /** * @return the component */ - public IComponentAdapter getComponent() { + public IComponent getComponent() { if (super.getComponent().getRealComponent() instanceof JPopupMenu) { return super.getComponent(); } @@ -154,7 +154,7 @@ public class JMenuBarTester extends AbstractMenuTester { /** *{@inheritDoc} */ - protected void closeMenu(IMenuAdapter menuBar, String[] textPath, + protected void closeMenu(IMenuComponent menuBar, String[] textPath, String operator) { if (menuBar.getRealComponent() instanceof JPopupMenu) { for (int i = 0; i < textPath.length; i++) { @@ -173,7 +173,7 @@ public class JMenuBarTester extends AbstractMenuTester { /** *{@inheritDoc} */ - protected void closeMenu(IMenuAdapter menuBar, int[] path) { + protected void closeMenu(IMenuComponent menuBar, int[] path) { if (menuBar.getRealComponent() instanceof JPopupMenu) { for (int i = 0; i < path.length; i++) { if (((JPopupMenu)menuBar.getRealComponent()).isVisible()) { @@ -189,7 +189,7 @@ public class JMenuBarTester extends AbstractMenuTester { /** * {@inheritDoc} */ - protected IMenuItemAdapter newMenuItemAdapter(Object component) { + protected IMenuItemComponent newMenuItemAdapter(Object component) { return new JMenuItemAdapter(component); } diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/JTableTester.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/JTableTester.java index fb194b7c6..10858490d 100644 --- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/JTableTester.java +++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/JTableTester.java @@ -34,7 +34,6 @@ import org.eclipse.jubula.rc.swing.utils.SwingUtils; * @author BREDEX GmbH */ public class JTableTester extends AbstractTableTester { - /** the logger */ private static AutServerLogger log = new AutServerLogger( JTableTester.class); @@ -45,10 +44,8 @@ public class JTableTester extends AbstractTableTester { public static AutServerLogger getLog() { return log; } - /** - * * @return the real AUT JTable */ private JTable getTable() { @@ -62,7 +59,6 @@ public class JTableTester extends AbstractTableTester { return getRobotFactory().getEventThreadQueuer(); } - /** * {@inheritDoc} */ @@ -89,6 +85,7 @@ public class JTableTester extends AbstractTableTester { } return componentTextArray; } + /** * {@inheritDoc} */ diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/AbstractButtonAdapter.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/AbstractButtonAdapter.java index 6b430a337..e76353cc8 100644 --- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/AbstractButtonAdapter.java +++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/AbstractButtonAdapter.java @@ -14,15 +14,15 @@ import javax.swing.AbstractButton; import org.eclipse.jubula.rc.common.driver.IEventThreadQueuer; import org.eclipse.jubula.rc.common.driver.IRunnable; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IButtonAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IButtonComponent; /** * Implementation of the button interface as an adapter which holds * the <code>javax.swing.AbstractButton</code>. * * @author BREDEX GmbH */ -public class AbstractButtonAdapter extends WidgetAdapter - implements IButtonAdapter { +public class AbstractButtonAdapter extends JComponentAdapter + implements IButtonComponent { /** * Creates an object with the adapted JMenu. @@ -86,17 +86,4 @@ public class AbstractButtonAdapter extends WidgetAdapter }); return (boolean) returnvalue.booleanValue(); } - - /** - * {@inheritDoc} - */ - public String readValue(String variable) { - return (String) getEventThreadQueuer().invokeAndWait( - "isShowing", new IRunnable() { //$NON-NLS-1$ - public Object run() { - return getAbstractButton().getText(); - } - }); - } - }
\ No newline at end of file diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/AbstractComponentAdapter.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/AbstractComponentAdapter.java index fabcdb597..a0c6fc17f 100644 --- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/AbstractComponentAdapter.java +++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/AbstractComponentAdapter.java @@ -1,14 +1,14 @@ package org.eclipse.jubula.rc.swing.tester.adapter; import org.eclipse.jubula.rc.common.driver.IRobotFactory; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IComponentAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IComponent; import org.eclipse.jubula.rc.swing.driver.RobotFactoryConfig; /** * * @author BREDEX GmbH * */ -public abstract class AbstractComponentAdapter implements IComponentAdapter { +public abstract class AbstractComponentAdapter implements IComponent { /** the RobotFactory from the AUT */ private IRobotFactory m_robotFactory; diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JComboBoxAdapter.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JComboBoxAdapter.java index 8cf7ac35c..9bf7e7605 100644 --- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JComboBoxAdapter.java +++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JComboBoxAdapter.java @@ -29,7 +29,7 @@ import org.eclipse.jubula.rc.common.driver.ClickOptions; import org.eclipse.jubula.rc.common.driver.IRunnable; import org.eclipse.jubula.rc.common.exception.StepExecutionException; import org.eclipse.jubula.rc.common.logger.AutServerLogger; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IComboBoxAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IComboComponent; import org.eclipse.jubula.rc.swing.tester.util.TesterUtil; import org.eclipse.jubula.tools.objects.event.EventFactory; import org.eclipse.jubula.tools.objects.event.TestErrorEvent; @@ -39,8 +39,8 @@ import org.eclipse.jubula.tools.objects.event.TestErrorEvent; * @author BREDEX GmbH * */ -public class JComboBoxAdapter extends WidgetAdapter implements - IComboBoxAdapter { +public class JComboBoxAdapter extends JComponentAdapter implements + IComboComponent { /** * <code>INVALID_MAX_WIDTH</code> */ diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/WidgetAdapter.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JComponentAdapter.java index 8127f4284..2310f537d 100644 --- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/WidgetAdapter.java +++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JComponentAdapter.java @@ -16,6 +16,7 @@ import java.awt.Toolkit; import javax.swing.JComponent; +import org.eclipse.jubula.rc.common.CompSystemConstants; import org.eclipse.jubula.rc.common.driver.ClickOptions; import org.eclipse.jubula.rc.common.driver.DragAndDropHelper; import org.eclipse.jubula.rc.common.driver.IEventThreadQueuer; @@ -26,7 +27,7 @@ import org.eclipse.jubula.rc.common.exception.RobotException; import org.eclipse.jubula.rc.common.exception.StepExecutionException; import org.eclipse.jubula.rc.common.listener.EventLock; import org.eclipse.jubula.rc.common.tester.AbstractMenuTester; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IWidgetAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IWidgetComponent; import org.eclipse.jubula.rc.swing.driver.KeyCodeConverter; import org.eclipse.jubula.rc.swing.tester.JMenuBarTester; import org.eclipse.jubula.rc.swing.tester.util.EventListener; @@ -39,27 +40,23 @@ import org.eclipse.jubula.tools.objects.event.TestErrorEvent; import org.eclipse.jubula.tools.utils.TimeUtil; /** * Implements the interface for widgets and supports basic methods - * which are needed for nearly all Swing ui components. + * which are needed for nearly all Swing UI components. * This is a basic adaption for <code>JComponent</code>. * * @author BREDEX GmbH */ -public class WidgetAdapter extends AbstractComponentAdapter - implements IWidgetAdapter { - - /** constants for communication */ - protected static final String POS_UNIT_PIXEL = "Pixel"; //$NON-NLS-1$ - /** constants for communication */ - protected static final String POS_UNI_PERCENT = "Percent"; //$NON-NLS-1$ - - /** */ +public class JComponentAdapter extends AbstractComponentAdapter + implements IWidgetComponent { + /** the component */ private JComponent m_component; /** * Used to store the component into the adapter. - * @param objectToAdapt + * + * @param objectToAdapt + * the object to adapt */ - protected WidgetAdapter(Object objectToAdapt) { + public JComponentAdapter(Object objectToAdapt) { m_component = (JComponent) objectToAdapt; } @@ -190,9 +187,11 @@ public class WidgetAdapter extends AbstractComponentAdapter public void run() { RobotTiming.sleepPreShowPopupDelay(); boolean isAbsoluteCoordinatesX = - xUnits.equalsIgnoreCase(POS_UNIT_PIXEL); + xUnits.equalsIgnoreCase( + CompSystemConstants.POS_UNIT_PIXEL); boolean isAbsoluteCoordinatesY = - yUnits.equalsIgnoreCase(POS_UNIT_PIXEL); + yUnits.equalsIgnoreCase( + CompSystemConstants.POS_UNIT_PIXEL); getRobot().click(component, null, ClickOptions.create().setMouseButton(button), xPos, isAbsoluteCoordinatesX, @@ -312,8 +311,10 @@ public class WidgetAdapter extends AbstractComponentAdapter ClickOptions.create() .setClickCount(count) .setMouseButton(button), - xPos, xUnits.equalsIgnoreCase(POS_UNIT_PIXEL), - yPos, yUnits.equalsIgnoreCase(POS_UNIT_PIXEL)); + xPos, xUnits.equalsIgnoreCase( + CompSystemConstants.POS_UNIT_PIXEL), + yPos, yUnits.equalsIgnoreCase( + CompSystemConstants.POS_UNIT_PIXEL)); } /** @@ -322,5 +323,4 @@ public class WidgetAdapter extends AbstractComponentAdapter public int getKeyCode(String mod) { return KeyCodeConverter.getKeyCode(mod); } - } diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JLabelAdapter.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JLabelAdapter.java index c5da42c55..08059dfab 100644 --- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JLabelAdapter.java +++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JLabelAdapter.java @@ -12,16 +12,13 @@ package org.eclipse.jubula.rc.swing.tester.adapter; import javax.swing.JLabel; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITextVerifiable; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITextComponent; /** - * * @author BREDEX GmbH - * */ -public class JLabelAdapter extends WidgetAdapter implements ITextVerifiable { - +public class JLabelAdapter extends JComponentAdapter + implements ITextComponent { /** - * * @param objectToAdapt the component */ public JLabelAdapter(Object objectToAdapt) { @@ -35,5 +32,4 @@ public class JLabelAdapter extends WidgetAdapter implements ITextVerifiable { public String getText() { return ((JLabel) getRealComponent()).getText(); } - -} +}
\ No newline at end of file diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JListAdapter.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JListAdapter.java index 4508eefeb..1932d76cf 100644 --- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JListAdapter.java +++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JListAdapter.java @@ -20,7 +20,7 @@ import javax.swing.ListModel; import org.eclipse.jubula.rc.common.driver.ClickOptions; import org.eclipse.jubula.rc.common.driver.IRunnable; import org.eclipse.jubula.rc.common.exception.StepExecutionException; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IListAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IListComponent; import org.eclipse.jubula.rc.common.util.MatchUtil; import org.eclipse.jubula.rc.swing.tester.util.TesterUtil; import org.eclipse.jubula.tools.objects.event.EventFactory; @@ -30,7 +30,7 @@ import org.eclipse.jubula.tools.objects.event.TestErrorEvent; * @author BREDEX GmbH * */ -public class JListAdapter extends WidgetAdapter implements IListAdapter { +public class JListAdapter extends JComponentAdapter implements IListComponent { /** */ private JList m_list; diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JMenuAdapter.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JMenuAdapter.java index b997b6329..46f4e2c6d 100644 --- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JMenuAdapter.java +++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JMenuAdapter.java @@ -17,8 +17,8 @@ import java.util.List; import javax.swing.JMenu; import javax.swing.JMenuItem; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuAdapter; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuItemAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuComponent; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuItemComponent; /** * Implementation of the menu interface for adapting the <code>JMenu</code>. * In Swing we have three implementations of the menu interface because @@ -29,7 +29,7 @@ import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuItemAdapter; * */ public class JMenuAdapter extends AbstractComponentAdapter - implements IMenuAdapter { + implements IMenuComponent { /** The JMenu from the AUT */ private JMenu m_menu; @@ -51,7 +51,7 @@ public class JMenuAdapter extends AbstractComponentAdapter /** * {@inheritDoc} */ - public IMenuItemAdapter[] getItems() { + public IMenuItemComponent[] getItems() { List adapters = new LinkedList(); for (int i = 0; i < m_menu.getItemCount(); i++) { @@ -63,14 +63,14 @@ public class JMenuAdapter extends AbstractComponentAdapter } - IMenuItemAdapter[] allitems = null; + IMenuItemComponent[] allitems = null; if (adapters.size() > 0) { - allitems = new IMenuItemAdapter[adapters.size()]; + allitems = new IMenuItemComponent[adapters.size()]; int i = 0; for (Iterator iterator = adapters.iterator(); iterator.hasNext();) { Object object = (Object) iterator.next(); - allitems[i] = (IMenuItemAdapter) object; + allitems[i] = (IMenuItemComponent) object; i++; } diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JMenuBarAdapter.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JMenuBarAdapter.java index cce622ba6..056484952 100644 --- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JMenuBarAdapter.java +++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JMenuBarAdapter.java @@ -16,8 +16,8 @@ import java.util.List; import javax.swing.JMenuBar; import javax.swing.JMenuItem; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuAdapter; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuItemAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuComponent; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuItemComponent; /** * Implementation of the menu interface for adapting the <code>JMenuBar</code>. @@ -29,7 +29,7 @@ import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuItemAdapter; * */ public class JMenuBarAdapter extends AbstractComponentAdapter - implements IMenuAdapter { + implements IMenuComponent { /** The JMenuBar */ private JMenuBar m_menuBar; @@ -51,7 +51,7 @@ public class JMenuBarAdapter extends AbstractComponentAdapter * {@inheritDoc} */ - public IMenuItemAdapter[] getItems() { + public IMenuItemComponent[] getItems() { Object[] menus = m_menuBar.getSubElements(); List adapters = new LinkedList(); for (int i = 0; i < menus.length; i++) { @@ -59,7 +59,7 @@ public class JMenuBarAdapter extends AbstractComponentAdapter adapters.add(new JMenuItemAdapter(menus[i])); } } - IMenuItemAdapter[] allitems = new IMenuItemAdapter[adapters.size()]; + IMenuItemComponent[] allitems = new IMenuItemComponent[adapters.size()]; adapters.toArray(allitems); return allitems; } diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JMenuItemAdapter.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JMenuItemAdapter.java index fdcfcb66c..0bd88eda4 100644 --- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JMenuItemAdapter.java +++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JMenuItemAdapter.java @@ -22,8 +22,8 @@ import org.eclipse.jubula.rc.common.driver.IRunnable; import org.eclipse.jubula.rc.common.driver.RobotTiming; import org.eclipse.jubula.rc.common.exception.RobotException; import org.eclipse.jubula.rc.common.exception.StepExecutionException; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuAdapter; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuItemAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuComponent; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuItemComponent; import org.eclipse.jubula.tools.objects.event.EventFactory; import org.eclipse.jubula.tools.objects.event.TestErrorEvent; @@ -33,7 +33,7 @@ import org.eclipse.jubula.tools.objects.event.TestErrorEvent; * */ public class JMenuItemAdapter extends AbstractComponentAdapter - implements IMenuItemAdapter { + implements IMenuItemComponent { /** the JMenuItem from the AUT */ private JMenuItem m_menuItem; @@ -155,7 +155,7 @@ public class JMenuItemAdapter extends AbstractComponentAdapter /** * {@inheritDoc} */ - public IMenuAdapter getMenu() { + public IMenuComponent getMenu() { if (m_menuItem instanceof JMenu) { return new JMenuAdapter(m_menuItem); } @@ -192,7 +192,7 @@ public class JMenuItemAdapter extends AbstractComponentAdapter /** * {@inheritDoc} */ - public IMenuAdapter openSubMenu() { + public IMenuComponent openSubMenu() { if (!m_menuItem.isEnabled()) { throw new StepExecutionException("menu item not enabled", //$NON-NLS-1$ EventFactory.createActionError( diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JPopupMenuAdapter.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JPopupMenuAdapter.java index f78586de3..cbc365ea4 100644 --- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JPopupMenuAdapter.java +++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JPopupMenuAdapter.java @@ -16,8 +16,8 @@ import java.util.List; import javax.swing.JMenuItem; import javax.swing.JPopupMenu; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuAdapter; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuItemAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuComponent; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuItemComponent; /** * Implementation of the menu interface for adapting the <code>JPopupMenu</code>. * In Swing we have three implementations of the menu interface because @@ -28,7 +28,7 @@ import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuItemAdapter; * */ public class JPopupMenuAdapter extends AbstractComponentAdapter - implements IMenuAdapter { + implements IMenuComponent { /** */ private JPopupMenu m_contextMenu; @@ -46,7 +46,7 @@ public class JPopupMenuAdapter extends AbstractComponentAdapter } /** {@inheritDoc} */ - public IMenuItemAdapter[] getItems() { + public IMenuItemComponent[] getItems() { Object[] menuItems = m_contextMenu.getSubElements(); List adapters = new LinkedList(); for (int i = 0; i < menuItems.length; i++) { @@ -54,7 +54,7 @@ public class JPopupMenuAdapter extends AbstractComponentAdapter adapters.add(new JMenuItemAdapter(menuItems[i])); } } - IMenuItemAdapter[] allitems = new IMenuItemAdapter[adapters.size()]; + IMenuItemComponent[] allitems = new IMenuItemComponent[adapters.size()]; adapters.toArray(allitems); return allitems; } diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JTabbedPaneAdapter.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JTabbedPaneAdapter.java index 3e8036e86..d2216012c 100644 --- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JTabbedPaneAdapter.java +++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JTabbedPaneAdapter.java @@ -13,18 +13,20 @@ package org.eclipse.jubula.rc.swing.tester.adapter; import javax.swing.JTabbedPane; import org.eclipse.jubula.rc.common.driver.IRunnable; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITabPaneAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITabbedComponent; + /** - * Implementation of the Interface <code>ITabPaneAdapter</code> as a - * adapter for the <code>JTabbedPane</code> component. + * Implementation of the Interface <code>ITabPaneAdapter</code> as a adapter for + * the <code>JTabbedPane</code> component. + * * @author BREDEX GmbH - * + * */ -public class JTabbedPaneAdapter extends WidgetAdapter - implements ITabPaneAdapter { - +public class JTabbedPaneAdapter extends JComponentAdapter + implements ITabbedComponent { /** The JTabbedPane on which the actions are performed. */ private JTabbedPane m_pane; + /** * * @param objectToAdapt diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JTableAdapter.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JTableAdapter.java index 4b8ed82fa..6989350e7 100644 --- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JTableAdapter.java +++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JTableAdapter.java @@ -20,7 +20,7 @@ import org.eclipse.jubula.rc.common.driver.IRunnable; import org.eclipse.jubula.rc.common.exception.StepExecutionException; import org.eclipse.jubula.rc.common.implclasses.table.Cell; import org.eclipse.jubula.rc.common.logger.AutServerLogger; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITableAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITableComponent; import org.eclipse.jubula.rc.common.util.IndexConverter; import org.eclipse.jubula.rc.common.util.MatchUtil; import org.eclipse.jubula.rc.swing.tester.util.TesterUtil; @@ -31,8 +31,8 @@ import org.eclipse.jubula.tools.objects.event.TestErrorEvent; * * @author BREDEX GmbH */ -public class JTableAdapter extends WidgetAdapter implements ITableAdapter { - +public class JTableAdapter extends JComponentAdapter + implements ITableComponent { /** the logger */ private static AutServerLogger log = new AutServerLogger( JTableAdapter.class); diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JTextComponentAdapter.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JTextComponentAdapter.java index f9c96e6fe..5e1e64fc7 100644 --- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JTextComponentAdapter.java +++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JTextComponentAdapter.java @@ -13,15 +13,15 @@ package org.eclipse.jubula.rc.swing.tester.adapter; import javax.swing.text.JTextComponent; import org.eclipse.jubula.rc.common.driver.IRunnable; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITextComponentAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITextInputComponent; /** * Implementation of the Interface <code>ITextComponentAdapter</code> as a * adapter for the <code>JTextComponent</code> component. * @author BREDEX GmbH * */ -public class JTextComponentAdapter extends WidgetAdapter - implements ITextComponentAdapter { +public class JTextComponentAdapter extends JComponentAdapter + implements ITextInputComponent { /** */ private JTextComponent m_textComponent; diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JTreeAdapter.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JTreeAdapter.java index fdc65e8a9..22d026357 100644 --- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JTreeAdapter.java +++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/tester/adapter/JTreeAdapter.java @@ -14,7 +14,7 @@ import javax.swing.JTree; //import org.eclipse.jubula.rc.common.driver.IRunnable; import org.eclipse.jubula.rc.common.implclasses.tree.AbstractTreeOperationContext; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITreeAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITreeComponent; import org.eclipse.jubula.rc.swing.tester.util.TreeOperationContext; /** * Implementation of the Tree interface as an adapter for <code>JTree</code>. @@ -22,7 +22,7 @@ import org.eclipse.jubula.rc.swing.tester.util.TreeOperationContext; * @author BREDEX GmbH * */ -public class JTreeAdapter extends WidgetAdapter implements ITreeAdapter { +public class JTreeAdapter extends JComponentAdapter implements ITreeComponent { /** diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/common/adapter/SWTAdapterFactory.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/common/adapter/SWTAdapterFactory.java index a6f8b689e..0dac63c61 100644 --- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/common/adapter/SWTAdapterFactory.java +++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/common/adapter/SWTAdapterFactory.java @@ -11,7 +11,7 @@ package org.eclipse.jubula.rc.common.adapter; import org.eclipse.jubula.rc.common.adaptable.IAdapterFactory; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IComponentAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IComponent; import org.eclipse.jubula.rc.swt.tester.adapter.ButtonAdapter; import org.eclipse.jubula.rc.swt.tester.adapter.CComboAdapter; import org.eclipse.jubula.rc.swt.tester.adapter.CLabelAdapter; @@ -74,8 +74,8 @@ public class SWTAdapterFactory implements IAdapterFactory { * {@inheritDoc} */ public Object getAdapter(Class targetedClass, Object objectToAdapt) { - if (targetedClass.isAssignableFrom(IComponentAdapter.class)) { - IComponentAdapter returnvalue = null; + if (targetedClass.isAssignableFrom(IComponent.class)) { + IComponent returnvalue = null; if (objectToAdapt instanceof Button) { returnvalue = new ButtonAdapter(objectToAdapt); } else if (objectToAdapt instanceof Menu) { diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/ButtonTester.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/ButtonTester.java index 730f4a078..56647b50b 100644 --- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/ButtonTester.java +++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/ButtonTester.java @@ -11,7 +11,7 @@ package org.eclipse.jubula.rc.swt.tester; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IButtonAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IButtonComponent; /** @@ -26,6 +26,6 @@ public class ButtonTester extends * {@inheritDoc} */ public String[] getTextArrayFromComponent() { - return new String[] { ((IButtonAdapter)getComponent()).getText()}; + return new String[] { ((IButtonComponent)getComponent()).getText()}; } }
\ No newline at end of file diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/MenuTester.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/MenuTester.java index 9f8ae92e7..80025d5c4 100644 --- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/MenuTester.java +++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/MenuTester.java @@ -15,9 +15,9 @@ import org.eclipse.jubula.rc.common.driver.IEventThreadQueuer; import org.eclipse.jubula.rc.common.driver.IRunnable; import org.eclipse.jubula.rc.common.exception.StepExecutionException; import org.eclipse.jubula.rc.common.tester.AbstractMenuTester; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IComponentAdapter; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuAdapter; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuItemAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IComponent; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuComponent; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuItemComponent; import org.eclipse.jubula.rc.common.util.MenuUtilBase; import org.eclipse.jubula.rc.swt.driver.EventThreadQueuerSwtImpl; import org.eclipse.jubula.rc.swt.driver.RobotSwtImpl; @@ -50,7 +50,7 @@ public class MenuTester extends AbstractMenuTester { /** * {@inheritDoc} */ - public IComponentAdapter getComponent() { + public IComponent getComponent() { if (m_isCM) { return super.getComponent(); } @@ -165,7 +165,7 @@ public class MenuTester extends AbstractMenuTester { * @throws StepExecutionException * if the active window has no menu bar. */ - protected IMenuAdapter getAndCheckMenu() throws StepExecutionException { + protected IMenuComponent getAndCheckMenu() throws StepExecutionException { // Verify that there is an active window if (((RobotSwtImpl)getRobot()).getActiveWindow() == null) { throw new StepExecutionException( @@ -188,14 +188,14 @@ public class MenuTester extends AbstractMenuTester { /** * {@inheritDoc} */ - protected IMenuItemAdapter newMenuItemAdapter(Object component) { + protected IMenuItemComponent newMenuItemAdapter(Object component) { return new MenuItemAdapter(component); } /** * {@inheritDoc} */ - protected void closeMenu(IMenuAdapter menuBar, int[] path) { + protected void closeMenu(IMenuComponent menuBar, int[] path) { Validate.notNull(getMenu(menuBar)); closeMenu(menuBar, path.length); @@ -204,7 +204,7 @@ public class MenuTester extends AbstractMenuTester { /** * {@inheritDoc} */ - protected void closeMenu(IMenuAdapter menuBar, String[] textPath, + protected void closeMenu(IMenuComponent menuBar, String[] textPath, String operator) { Validate.notNull(getMenu(menuBar)); closeMenu(menuBar, textPath.length); @@ -215,7 +215,7 @@ public class MenuTester extends AbstractMenuTester { * @param menuBar menu * @param maxCascadeLength an integer so that the closing operation is not infinite */ - private void closeMenu(final IMenuAdapter menuBar, int maxCascadeLength) { + private void closeMenu(final IMenuComponent menuBar, int maxCascadeLength) { final MenuHiddenListener menuListener = new MenuHiddenListener(); getMenu(menuBar).getDisplay().syncExec(new Runnable() { @@ -240,7 +240,7 @@ public class MenuTester extends AbstractMenuTester { * @param menu the menu adapter * @return the real SWT menu */ - private Menu getMenu(final IMenuAdapter menu) { + private Menu getMenu(final IMenuComponent menu) { return (Menu) menu.getRealComponent(); } /** diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/TableTester.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/TableTester.java index f296fea2a..5b4fcdbfc 100644 --- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/TableTester.java +++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/TableTester.java @@ -21,8 +21,8 @@ import org.eclipse.jubula.rc.common.driver.IRunnable; import org.eclipse.jubula.rc.common.exception.StepExecutionException; import org.eclipse.jubula.rc.common.implclasses.table.Cell; import org.eclipse.jubula.rc.common.tester.AbstractTableTester; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITableAdapter; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITextComponentAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITableComponent; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITextInputComponent; import org.eclipse.jubula.rc.swt.driver.DragAndDropHelperSwt; import org.eclipse.jubula.rc.swt.tester.adapter.StyledTextAdapter; import org.eclipse.jubula.rc.swt.tester.adapter.TableAdapter; @@ -81,7 +81,7 @@ public class TableTester extends AbstractTableTester { protected Object setEditorToReplaceMode(Object editor, boolean replace) { if (replace) { - ITextComponentAdapter textEditor = null; + ITextInputComponent textEditor = null; if (editor instanceof Text) { textEditor = new TextComponentAdapter(editor); } @@ -195,7 +195,7 @@ public class TableTester extends AbstractTableTester { */ protected boolean isMouseOnHeader() { final Table table = getTable(); - final ITableAdapter adapter = (ITableAdapter)getComponent(); + final ITableComponent adapter = (ITableComponent)getComponent(); Boolean isVisible; isVisible = (Boolean)getEventThreadQueuer().invokeAndWait( "isMouseOnHeader", //$NON-NLS-1$ diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/AbstractComboBoxAdapter.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/AbstractComboBoxAdapter.java index 28afd84fd..609c65de5 100644 --- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/AbstractComboBoxAdapter.java +++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/AbstractComboBoxAdapter.java @@ -15,7 +15,7 @@ import org.eclipse.jubula.rc.common.driver.ClickOptions; import org.eclipse.jubula.rc.common.driver.IRunnable; import org.eclipse.jubula.rc.common.exception.StepExecutionException; import org.eclipse.jubula.rc.common.logger.AutServerLogger; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IComboBoxAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IComboComponent; import org.eclipse.jubula.rc.swt.utils.SwtUtils; import org.eclipse.jubula.tools.objects.event.EventFactory; import org.eclipse.jubula.tools.objects.event.TestErrorEvent; @@ -33,7 +33,7 @@ import org.eclipse.swt.widgets.Widget; * */ public abstract class AbstractComboBoxAdapter extends ControlAdapter - implements IComboBoxAdapter { + implements IComboComponent { /** number of clicks to give focus without selecting any text */ public static final int CLICK_COUNT_FOR_SELECTING_NONE = 3; diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/AbstractComponentAdapter.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/AbstractComponentAdapter.java index f1e7bd5bb..721abd716 100644 --- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/AbstractComponentAdapter.java +++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/AbstractComponentAdapter.java @@ -5,24 +5,15 @@ import org.eclipse.jubula.rc.common.driver.IEventThreadQueuer; import org.eclipse.jubula.rc.common.driver.IRobot; import org.eclipse.jubula.rc.common.driver.IRobotFactory; import org.eclipse.jubula.rc.common.exception.RobotException; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IComponentAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IComponent; import org.eclipse.jubula.rc.swt.driver.KeyCodeConverter; import org.eclipse.jubula.rc.swt.driver.RobotFactoryConfig; /** - * * @author BREDEX GmBH - * */ -public abstract class AbstractComponentAdapter implements IComponentAdapter { - - /** constants for communication */ - protected static final String POS_UNIT_PIXEL = "Pixel"; //$NON-NLS-1$ - /** constants for communication */ - protected static final String POS_UNI_PERCENT = "Percent"; //$NON-NLS-1$ - +public abstract class AbstractComponentAdapter implements IComponent { /** the RobotFactory from the AUT */ private IRobotFactory m_robotFactory; - /** * Gets the Robot factory. The factory is created once per instance. diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/ButtonAdapter.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/ButtonAdapter.java index 430d04e1c..e35f5c867 100644 --- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/ButtonAdapter.java +++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/ButtonAdapter.java @@ -11,7 +11,7 @@ package org.eclipse.jubula.rc.swt.tester.adapter; import org.eclipse.jubula.rc.common.driver.IRunnable; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IButtonAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IButtonComponent; import org.eclipse.jubula.rc.swt.tester.CAPUtil; import org.eclipse.jubula.rc.swt.utils.SwtUtils; import org.eclipse.swt.widgets.Button; @@ -20,7 +20,7 @@ import org.eclipse.swt.widgets.Button; * * @author BREDEX GmbH */ -public class ButtonAdapter extends ControlAdapter implements IButtonAdapter { +public class ButtonAdapter extends ControlAdapter implements IButtonComponent { /** the Button from the AUT */ private Button m_button; diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/CLabelAdapter.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/CLabelAdapter.java index 157491a81..aa31f3904 100644 --- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/CLabelAdapter.java +++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/CLabelAdapter.java @@ -11,14 +11,14 @@ package org.eclipse.jubula.rc.swt.tester.adapter; import org.eclipse.jubula.rc.common.driver.IRunnable; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITextVerifiable; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITextComponent; import org.eclipse.jubula.rc.swt.tester.CAPUtil; import org.eclipse.jubula.rc.swt.utils.SwtUtils; import org.eclipse.swt.custom.CLabel; /** * @author BREDEX GmbH */ -public class CLabelAdapter extends ControlAdapter implements ITextVerifiable { +public class CLabelAdapter extends ControlAdapter implements ITextComponent { /** * @param objectToAdapt the component to adapt diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/CTabFolderAdapter.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/CTabFolderAdapter.java index ac3f288bb..ddfeed881 100644 --- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/CTabFolderAdapter.java +++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/CTabFolderAdapter.java @@ -13,7 +13,7 @@ package org.eclipse.jubula.rc.swt.tester.adapter; import org.eclipse.jubula.rc.common.driver.IRunnable; import org.eclipse.jubula.rc.common.exception.StepExecutionException; import org.eclipse.jubula.rc.common.logger.AutServerLogger; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITabPaneAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITabbedComponent; import org.eclipse.jubula.rc.swt.tester.CAPUtil; import org.eclipse.jubula.rc.swt.utils.SwtUtils; import org.eclipse.swt.custom.CTabFolder; @@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.Control; * */ public class CTabFolderAdapter extends ControlAdapter - implements ITabPaneAdapter { + implements ITabbedComponent { /** the logger */ private static AutServerLogger log = diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/ControlAdapter.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/ControlAdapter.java index 4ce482933..ac5f2e859 100644 --- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/ControlAdapter.java +++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/ControlAdapter.java @@ -13,7 +13,7 @@ package org.eclipse.jubula.rc.swt.tester.adapter; import org.eclipse.jubula.rc.common.driver.IRunnable; import org.eclipse.jubula.rc.common.exception.RobotException; import org.eclipse.jubula.rc.common.exception.StepExecutionException; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IWidgetAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IWidgetComponent; import org.eclipse.jubula.rc.swt.tester.util.EventListener; import org.eclipse.jubula.tools.objects.event.EventFactory; import org.eclipse.jubula.tools.objects.event.TestErrorEvent; @@ -27,8 +27,8 @@ import org.eclipse.swt.widgets.Menu; * * @author BREDEX GmbH */ -public class ControlAdapter extends AbstractWidgetAdapter - implements IWidgetAdapter { +public class ControlAdapter extends WidgetAdapter + implements IWidgetComponent { /** */ diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/LabelAdapter.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/LabelAdapter.java index 5782f8675..6e985ba43 100644 --- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/LabelAdapter.java +++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/LabelAdapter.java @@ -11,14 +11,14 @@ package org.eclipse.jubula.rc.swt.tester.adapter; import org.eclipse.jubula.rc.common.driver.IRunnable; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITextVerifiable; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITextComponent; import org.eclipse.jubula.rc.swt.tester.CAPUtil; import org.eclipse.jubula.rc.swt.utils.SwtUtils; import org.eclipse.swt.widgets.Label; /** * @author BREDEX GmbH */ -public class LabelAdapter extends ControlAdapter implements ITextVerifiable { +public class LabelAdapter extends ControlAdapter implements ITextComponent { /** * @param objectToAdapt the component to adapt diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/ListAdapter.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/ListAdapter.java index 27e0e9f5e..7e94adaa7 100644 --- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/ListAdapter.java +++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/ListAdapter.java @@ -13,7 +13,7 @@ package org.eclipse.jubula.rc.swt.tester.adapter; import org.eclipse.jubula.rc.common.driver.ClickOptions; import org.eclipse.jubula.rc.common.driver.IRunnable; import org.eclipse.jubula.rc.common.exception.StepExecutionException; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IListAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IListComponent; import org.eclipse.jubula.rc.swt.utils.SwtUtils; import org.eclipse.jubula.tools.objects.event.EventFactory; import org.eclipse.jubula.tools.objects.event.TestErrorEvent; @@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.List; /** * @author BREDEX GmbH */ -public class ListAdapter extends ControlAdapter implements IListAdapter { +public class ListAdapter extends ControlAdapter implements IListComponent { /** the list */ private List m_list; diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/MenuAdapter.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/MenuAdapter.java index 69f059bf4..f44243e50 100644 --- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/MenuAdapter.java +++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/MenuAdapter.java @@ -14,8 +14,8 @@ import org.eclipse.jubula.rc.common.driver.IEventThreadQueuer; import org.eclipse.jubula.rc.common.driver.IRobot; import org.eclipse.jubula.rc.common.driver.IRunnable; import org.eclipse.jubula.rc.common.exception.RobotException; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuAdapter; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuItemAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuComponent; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuItemComponent; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.MenuItem; @@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.MenuItem; * @author BREDEX GmbH */ public class MenuAdapter extends AbstractComponentAdapter - implements IMenuAdapter { + implements IMenuComponent { /** the Menu from the AUT */ private Menu m_menu; @@ -70,7 +70,7 @@ public class MenuAdapter extends AbstractComponentAdapter /** * {@inheritDoc} */ - public IMenuItemAdapter[] getItems() { + public IMenuItemComponent[] getItems() { MenuItem[] items = (MenuItem[]) getEventThreadQueuer().invokeAndWait( @@ -79,9 +79,9 @@ public class MenuAdapter extends AbstractComponentAdapter return m_menu.getItems(); } }); - IMenuItemAdapter[] adapters = new IMenuItemAdapter[items.length]; + IMenuItemComponent[] adapters = new IMenuItemComponent[items.length]; for (int i = 0; i < items.length; i++) { - IMenuItemAdapter menuItem = new MenuItemAdapter(items[i]); + IMenuItemComponent menuItem = new MenuItemAdapter(items[i]); adapters[i] = menuItem; } return adapters; diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/MenuItemAdapter.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/MenuItemAdapter.java index a12b9a6d6..8736fb9fd 100644 --- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/MenuItemAdapter.java +++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/MenuItemAdapter.java @@ -22,8 +22,8 @@ import org.eclipse.jubula.rc.common.exception.RobotException; import org.eclipse.jubula.rc.common.exception.StepExecutionException; import org.eclipse.jubula.rc.common.listener.EventLock; import org.eclipse.jubula.rc.common.logger.AutServerLogger; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuAdapter; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuItemAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuComponent; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IMenuItemComponent; import org.eclipse.jubula.rc.swt.driver.EventThreadQueuerSwtImpl; import org.eclipse.jubula.rc.swt.driver.RobotFactorySwtImpl; import org.eclipse.jubula.rc.swt.driver.SelectionSwtEventMatcher; @@ -50,7 +50,7 @@ import org.eclipse.swt.widgets.MenuItem; * @author BREDEX GmbH */ public class MenuItemAdapter extends AbstractComponentAdapter - implements IMenuItemAdapter { + implements IMenuItemComponent { /** The logging. */ private static AutServerLogger log = @@ -166,7 +166,7 @@ public class MenuItemAdapter extends AbstractComponentAdapter /** * {@inheritDoc} */ - public IMenuAdapter getMenu() { + public IMenuComponent getMenu() { Menu menu = (Menu) getEventThreadQueuer().invokeAndWait( @@ -229,7 +229,7 @@ public class MenuItemAdapter extends AbstractComponentAdapter /** * {@inheritDoc} */ - public IMenuAdapter openSubMenu() { + public IMenuComponent openSubMenu() { final MenuItem menuItem = m_menuItem; MenuShownCondition cond = new MenuShownCondition(menuItem); EventLock lock = new EventLock(); diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/StyledTextAdapter.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/StyledTextAdapter.java index 49469f02c..b5cb17807 100644 --- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/StyledTextAdapter.java +++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/StyledTextAdapter.java @@ -13,7 +13,7 @@ package org.eclipse.jubula.rc.swt.tester.adapter; import org.eclipse.jubula.rc.common.driver.IRunnable; import org.eclipse.jubula.rc.common.exception.StepExecutionException; import org.eclipse.jubula.rc.common.logger.AutServerLogger; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITextComponentAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITextInputComponent; import org.eclipse.jubula.rc.swt.tester.CAPUtil; import org.eclipse.jubula.tools.utils.EnvironmentUtils; import org.eclipse.swt.custom.StyledText; @@ -25,7 +25,7 @@ import org.eclipse.swt.custom.StyledText; * */ public class StyledTextAdapter extends ControlAdapter - implements ITextComponentAdapter { + implements ITextInputComponent { /** the logger */ private static AutServerLogger log = new AutServerLogger( diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/TabFolderAdapter.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/TabFolderAdapter.java index a23449850..65f216ba1 100644 --- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/TabFolderAdapter.java +++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/TabFolderAdapter.java @@ -12,7 +12,7 @@ package org.eclipse.jubula.rc.swt.tester.adapter; import org.eclipse.jubula.rc.common.driver.IRunnable; import org.eclipse.jubula.rc.common.exception.StepExecutionException; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITabPaneAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITabbedComponent; import org.eclipse.jubula.rc.swt.tester.CAPUtil; import org.eclipse.jubula.rc.swt.utils.SwtUtils; import org.eclipse.swt.widgets.TabFolder; @@ -24,7 +24,7 @@ import org.eclipse.swt.widgets.TabItem; * */ public class TabFolderAdapter extends ControlAdapter - implements ITabPaneAdapter { + implements ITabbedComponent { /** the tabFolder from the AUT */ private TabFolder m_tabFolder; diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/TableAdapter.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/TableAdapter.java index b1a61e312..b06e5a07f 100644 --- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/TableAdapter.java +++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/TableAdapter.java @@ -17,7 +17,7 @@ import org.eclipse.jubula.rc.common.driver.IRunnable; import org.eclipse.jubula.rc.common.exception.StepExecutionException; import org.eclipse.jubula.rc.common.implclasses.table.Cell; import org.eclipse.jubula.rc.common.logger.AutServerLogger; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITableAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITableComponent; import org.eclipse.jubula.rc.common.util.IndexConverter; import org.eclipse.jubula.rc.common.util.MatchUtil; import org.eclipse.jubula.rc.swt.listener.TableSelectionTracker; @@ -38,7 +38,7 @@ import org.eclipse.swt.widgets.TableItem; * * @author BREDEX GmbH */ -public class TableAdapter extends ControlAdapter implements ITableAdapter { +public class TableAdapter extends ControlAdapter implements ITableComponent { /** the logger */ private static AutServerLogger log = new AutServerLogger( diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/TextComponentAdapter.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/TextComponentAdapter.java index bdb8959e0..c3048866e 100644 --- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/TextComponentAdapter.java +++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/TextComponentAdapter.java @@ -13,7 +13,7 @@ package org.eclipse.jubula.rc.swt.tester.adapter; import org.eclipse.jubula.rc.common.driver.IRunnable; import org.eclipse.jubula.rc.common.exception.StepExecutionException; import org.eclipse.jubula.rc.common.logger.AutServerLogger; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITextComponentAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITextInputComponent; import org.eclipse.jubula.rc.swt.tester.CAPUtil; import org.eclipse.jubula.tools.utils.EnvironmentUtils; import org.eclipse.swt.widgets.Text; @@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Text; * */ public class TextComponentAdapter extends ControlAdapter implements - ITextComponentAdapter { + ITextInputComponent { /** the logger */ private static AutServerLogger log = new AutServerLogger( diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/ToolItemAdapter.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/ToolItemAdapter.java index 62fb5a0d1..8333b740c 100644 --- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/ToolItemAdapter.java +++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/ToolItemAdapter.java @@ -13,7 +13,7 @@ package org.eclipse.jubula.rc.swt.tester.adapter; import org.eclipse.jubula.rc.common.driver.IRunnable; import org.eclipse.jubula.rc.common.exception.RobotException; import org.eclipse.jubula.rc.common.exception.StepExecutionException; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IButtonAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.IButtonComponent; import org.eclipse.jubula.rc.swt.utils.SwtUtils; import org.eclipse.jubula.tools.objects.event.EventFactory; import org.eclipse.jubula.tools.objects.event.TestErrorEvent; @@ -23,8 +23,8 @@ import org.eclipse.swt.widgets.ToolItem; * @author BREDEX GmbH * @created 18.02.2013 */ -public class ToolItemAdapter extends AbstractWidgetAdapter implements - IButtonAdapter { +public class ToolItemAdapter extends WidgetAdapter implements + IButtonComponent { /** The ToolItem */ private ToolItem m_item = null; diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/TreeAdapter.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/TreeAdapter.java index ecd047f29..00c033d3d 100644 --- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/TreeAdapter.java +++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/TreeAdapter.java @@ -12,7 +12,7 @@ package org.eclipse.jubula.rc.swt.tester.adapter; import org.eclipse.jubula.rc.common.driver.IRunnable; import org.eclipse.jubula.rc.common.implclasses.tree.AbstractTreeOperationContext; -import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITreeAdapter; +import org.eclipse.jubula.rc.common.tester.adapter.interfaces.ITreeComponent; import org.eclipse.jubula.rc.swt.tester.tree.TreeOperationContext; import org.eclipse.swt.widgets.Tree; /** @@ -20,7 +20,7 @@ import org.eclipse.swt.widgets.Tree; * * @author BREDEX GmbH */ -public class TreeAdapter extends ControlAdapter implements ITreeAdapter { +public class TreeAdapter extends ControlAdapter implements ITreeComponent { /** * @param objectToAdapt graphics component which will be adapted */ diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/AbstractWidgetAdapter.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/WidgetAdapter.java index 1e64b7722..b2726ac91 100644 --- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/AbstractWidgetAdapter.java +++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/WidgetAdapter.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.jubula.rc.swt.tester.adapter; +import org.eclipse.jubula.rc.common.CompSystemConstants; import org.eclipse.jubula.rc.common.driver.ClickOptions; import org.eclipse.jubula.rc.common.driver.IEventThreadQueuer; import org.eclipse.jubula.rc.common.driver.IRobot; @@ -38,18 +39,17 @@ import org.eclipse.swt.widgets.Widget; * @author BREDEX GmbH * @created 18.02.2013 */ -public abstract class AbstractWidgetAdapter extends AbstractComponentAdapter { - +public class WidgetAdapter extends AbstractComponentAdapter { /** the widget */ - private Widget m_component = null; + private Widget m_component = null; /** - * * @param objectToAdapt the component */ - public AbstractWidgetAdapter(Object objectToAdapt) { + public WidgetAdapter(Object objectToAdapt) { m_component = (Widget) objectToAdapt; } + /** * {@inheritDoc} */ @@ -127,8 +127,10 @@ public abstract class AbstractWidgetAdapter extends AbstractComponentAdapter { m_component, null, ClickOptions.create().setClickCount(count).setMouseButton( - button), xPos, xUnits.equalsIgnoreCase(POS_UNIT_PIXEL), - yPos, yUnits.equalsIgnoreCase(POS_UNIT_PIXEL)); + button), xPos, xUnits.equalsIgnoreCase( + CompSystemConstants.POS_UNIT_PIXEL), + yPos, yUnits.equalsIgnoreCase( + CompSystemConstants.POS_UNIT_PIXEL)); } @@ -150,8 +152,8 @@ public abstract class AbstractWidgetAdapter extends AbstractComponentAdapter { } }); } - return showPopup(50, POS_UNI_PERCENT, 50, - POS_UNI_PERCENT, button); + return showPopup(50, CompSystemConstants.POS_UNIT_PERCENT, 50, + CompSystemConstants.POS_UNIT_PERCENT, button); } /** @@ -174,10 +176,10 @@ public abstract class AbstractWidgetAdapter extends AbstractComponentAdapter { public void run() { RobotTiming.sleepPreShowPopupDelay(); boolean isAbsoluteUnitsX = - POS_UNIT_PIXEL.equalsIgnoreCase( + CompSystemConstants.POS_UNIT_PIXEL.equalsIgnoreCase( xUnits); boolean isAbsoluteUnitsY = - POS_UNIT_PIXEL.equalsIgnoreCase( + CompSystemConstants.POS_UNIT_PIXEL.equalsIgnoreCase( yUnits); getRobot().click(component, null, ClickOptions.create().setClickCount(1) diff --git a/org.eclipse.jubula.toolkit.common/resources/xml/ToolkitComponentConfiguration.xsd b/org.eclipse.jubula.toolkit.common/resources/xml/ToolkitComponentConfiguration.xsd index 8677581a9..f7e9631a5 100644 --- a/org.eclipse.jubula.toolkit.common/resources/xml/ToolkitComponentConfiguration.xsd +++ b/org.eclipse.jubula.toolkit.common/resources/xml/ToolkitComponentConfiguration.xsd @@ -8,6 +8,7 @@ <xs:element ref="configVersion" />
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element ref="abstractComponent" />
+ <xs:element ref="concreteComponent" />
<xs:element ref="toolkitComponent" />
</xs:choice>
</xs:sequence>
@@ -18,15 +19,11 @@ <xs:sequence>
<xs:element ref="majorVersion" />
<xs:element ref="minorVersion" />
- <xs:element ref="majorCustomVersion" />
- <xs:element ref="minorCustomVersion" />
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="majorVersion" type="xs:string" />
<xs:element name="minorVersion" type="xs:string" />
- <xs:element name="majorCustomVersion" type="xs:string" />
- <xs:element name="minorCustomVersion" type="xs:string" />
<xs:element name="toolkitComponent">
<xs:complexType>
<xs:sequence>
@@ -104,4 +101,31 @@ <xs:attribute name="name" use="required" type="xs:string" />
<xs:attribute name="value" use="required" type="xs:string" />
</xs:complexType>
- </xs:element>
</xs:schema>
+ </xs:element>
+ <xs:element name="concreteComponent">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" ref="defaultMapping"/>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="realizes"/>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="extends"/>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="action"/>
+ </xs:sequence>
+ <xs:attribute name="type" use="required" type="xs:ID"/>
+ <xs:attribute name="visible" default="true">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true"/>
+ <xs:enumeration value="false"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="changed"/>
+ <xs:attribute name="deprecated">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
</xs:schema>
diff --git a/org.eclipse.jubula.toolkit.provider.base/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.provider.base/resources/xml/ComponentConfiguration.xml index 3a3efd5c4..0b324bdce 100644 --- a/org.eclipse.jubula.toolkit.provider.base/resources/xml/ComponentConfiguration.xml +++ b/org.eclipse.jubula.toolkit.provider.base/resources/xml/ComponentConfiguration.xml @@ -9,9 +9,8 @@ <!-- 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="ComponentConfiguration.xsd">
- <configVersion>
- <majorVersion>4</majorVersion> +<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>
</configVersion>
diff --git a/org.eclipse.jubula.toolkit.provider.base/resources/xml/ComponentConfiguration.xsd b/org.eclipse.jubula.toolkit.provider.base/resources/xml/ComponentConfiguration.xsd deleted file mode 100644 index 38729cc84..000000000 --- a/org.eclipse.jubula.toolkit.provider.base/resources/xml/ComponentConfiguration.xsd +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-<xs:include schemaLocation="../../../ToolkitSupportPlugin/resources/xml/CommonComponentConfiguration.xsd"/>
- <xs:element name="compSystem">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="configVersion"/>
- <xs:element maxOccurs="unbounded" ref="abstractComponent"/>
- </xs:sequence>
- <xs:attribute name="basicTesterClassName" use="optional" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="configVersion">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="majorVersion"/>
- <xs:element ref="minorVersion"/>
- <xs:element ref="majorCustomVersion"/>
- <xs:element ref="minorCustomVersion"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="majorVersion" type="xs:string"/>
- <xs:element name="minorVersion" type="xs:string"/>
- <xs:element name="majorCustomVersion" type="xs:string"/>
- <xs:element name="minorCustomVersion" type="xs:string"/>
- <xs:element name="abstractComponent">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="realizes"/>
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="action"/>
- </xs:sequence>
- <xs:attribute name="type" use="required" type="xs:ID"/>
- <xs:attribute name="visible" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="changed"/>
- <xs:attribute name="deprecated">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
-</xs:schema>
diff --git a/org.eclipse.jubula.toolkit.provider.concrete/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.provider.concrete/resources/xml/ComponentConfiguration.xml index d489bc473..513c10f3a 100644 --- a/org.eclipse.jubula.toolkit.provider.concrete/resources/xml/ComponentConfiguration.xml +++ b/org.eclipse.jubula.toolkit.provider.concrete/resources/xml/ComponentConfiguration.xml @@ -9,8 +9,7 @@ <!-- 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="ComponentConfiguration.xsd">
- <configVersion>
+<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>
</configVersion>
diff --git a/org.eclipse.jubula.toolkit.provider.concrete/resources/xml/ComponentConfiguration.xsd b/org.eclipse.jubula.toolkit.provider.concrete/resources/xml/ComponentConfiguration.xsd deleted file mode 100644 index 1ecd43408..000000000 --- a/org.eclipse.jubula.toolkit.provider.concrete/resources/xml/ComponentConfiguration.xsd +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-<xs:include schemaLocation="../../../ToolkitSupportPlugin/resources/xml/CommonComponentConfiguration.xsd"/>
- <xs:element name="compSystem">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="configVersion"/>
- <xs:element maxOccurs="unbounded" ref="concreteComponent"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="configVersion">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="majorVersion"/>
- <xs:element ref="minorVersion"/>
- <xs:element ref="majorCustomVersion"/>
- <xs:element ref="minorCustomVersion"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="majorVersion" type="xs:string"/>
- <xs:element name="minorVersion" type="xs:string"/>
- <xs:element name="majorCustomVersion" type="xs:string"/>
- <xs:element name="minorCustomVersion" type="xs:string"/>
- <xs:element name="concreteComponent">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" ref="defaultMapping"/> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="realizes"/>
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="extends"/>
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="action"/>
- </xs:sequence>
- <xs:attribute name="type" use="required" type="xs:ID"/>
- <xs:attribute name="visible" default="true">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="changed"/>
- <xs:attribute name="deprecated">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
- </xs:element>
-</xs:schema>
diff --git a/org.eclipse.jubula.toolkit.provider.html/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.provider.html/resources/xml/ComponentConfiguration.xml index 2e317dcf5..985ea60df 100644 --- a/org.eclipse.jubula.toolkit.provider.html/resources/xml/ComponentConfiguration.xml +++ b/org.eclipse.jubula.toolkit.provider.html/resources/xml/ComponentConfiguration.xml @@ -12,8 +12,7 @@ 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="ComponentConfiguration.xsd"> +<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> <minorVersion>1</minorVersion> diff --git a/org.eclipse.jubula.toolkit.provider.html/resources/xml/ComponentConfiguration.xsd b/org.eclipse.jubula.toolkit.provider.html/resources/xml/ComponentConfiguration.xsd deleted file mode 100644 index ba64a8543..000000000 --- a/org.eclipse.jubula.toolkit.provider.html/resources/xml/ComponentConfiguration.xsd +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-<xs:include schemaLocation="../../../ToolkitSupportPlugin/resources/xml/ToolkitComponentConfiguration.xsd"/>
-
-</xs:schema>
diff --git a/org.eclipse.jubula.toolkit.provider.rcp.gef/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.provider.rcp.gef/resources/xml/ComponentConfiguration.xml index 4963c2b6b..99d161516 100644 --- a/org.eclipse.jubula.toolkit.provider.rcp.gef/resources/xml/ComponentConfiguration.xml +++ b/org.eclipse.jubula.toolkit.provider.rcp.gef/resources/xml/ComponentConfiguration.xml @@ -9,7 +9,7 @@ <!-- 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="ComponentConfiguration.xsd"> +<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.provider.rcp.gef/resources/xml/ComponentConfiguration.xsd b/org.eclipse.jubula.toolkit.provider.rcp.gef/resources/xml/ComponentConfiguration.xsd deleted file mode 100644 index 96ce5bcbe..000000000 --- a/org.eclipse.jubula.toolkit.provider.rcp.gef/resources/xml/ComponentConfiguration.xsd +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"> -<xs:include schemaLocation="../../../ToolkitSupportPlugin/resources/xml/ToolkitComponentConfiguration.xsd"/> - -</xs:schema> diff --git a/org.eclipse.jubula.toolkit.provider.rcp/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.provider.rcp/resources/xml/ComponentConfiguration.xml index ca3659fef..bd3bf5023 100644 --- a/org.eclipse.jubula.toolkit.provider.rcp/resources/xml/ComponentConfiguration.xml +++ b/org.eclipse.jubula.toolkit.provider.rcp/resources/xml/ComponentConfiguration.xml @@ -9,12 +9,8 @@ <!-- 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="ComponentConfiguration.xsd">
- <configVersion>
+<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>
</configVersion>
-
-
-
</compSystem>
\ No newline at end of file diff --git a/org.eclipse.jubula.toolkit.provider.rcp/resources/xml/ComponentConfiguration.xsd b/org.eclipse.jubula.toolkit.provider.rcp/resources/xml/ComponentConfiguration.xsd deleted file mode 100644 index ba64a8543..000000000 --- a/org.eclipse.jubula.toolkit.provider.rcp/resources/xml/ComponentConfiguration.xsd +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-<xs:include schemaLocation="../../../ToolkitSupportPlugin/resources/xml/ToolkitComponentConfiguration.xsd"/>
-
-</xs:schema>
diff --git a/org.eclipse.jubula.toolkit.provider.swing/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.provider.swing/resources/xml/ComponentConfiguration.xml index 796a7797b..042e06178 100644 --- a/org.eclipse.jubula.toolkit.provider.swing/resources/xml/ComponentConfiguration.xml +++ b/org.eclipse.jubula.toolkit.provider.swing/resources/xml/ComponentConfiguration.xml @@ -9,8 +9,7 @@ <!-- 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="ComponentConfiguration.xsd">
- <configVersion>
+<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>
</configVersion>
diff --git a/org.eclipse.jubula.toolkit.provider.swing/resources/xml/ComponentConfiguration.xsd b/org.eclipse.jubula.toolkit.provider.swing/resources/xml/ComponentConfiguration.xsd deleted file mode 100644 index ba64a8543..000000000 --- a/org.eclipse.jubula.toolkit.provider.swing/resources/xml/ComponentConfiguration.xsd +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-<xs:include schemaLocation="../../../ToolkitSupportPlugin/resources/xml/ToolkitComponentConfiguration.xsd"/>
-
-</xs:schema>
diff --git a/org.eclipse.jubula.toolkit.provider.swt/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.provider.swt/resources/xml/ComponentConfiguration.xml index 01b33caa8..ca99e0107 100644 --- a/org.eclipse.jubula.toolkit.provider.swt/resources/xml/ComponentConfiguration.xml +++ b/org.eclipse.jubula.toolkit.provider.swt/resources/xml/ComponentConfiguration.xml @@ -9,14 +9,11 @@ <!-- 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="ComponentConfiguration.xsd">
- <configVersion>
+<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>
</configVersion>
-
<!-- Concrete components -->
-
- <toolkitComponent type="org.eclipse.swt.widgets.ToolItem">
+
<toolkitComponent type="org.eclipse.swt.widgets.ToolItem">
<realizes>guidancer.abstract.SwtItem</realizes>
<testerClass>org.eclipse.jubula.rc.swt.tester.ToolItemTester</testerClass>
<componentClass name="org.eclipse.swt.widgets.ToolItem" />
diff --git a/org.eclipse.jubula.toolkit.provider.swt/resources/xml/ComponentConfiguration.xsd b/org.eclipse.jubula.toolkit.provider.swt/resources/xml/ComponentConfiguration.xsd deleted file mode 100644 index ba64a8543..000000000 --- a/org.eclipse.jubula.toolkit.provider.swt/resources/xml/ComponentConfiguration.xsd +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-<xs:include schemaLocation="../../../ToolkitSupportPlugin/resources/xml/ToolkitComponentConfiguration.xsd"/>
-
-</xs:schema>
|