Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Tiede2014-10-15 13:42:16 +0000
committerMarkus Tiede2014-10-15 14:22:51 +0000
commitbb1674d045866a45a4099808d6244d50f09a2e89 (patch)
treef4661a1944a92e50ebefe21c44259977fb4031a5 /org.eclipse.jubula.rc.swt
parentc5bbad54915f3b2dfb45d32b56eb03cf2cd37968 (diff)
downloadorg.eclipse.jubula.core-bb1674d045866a45a4099808d6244d50f09a2e89.tar.gz
org.eclipse.jubula.core-bb1674d045866a45a4099808d6244d50f09a2e89.tar.xz
org.eclipse.jubula.core-bb1674d045866a45a4099808d6244d50f09a2e89.zip
Sprint task - transfer toolkit specific information: keyboard layout for SWT / RCP AUTs: re-located mappings and API.
Diffstat (limited to 'org.eclipse.jubula.rc.swt')
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/components/FindSWTComponentBP.java6
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/components/SwtAUTHierarchy.java4
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/CAPUtil.java4
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/TableTester.java4
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/adapter/TableAdapter.java4
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/tree/TableTreeOperationContext.java4
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/tree/TreeOperationContext.java4
7 files changed, 15 insertions, 15 deletions
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/components/FindSWTComponentBP.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/components/FindSWTComponentBP.java
index 8dae6d97d..7dc9874bd 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/components/FindSWTComponentBP.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/components/FindSWTComponentBP.java
@@ -14,7 +14,7 @@ import org.eclipse.jubula.rc.common.components.FindComponentBP;
import org.eclipse.jubula.rc.common.driver.IRunnable;
import org.eclipse.jubula.rc.common.exception.StepExecutionException;
import org.eclipse.jubula.rc.swt.driver.EventThreadQueuerSwtImpl;
-import org.eclipse.jubula.tools.internal.constants.SwtAUTHierarchyConstants;
+import org.eclipse.jubula.tools.internal.constants.SwtToolkitConstants;
import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Widget;
@@ -88,11 +88,11 @@ public class FindSWTComponentBP extends FindComponentBP {
*/
public static String getComponentName(Widget w) {
String compName = null;
- Object o = w.getData(SwtAUTHierarchyConstants.WIDGET_NAME);
+ Object o = w.getData(SwtToolkitConstants.WIDGET_NAME);
if (o != null) {
compName = o.toString();
} else {
- o = w.getData(SwtAUTHierarchyConstants.WIDGET_NAME_FALLBACK);
+ o = w.getData(SwtToolkitConstants.WIDGET_NAME_FALLBACK);
if (o != null) {
compName = o.toString();
}
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/components/SwtAUTHierarchy.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/components/SwtAUTHierarchy.java
index 72b40fd21..64c2a5151 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/components/SwtAUTHierarchy.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/components/SwtAUTHierarchy.java
@@ -32,7 +32,7 @@ import org.eclipse.jubula.rc.common.exception.ComponentNotManagedException;
import org.eclipse.jubula.rc.common.logger.AutServerLogger;
import org.eclipse.jubula.rc.swt.listener.ComponentHandler;
import org.eclipse.jubula.rc.swt.utils.SwtUtils;
-import org.eclipse.jubula.tools.internal.constants.SwtAUTHierarchyConstants;
+import org.eclipse.jubula.tools.internal.constants.SwtToolkitConstants;
import org.eclipse.jubula.tools.internal.exception.InvalidDataException;
import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs;
import org.eclipse.jubula.tools.internal.objects.ComponentIdentifier;
@@ -816,7 +816,7 @@ public class SwtAUTHierarchy extends AUTHierarchy {
String originalName = null;
String newName = null;
Object rcpCompId = component
- .getData(SwtAUTHierarchyConstants.RCP_NAME);
+ .getData(SwtToolkitConstants.RCP_NAME);
boolean newNameGenerated = false;
if (compName != null) {
newName = compName.toString();
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/CAPUtil.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/CAPUtil.java
index d998e8d91..dab10c4b3 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/CAPUtil.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/CAPUtil.java
@@ -18,7 +18,7 @@ import org.eclipse.jubula.rc.common.driver.IRobot;
import org.eclipse.jubula.rc.common.util.KeyStrokeUtil;
import org.eclipse.jubula.rc.swt.driver.KeyCodeConverter;
import org.eclipse.jubula.rc.swt.driver.SwtRobot;
-import org.eclipse.jubula.tools.internal.constants.SwtAUTHierarchyConstants;
+import org.eclipse.jubula.tools.internal.constants.SwtToolkitConstants;
import org.eclipse.jubula.tools.internal.utils.EnvironmentUtils;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Widget;
@@ -123,7 +123,7 @@ public class CAPUtil {
*/
public static String getWidgetText(final Widget widget,
final String fallbackText) {
- return getWidgetText(widget, SwtAUTHierarchyConstants.WIDGET_TEXT_KEY,
+ return getWidgetText(widget, SwtToolkitConstants.WIDGET_TEXT_KEY,
fallbackText);
}
}
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 f054691f4..15cf8ce1a 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
@@ -30,7 +30,7 @@ import org.eclipse.jubula.rc.swt.tester.adapter.TextComponentAdapter;
import org.eclipse.jubula.rc.swt.utils.SwtUtils;
import org.eclipse.jubula.toolkit.enums.ValueSets;
import org.eclipse.jubula.tools.internal.constants.InputConstants;
-import org.eclipse.jubula.tools.internal.constants.SwtAUTHierarchyConstants;
+import org.eclipse.jubula.tools.internal.constants.SwtToolkitConstants;
import org.eclipse.jubula.tools.internal.objects.event.EventFactory;
import org.eclipse.jubula.tools.internal.objects.event.TestErrorEvent;
import org.eclipse.jubula.tools.internal.utils.EnvironmentUtils;
@@ -313,7 +313,7 @@ public class TableTester extends AbstractTableTester {
org.eclipse.swt.graphics.Rectangle r =
ti.getBounds(column);
String text = CAPUtil.getWidgetText(ti,
- SwtAUTHierarchyConstants.WIDGET_TEXT_KEY_PREFIX
+ SwtToolkitConstants.WIDGET_TEXT_KEY_PREFIX
+ column, ti.getText(column));
Image image = ti.getImage(column);
if (text != null && text.length() != 0) {
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 268ba480f..eaf0b725a 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
@@ -24,7 +24,7 @@ import org.eclipse.jubula.rc.swt.listener.TableSelectionTracker;
import org.eclipse.jubula.rc.swt.tester.CAPUtil;
import org.eclipse.jubula.rc.swt.tester.TableTester;
import org.eclipse.jubula.rc.swt.utils.SwtUtils;
-import org.eclipse.jubula.tools.internal.constants.SwtAUTHierarchyConstants;
+import org.eclipse.jubula.tools.internal.constants.SwtToolkitConstants;
import org.eclipse.jubula.tools.internal.objects.event.EventFactory;
import org.eclipse.jubula.tools.internal.objects.event.TestErrorEvent;
import org.eclipse.swt.SWT;
@@ -85,7 +85,7 @@ public class TableAdapter extends ControlAdapter implements ITableComponent {
public Object run() {
final TableItem item = m_table.getItem(row);
String value = CAPUtil.getWidgetText(item,
- SwtAUTHierarchyConstants.WIDGET_TEXT_KEY_PREFIX
+ SwtToolkitConstants.WIDGET_TEXT_KEY_PREFIX
+ column, item.getText(column));
if (log.isDebugEnabled()) {
log.debug("Getting cell text:"); //$NON-NLS-1$
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/tree/TableTreeOperationContext.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/tree/TableTreeOperationContext.java
index 189243a49..f1454a4bc 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/tree/TableTreeOperationContext.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/tree/TableTreeOperationContext.java
@@ -21,7 +21,7 @@ import org.eclipse.jubula.rc.common.util.IndexConverter;
import org.eclipse.jubula.rc.swt.tester.CAPUtil;
import org.eclipse.jubula.rc.swt.utils.SwtPointUtil;
import org.eclipse.jubula.rc.swt.utils.SwtUtils;
-import org.eclipse.jubula.tools.internal.constants.SwtAUTHierarchyConstants;
+import org.eclipse.jubula.tools.internal.constants.SwtToolkitConstants;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Tree;
@@ -102,7 +102,7 @@ public class TableTreeOperationContext extends TreeOperationContext {
public Object run() {
return CAPUtil.getWidgetText(item,
- SwtAUTHierarchyConstants.WIDGET_TEXT_KEY_PREFIX
+ SwtToolkitConstants.WIDGET_TEXT_KEY_PREFIX
+ m_column, item.getText(m_column));
}
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/tree/TreeOperationContext.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/tree/TreeOperationContext.java
index e4aea0b05..7fd17a3a4 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/tree/TreeOperationContext.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/tester/tree/TreeOperationContext.java
@@ -26,7 +26,7 @@ import org.eclipse.jubula.rc.common.util.Verifier;
import org.eclipse.jubula.rc.swt.tester.CAPUtil;
import org.eclipse.jubula.rc.swt.utils.SwtPointUtil;
import org.eclipse.jubula.rc.swt.utils.SwtUtils;
-import org.eclipse.jubula.tools.internal.constants.SwtAUTHierarchyConstants;
+import org.eclipse.jubula.tools.internal.constants.SwtToolkitConstants;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Event;
@@ -518,7 +518,7 @@ public class TreeOperationContext extends AbstractTreeOperationContext {
for (int i = 0; i < colCount; i++) {
String textAtColumn = CAPUtil.getWidgetText(item,
- SwtAUTHierarchyConstants.WIDGET_TEXT_KEY_PREFIX
+ SwtToolkitConstants.WIDGET_TEXT_KEY_PREFIX
+ i, item.getText(i));
if (textAtColumn != null) {
res.add(textAtColumn);

Back to the top