Refactored base yang-java types.

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

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int16.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int16.java
index e24a07038d427646d4daac66909dcdfd58c9117d..629e9ff7d3969af347fdbaae4ba25dd5cf440a01 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int16.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/Int16.java
@@ -8,7 +8,6 @@
 package org.opendaylight.yangtools.yang.model.util;
 
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition;
 
 /**
@@ -19,66 +18,34 @@ import org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition;
  * @see AbstractSignedInteger
  */
 public final class Int16 extends AbstractSignedInteger {
-    private static final QName name = BaseTypes.constructQName("int16");
-    private final Short defaultValue = null;
-    private static final String description = "int16  represents integer values between -32768 and 32767, inclusively.";
-    private final IntegerTypeDefinition baseType;
+    private static Int16 INSTANCE;
+    private static final QName NAME = BaseTypes.constructQName("int16");
+    private static final String DESCRIPTION = "int16  represents integer values between -32768 and 32767, inclusively.";
 
-    public Int16(final SchemaPath path) {
-        super(path, name, description, Short.MIN_VALUE, Short.MAX_VALUE, "");
-        this.baseType = this;
+    private Int16() {
+        super(NAME, DESCRIPTION, Short.MIN_VALUE, Short.MAX_VALUE, "");
+    }
 
+    public static Int16 getInstance() {
+        if (INSTANCE == null) {
+            INSTANCE = new Int16();
+        }
+        return INSTANCE;
     }
 
     @Override
     public IntegerTypeDefinition getBaseType() {
-        return baseType;
+        return this;
     }
 
     @Override
     public Object getDefaultValue() {
-        return defaultValue;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = super.hashCode();
-        result = prime * result
-                + ((defaultValue == null) ? 0 : defaultValue.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (!super.equals(obj)) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        Int16 other = (Int16) obj;
-        if (defaultValue == null) {
-            if (other.defaultValue != null) {
-                return false;
-            }
-        } else if (!defaultValue.equals(other.defaultValue)) {
-            return false;
-        }
-        return true;
+        return null;
     }
 
     @Override
     public String toString() {
-        StringBuilder builder = new StringBuilder();
-        builder.append("Int16 [defaultValue=");
-        builder.append(defaultValue);
-        builder.append(", AbstractInteger=");
-        builder.append(super.toString());
-        builder.append("]");
-        return builder.toString();
+        return "type " + NAME;
     }
+
 }