rename character set and rename methods

src/aztec/encoder/aztec_encoder.rs

@@ -19,7 +19,7 @@ use crate::{
         reedsolomon::{
             get_predefined_genericgf, GenericGFRef, PredefinedGenericGF, ReedSolomonEncoder,
         },
-        BitArray, BitMatrix, CharacterSetECI, Result,
+        BitArray, BitMatrix, CharacterSet, Result,
     },
     exceptions::Exceptions,
 };
@@ -49,7 +49,7 @@ pub const WORD_SIZE: [u32; 33] = [
  * @return Aztec symbol matrix with metadata
  */
 pub fn encode_simple(data: &str) -> Result<AztecCode> {
-    let Ok(bytes) =CharacterSetECI::ISO8859_1.encode_replace(data) else {
+    let Ok(bytes) =CharacterSet::ISO8859_1.encode_replace(data) else {
         return Err(Exceptions::illegal_argument_with(format!("'{data}' cannot be encoded as ISO_8859_1")));
     };
     encode_bytes_simple(&bytes)
@@ -65,7 +65,7 @@ pub fn encode_simple(data: &str) -> Result<AztecCode> {
  * @return Aztec symbol matrix with metadata
  */
 pub fn encode(data: &str, minECCPercent: u32, userSpecifiedLayers: i32) -> Result<AztecCode> {
-    if let Ok(bytes) = CharacterSetECI::ISO8859_1.encode(data) {
+    if let Ok(bytes) = CharacterSet::ISO8859_1.encode(data) {
         encode_bytes(&bytes, minECCPercent, userSpecifiedLayers)
     } else {
         Err(Exceptions::illegal_argument_with(format!(
@@ -90,7 +90,7 @@ pub fn encode_with_charset(
     data: &str,
     minECCPercent: u32,
     userSpecifiedLayers: i32,
-    charset: CharacterSetECI,
+    charset: CharacterSet,
 ) -> Result<AztecCode> {
     if let Ok(bytes) = charset.encode(data) {
         encode_bytes_with_charset(&bytes, minECCPercent, userSpecifiedLayers, charset)
@@ -129,7 +129,7 @@ pub fn encode_bytes(
         data,
         minECCPercent,
         userSpecifiedLayers,
-        CharacterSetECI::ISO8859_1,
+        CharacterSet::ISO8859_1,
     )
 }
 
@@ -148,7 +148,7 @@ pub fn encode_bytes_with_charset(
     data: &[u8],
     min_eccpercent: u32,
     user_specified_layers: i32,
-    charset: CharacterSetECI,
+    charset: CharacterSet,
 ) -> Result<AztecCode> {
     // High-level encode
     let bits = HighLevelEncoder::with_charset(data.into(), charset).encode()?;

src/aztec/encoder/high_level_encoder.rs

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-use crate::common::{BitArray, CharacterSetECI, Result};
+use crate::common::{BitArray, CharacterSet, Result};
 
 use super::{State, Token};
 
@@ -32,7 +32,7 @@ use super::{State, Token};
  */
 pub struct HighLevelEncoder {
     text: Vec<u8>,
-    charset: CharacterSetECI,
+    charset: CharacterSet,
 }
 
 impl HighLevelEncoder {
@@ -226,11 +226,11 @@ impl HighLevelEncoder {
     pub fn new(text: Vec<u8>) -> Self {
         Self {
             text,
-            charset: CharacterSetECI::ISO8859_1,
+            charset: CharacterSet::ISO8859_1,
         }
     }
 
-    pub fn with_charset(text: Vec<u8>, charset: CharacterSetECI) -> Self {
+    pub fn with_charset(text: Vec<u8>, charset: CharacterSet) -> Self {
         Self { text, charset }
     }
 
@@ -240,9 +240,9 @@ impl HighLevelEncoder {
     pub fn encode(&self) -> Result<BitArray> {
         let mut initial_state = State::new(Token::new(), Self::MODE_UPPER as u32, 0, 0);
         //if let Some(eci) = CharacterSetECI::getCharacterSetECI(self.charset) {
-        if self.charset != CharacterSetECI::ISO8859_1 {
+        if self.charset != CharacterSet::ISO8859_1 {
             //} && eci != CharacterSetECI::Cp1252 {
-            initial_state = initial_state.appendFLGn(self.charset.getValue())?;
+            initial_state = initial_state.appendFLGn(self.charset.get_eci_value())?;
         }
         // } else {
         //     return Err(Exceptions::illegal_argument_with(

src/aztec/encoder/state.rs

@@ -17,7 +17,7 @@
 use std::fmt;
 
 use crate::{
-    common::{BitArray, CharacterSetECI, Result},
+    common::{BitArray, CharacterSet, Result},
     exceptions::Exceptions,
 };
 
@@ -86,7 +86,7 @@ impl State {
             ));
             // throw new IllegalArgumentException("ECI code must be between 0 and 999999");
         } else {
-            let Ok(eci_digits) = CharacterSetECI::ISO8859_1
+            let Ok(eci_digits) = CharacterSet::ISO8859_1
                 .encode(&format!("{eci}"))
                  else {
                     return Err(Exceptions::ILLEGAL_ARGUMENT)