Fix checkstyle violations in sdc/jtosca

[sdc/sdc-tosca.git] / src / main / java / org / onap / sdc / toscaparser / api / elements / ScalarUnitSize.java

diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnitSize.java b/src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnitSize.java
index d29d8a2..78687a1 100644 (file)
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnitSize.java
+++ b/src/main/java/org/onap/sdc/toscaparser/api/elements/ScalarUnitSize.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,20 +20,24 @@
 
 package org.onap.sdc.toscaparser.api.elements;
 
+import org.onap.sdc.toscaparser.api.elements.enums.FileSize;
+
 public class ScalarUnitSize extends ScalarUnit {
 
-       public ScalarUnitSize(Object value) {
-               super(value);
-               
-           SCALAR_UNIT_DEFAULT = "B";
-           SCALAR_UNIT_DICT.put("B",1L);
-           SCALAR_UNIT_DICT.put("kB",1000L);
-           SCALAR_UNIT_DICT.put("kiB",1024L);
-           SCALAR_UNIT_DICT.put("MB",1000000L);
-           SCALAR_UNIT_DICT.put("MiB",1048576L);
-           SCALAR_UNIT_DICT.put("GB",1000000000L);
-           SCALAR_UNIT_DICT.put("GiB",1073741824L);
-           SCALAR_UNIT_DICT.put("TB",1000000000000L);
-           SCALAR_UNIT_DICT.put("TiB",1099511627776L);
-       }
+
+
+    public ScalarUnitSize(Object value) {
+        super(value);
+
+        setScalarUnitDefault("B");
+        putToScalarUnitDict("B", FileSize.B);
+        putToScalarUnitDict("kB", FileSize.KB);
+        putToScalarUnitDict("MB", FileSize.MB);
+        putToScalarUnitDict("GB", FileSize.GB);
+        putToScalarUnitDict("TB", FileSize.TB);
+        putToScalarUnitDict("kiB", FileSize.KIB);
+        putToScalarUnitDict("MiB", FileSize.MIB);
+        putToScalarUnitDict("GiB", FileSize.GIB);
+        putToScalarUnitDict("TiB", FileSize.TIB);
+    }
 }