Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarvin Mueller2017-01-11 07:19:24 +0000
committerMarvin Mueller2017-01-11 13:49:01 +0000
commitd486e05359cf0f693edb16d198e4773824fbabd5 (patch)
treea1fce72ed00ac3c3d84f2ef1d935b59b618865db
parent385b6dfc95b9da5e1457e5b6f27ac1f5f7be0d6b (diff)
downloadorg.eclipse.jubula.core-d486e05359cf0f693edb16d198e4773824fbabd5.tar.gz
org.eclipse.jubula.core-d486e05359cf0f693edb16d198e4773824fbabd5.tar.xz
org.eclipse.jubula.core-d486e05359cf0f693edb16d198e4773824fbabd5.zip
Fix for Bug 510230 - check existence of nested column is mostly wrong
-rw-r--r--org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/TableAdapter.java11
1 files changed, 4 insertions, 7 deletions
diff --git a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/TableAdapter.java b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/TableAdapter.java
index 011a8104c..525ab767f 100644
--- a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/TableAdapter.java
+++ b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/tester/adapter/TableAdapter.java
@@ -204,7 +204,6 @@ public class TableAdapter extends JavaFXComponentAdapter<TableView<?>>
@Override
public Integer call() throws Exception {
TableView table = getRealComponent();
-
List<String> path = StringParsing.splitToList(colPath,
TestDataConstants.PATH_CHAR_DEFAULT,
TestDataConstants.ESCAPE_CHAR_DEFAULT, false);
@@ -243,7 +242,7 @@ public class TableAdapter extends JavaFXComponentAdapter<TableView<?>>
Iterator<String> pathIterator = path.iterator();
String currCol = null;
TableColumn<?, ?> column = null;
- while (pathIterator.hasNext()) {
+ pathIteration: while (pathIterator.hasNext()) {
try {
currCol = pathIterator.next();
int usrIdxCol = Integer.parseInt(currCol);
@@ -269,10 +268,7 @@ public class TableAdapter extends JavaFXComponentAdapter<TableView<?>>
column = columns.get(i);
}
} catch (IndexOutOfBoundsException e) {
- throw new StepExecutionException(
- "Invalid Index: " + IndexConverter.toUserIndex(i), //$NON-NLS-1$
- EventFactory.createActionError(
- TestErrorEvent.INVALID_INDEX));
+ return null;
}
}
} catch (NumberFormatException nfe) {
@@ -292,9 +288,10 @@ public class TableAdapter extends JavaFXComponentAdapter<TableView<?>>
if (pathIterator.hasNext()) {
columns = c.getColumns();
}
- break;
+ continue pathIteration;
}
}
+ return null;
} catch (IllegalArgumentException iae) {
// do nothing here
}

Back to the top