1 files changed, 7 insertions, 7 deletions

diff --git a/lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/event/metadata/DeclarationScope.java b/lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/event/metadata/DeclarationScope.java
index 68c1568731..b399f9c12d 100644
--- a/lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/event/metadata/DeclarationScope.java
+++ b/lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/event/metadata/DeclarationScope.java
@@ -14,6 +14,7 @@ package org.eclipse.linuxtools.internal.ctf.core.event.metadata;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 
 import org.eclipse.linuxtools.ctf.core.event.types.EnumDeclaration;
 import org.eclipse.linuxtools.ctf.core.event.types.IDeclaration;
@@ -270,7 +271,7 @@ class DeclarationScope {
     }
 
     /**
-     * Looks up a enum declaration.
+     * Looks up an enum declaration.
      *
      * @param name
      *            The name of the enum to search for.
@@ -334,7 +335,7 @@ class DeclarationScope {
     }
 
     /**
-     * Looks through the list of identifiers of a scope to find if it exists.
+     * Lookup query for an identifier in this scope.
      *
      * @param identifier
      *            the name of the identifier to search for. In the case of int
@@ -346,8 +347,8 @@ class DeclarationScope {
     }
 
     /**
-     * Recursively looks through the list of identifiers of a scope to find if
-     * it exists.
+     * Lookup query for an identifier through this scope and its ancestors.
+     * An ancestor scope is a scope in which this scope is nested.
      *
      * @param identifier
      *            the name of the identifier to search for. In the case of int
@@ -369,9 +370,8 @@ class DeclarationScope {
      *
      * @return The type names
      */
-    public String[] getTypeNames() {
-        String[] keys = new String[types.keySet().size()];
-        return types.keySet().toArray(keys);
+    public Set<String> getTypeNames() {
+        return types.keySet();
     }
 
     /**