Merge "BUG-2962: add DataTreeTip interface and implement it"

[yangtools.git] / yang / yang-model-util / src / main / java / org / opendaylight / yangtools / yang / model / util / BaseTypes.java

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java
index 148493310d475cca0b2eb8187d4a4625364e08ac..c5c098713e7e8f93f645efd9e7095f8dd109642e 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java
@@ -13,7 +13,6 @@ import com.google.common.collect.ImmutableSet;
 
 import java.net.URI;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
@@ -86,7 +85,7 @@ public final class BaseTypes {
      * @return built-in base yang type QName.
      */
     public static QName constructQName(final String typeName) {
-        return QName.create(BASE_TYPES_MODULE, "", typeName);
+        return QName.create(BASE_TYPES_MODULE, typeName);
     }
 
     /**
@@ -99,7 +98,7 @@ public final class BaseTypes {
      */
     @Deprecated
     public static SchemaPath schemaPath(final QName typeName) {
-        return SchemaPath.create(Collections.singletonList(typeName), true);
+        return SchemaPath.create(true, typeName);
     }
 
     /**
@@ -114,7 +113,7 @@ public final class BaseTypes {
      *            Revision Date
      * @return Schema Path
      *
-     * @deprecated Use {@link SchemaPath#create(boolean, Iterable)} with QNames
+     * @deprecated Use {@link SchemaPath#create(Iterable, boolean)} with QNames
      *             manually constructed.
      */
     @Deprecated
@@ -124,7 +123,7 @@ public final class BaseTypes {
         }
         final List<QName> pathList = new ArrayList<QName>();
         for (final String path : actualPath) {
-            final QName qname = new QName(namespace, revision, path);
+            final QName qname = QName.create(namespace, revision, path);
             if (qname != null) {
                 pathList.add(qname);
             }
@@ -192,7 +191,7 @@ public final class BaseTypes {
         } else if ("empty".equals(typeName)) {
             return EmptyType.getInstance();
         } else if ("instance-identifier".equals(typeName)) {
-            return InstanceIdentifier.getInstance();
+            return InstanceIdentifierType.getInstance();
         }
         return null;
     }