diff --git a/src/main/java/encoding/Block.java b/src/main/java/encoding/Block.java index 0b796bd..cb92f54 100644 --- a/src/main/java/encoding/Block.java +++ b/src/main/java/encoding/Block.java @@ -1,6 +1,6 @@ -package encoding; +package main.java.encoding; -import util.ByteHelper; +import main.java.util.ByteHelper; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/encoding/SizeT.java b/src/main/java/encoding/SizeT.java index bb8c276..0d6c599 100644 --- a/src/main/java/encoding/SizeT.java +++ b/src/main/java/encoding/SizeT.java @@ -1,4 +1,4 @@ -package encoding; +package main.java.encoding; import java.math.BigInteger; diff --git a/src/main/java/encoding/TLV.java b/src/main/java/encoding/TLV.java index ee22df5..6a87749 100644 --- a/src/main/java/encoding/TLV.java +++ b/src/main/java/encoding/TLV.java @@ -1,6 +1,7 @@ -package encoding; +package main.java.encoding; -import static util.ByteHelper.*; + +import main.java.util.ByteHelper; /* * @Author: Wang Feng @@ -77,24 +78,24 @@ public class TLV { return null; } - int firstbyte=uint8ToInt(getFirstByte(buffer,start)); + int firstbyte=ByteHelper.uint8ToInt(ByteHelper.getFirstByte(buffer,start)); if(firstbyte<241){ return new VlInt(firstbyte); }else if(firstbyte==241){ if(length.subtract(start)<3){ return null; } - return new VlInt(getLenBytes(buffer,start,3)); + return new VlInt(ByteHelper.getLenBytes(buffer,start,3)); }else if(firstbyte==242){ if(length.subtract(start)<5){ return null; } - return new VlInt(getLenBytes(buffer,start,5)); + return new VlInt(ByteHelper.getLenBytes(buffer,start,5)); }else if(firstbyte==243){ if(length.subtract(start)<9){ return null; } - return new VlInt(getLenBytes(buffer,start,9)); + return new VlInt(ByteHelper.getLenBytes(buffer,start,9)); }else{ //MIN1.0中算越界 return null; } diff --git a/src/main/java/encoding/VlInt.java b/src/main/java/encoding/VlInt.java index ff098f7..ea5ab5f 100644 --- a/src/main/java/encoding/VlInt.java +++ b/src/main/java/encoding/VlInt.java @@ -1,6 +1,7 @@ -package encoding; +package main.java.encoding; -import util.ByteHelper; + +import main.java.util.ByteHelper; import java.math.BigInteger; @@ -39,7 +40,7 @@ public class VlInt { return SizeOfVarNumber(this.VlIntValue); } private static int SizeOfVarNumber(BigInteger bigInteger){ - if(bigInteger.compareTo(BigInteger.valueOf(Long.parseLong("241"))) < 0){ + if(bigInteger.compareTo(BigInteger.valueOf(241)) < 0){ return 1; }else if(bigInteger.compareTo(BigInteger.valueOf( new Double(pow(2, 16)).longValue())) < 0){ diff --git a/src/main/java/encoding/VlInt_V1.java b/src/main/java/encoding/VlInt_V1.java index 69e9f97..1d74a4e 100644 --- a/src/main/java/encoding/VlInt_V1.java +++ b/src/main/java/encoding/VlInt_V1.java @@ -1,4 +1,4 @@ -package encoding; +package main.java.encoding; import static java.lang.Math.pow; diff --git a/src/main/java/util/ByteHelper.java b/src/main/java/util/ByteHelper.java index 47703a0..fa2856a 100644 --- a/src/main/java/util/ByteHelper.java +++ b/src/main/java/util/ByteHelper.java @@ -1,6 +1,7 @@ -package util; +package main.java.util; -import encoding.VlInt; + +import main.java.encoding.VlInt; /* * @Author: Wang Feng