From af28f30b50f53d8327a4f3da71f689c5e66ac6dd Mon Sep 17 00:00:00 2001 From: dswitkin Date: Tue, 18 Nov 2008 23:01:42 +0000 Subject: [PATCH] Moved ByteArray up to core/common now that it has no dependencies on qrcode/encoder. git-svn-id: http://zxing.googlecode.com/svn/trunk@727 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- .../com/google/zxing/{qrcode/encoder => common}/ByteArray.java | 2 +- core/src/com/google/zxing/qrcode/QRCodeWriter.java | 2 +- core/src/com/google/zxing/qrcode/encoder/Encoder.java | 1 + .../src/com/google/zxing/qrcode/encoder/EncoderTestCase.java | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) rename core/src/com/google/zxing/{qrcode/encoder => common}/ByteArray.java (98%) diff --git a/core/src/com/google/zxing/qrcode/encoder/ByteArray.java b/core/src/com/google/zxing/common/ByteArray.java similarity index 98% rename from core/src/com/google/zxing/qrcode/encoder/ByteArray.java rename to core/src/com/google/zxing/common/ByteArray.java index 1b8fc514..ffcc472f 100644 --- a/core/src/com/google/zxing/qrcode/encoder/ByteArray.java +++ b/core/src/com/google/zxing/common/ByteArray.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.zxing.qrcode.encoder; +package com.google.zxing.common; /** * This class implements an array of unsigned bytes. diff --git a/core/src/com/google/zxing/qrcode/QRCodeWriter.java b/core/src/com/google/zxing/qrcode/QRCodeWriter.java index 4c5c6e21..d7258132 100644 --- a/core/src/com/google/zxing/qrcode/QRCodeWriter.java +++ b/core/src/com/google/zxing/qrcode/QRCodeWriter.java @@ -20,7 +20,7 @@ import com.google.zxing.BarcodeFormat; import com.google.zxing.Writer; import com.google.zxing.WriterException; import com.google.zxing.common.ByteMatrix; -import com.google.zxing.qrcode.encoder.ByteArray; +import com.google.zxing.common.ByteArray; import com.google.zxing.qrcode.encoder.Encoder; import com.google.zxing.qrcode.encoder.QRCode; diff --git a/core/src/com/google/zxing/qrcode/encoder/Encoder.java b/core/src/com/google/zxing/qrcode/encoder/Encoder.java index 8b4fce42..de2b3420 100644 --- a/core/src/com/google/zxing/qrcode/encoder/Encoder.java +++ b/core/src/com/google/zxing/qrcode/encoder/Encoder.java @@ -17,6 +17,7 @@ package com.google.zxing.qrcode.encoder; import com.google.zxing.common.ByteMatrix; +import com.google.zxing.common.ByteArray; import com.google.zxing.common.reedsolomon.GF256; import com.google.zxing.common.reedsolomon.ReedSolomonEncoder; diff --git a/core/test/src/com/google/zxing/qrcode/encoder/EncoderTestCase.java b/core/test/src/com/google/zxing/qrcode/encoder/EncoderTestCase.java index 5a1107b3..81157fc2 100644 --- a/core/test/src/com/google/zxing/qrcode/encoder/EncoderTestCase.java +++ b/core/test/src/com/google/zxing/qrcode/encoder/EncoderTestCase.java @@ -17,6 +17,7 @@ package com.google.zxing.qrcode.encoder; import junit.framework.TestCase; +import com.google.zxing.common.ByteArray; /** * @author satorux@google.com (Satoru Takabayashi) - creator -- 2.20.1