Remove SchemaPath from TypeDefinition implementations

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

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInstanceIdentifierType.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInstanceIdentifierType.java
index f63f84fab75a59adfb99fba6da5c17d8e6158b85..572178ac06c18d5887f314d3bb32be9a30126e2a 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInstanceIdentifierType.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/DerivedInstanceIdentifierType.java
@@ -8,18 +8,20 @@
 package org.opendaylight.yangtools.yang.model.util.type;
 
 import java.util.Collection;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.type.InstanceIdentifierTypeDefinition;
 
-final class DerivedInstanceIdentifierType extends AbstractDerivedType<InstanceIdentifierTypeDefinition> implements InstanceIdentifierTypeDefinition {
+final class DerivedInstanceIdentifierType extends AbstractDerivedType<InstanceIdentifierTypeDefinition>
+        implements InstanceIdentifierTypeDefinition {
     private final boolean requireInstance;
 
-    DerivedInstanceIdentifierType(final InstanceIdentifierTypeDefinition baseType, final SchemaPath path, final Object defaultValue,
-        final String description, final String reference, final Status status, final String units,
-        final Collection<UnknownSchemaNode> unknownSchemaNodes,  final boolean requireInstance) {
-        super(baseType, path, defaultValue, description, reference, status, units, unknownSchemaNodes);
+    DerivedInstanceIdentifierType(final InstanceIdentifierTypeDefinition baseType, final QName qname,
+            final Object defaultValue, final String description, final String reference, final Status status,
+            final String units, final Collection<? extends UnknownSchemaNode> unknownSchemaNodes,
+            final boolean requireInstance) {
+        super(baseType, qname, defaultValue, description, reference, status, units, unknownSchemaNodes);
         this.requireInstance = requireInstance;
     }
 
@@ -30,11 +32,11 @@ final class DerivedInstanceIdentifierType extends AbstractDerivedType<InstanceId
 
     @Override
     public int hashCode() {
-        return TypeDefinitions.hashCode(this);
+        return InstanceIdentifierTypeDefinition.hashCode(this);
     }
 
     @Override
     public boolean equals(final Object obj) {
-        return TypeDefinitions.equals(this, obj);
+        return InstanceIdentifierTypeDefinition.equals(this, obj);
     }
 }