Fix for Bug 510230 - check existence of nested column is mostly wrongv8.4.1.1238.4

(cherry picked from commit d486e05359cf0f693edb16d198e4773824fbabd5)
Change-Id: I9e21c75c180452a9495ee120ee0823b4e7e3ecce

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
                 }