commit e556f5d20446c3e993d1f3c5ccf650e5d67d5965
author Stephan Wahlbrink <sw@wahlbrink.eu> Fri Oct 25 12:03:45 2019 +0200
committer Stephan Wahlbrink <sw@wahlbrink.eu> Thu Nov 07 09:41:05 2019 +0100
tree ac7d4d1c3d151197e26f83794458884c3107152b
parent 8c4dd9d983351ad60761ee4bea411ab1497a8f27

Bug 552415: [R-DataEditor] Fix IndexOutOfBoundsException in
TextVariableFilter

Change-Id: Id0d092f7bb47cffae56f9f432b1c73c6092deb36

r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/datafilter/TextVariableFilter.java

diff --git a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/datafilter/TextVariableFilter.java b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/datafilter/TextVariableFilter.java
index 3dec2fc..67c928d 100644
--- a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/datafilter/TextVariableFilter.java
+++ b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/internal/r/ui/datafilter/TextVariableFilter.java
@@ -125,7 +125,7 @@
 			return old;
 		}
 		if (old.getLength() == 0 && add instanceof RCharacter32Store) {
-			return (RCharacter32Store) add;
+			return (RCharacter32Store)add;
 		}
 		final String[] values= new String[(int) Math.max(old.getLength() + add.getLength(), 10000)];
 		int i= 0;
@@ -133,7 +133,7 @@
 			values[i]= add.get(i);
 		}
 		for (int j= 0; j < add.getLength() && i < values.length; j++) {
-			final String s= add.get(i);
+			final String s= add.get(j);
 			if (!add.contains(s)) {
 				values[i++]= s;
 			}