summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorCamilo Bernal2012-12-12 17:43:34 (EST)
committer Sami Wagiaalla2012-12-13 09:54:38 (EST)
commit6b7abfb6b91322b52a5c280f9785fff36e762236 (patch)
tree62a7536c395d4036e493330528eb813a714fbe2f
parentec2d360674886d31ec2d78441e24e1e8d69ad067 (diff)
downloadorg.eclipse.linuxtools-6b7abfb6b91322b52a5c280f9785fff36e762236.zip
org.eclipse.linuxtools-6b7abfb6b91322b52a5c280f9785fff36e762236.tar.gz
org.eclipse.linuxtools-6b7abfb6b91322b52a5c280f9785fff36e762236.tar.bz2
Fix npe thrown during auto-completion of invalid probes.refs/changes/06/9206/3
Change-Id: I8148fff182fd7c2dd796bac50058c6e6a2d48371 Reviewed-on: https://git.eclipse.org/r/9206 Tested-by: Hudson CI Reviewed-by: Sami Wagiaalla <swagiaal@redhat.com> IP-Clean: Sami Wagiaalla <swagiaal@redhat.com> Tested-by: Sami Wagiaalla <swagiaal@redhat.com>
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/editors/stp/STPCompletionProcessorTest.java2
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/editors/stp/STPMetadataSingleton.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/editors/stp/STPCompletionProcessorTest.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/editors/stp/STPCompletionProcessorTest.java
index bf5993a..ffccd7f 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/editors/stp/STPCompletionProcessorTest.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/editors/stp/STPCompletionProcessorTest.java
@@ -113,7 +113,7 @@ public class STPCompletionProcessorTest {
@Test
public void testGlobalInvalidCompletion() throws BadLocationException {
ICompletionProposal[] proposals = getCompletionsForPrefix("probe fake.fake");
- assertTrue(proposalsContain(proposals, "No completion data found."));
+ assertTrue(proposals.length == 0);
}
@Test
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/editors/stp/STPMetadataSingleton.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/editors/stp/STPMetadataSingleton.java
index 3ee20f1..5789416 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/editors/stp/STPMetadataSingleton.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide/src/org/eclipse/linuxtools/internal/systemtap/ui/ide/editors/stp/STPMetadataSingleton.java
@@ -26,7 +26,7 @@ import org.eclipse.linuxtools.systemtap.ui.structures.TreeNode;
*/
public class STPMetadataSingleton {
- public static String[] NO_MATCHES = new String[] {Messages.STPMetadataSingleton_noCompletions};
+ public static String[] NO_MATCHES = new String[0];
private static STPMetadataSingleton instance = null;