From a5677717b0781580313dc706ee8fceb32a954159 Mon Sep 17 00:00:00 2001
From: "cata%netscape.com"
 <cata%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 23 Mar 1999 22:37:19 +0000
Subject: [PATCH] ISO-8859-7 decoder using support classes now.

git-svn-id: svn://10.0.0.236/trunk@24897 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../uconv/ucvlatin/nsISO88597ToUnicode.cpp    | 49 +++++++------------
 .../intl/uconv/ucvlatin/nsISO88597ToUnicode.h | 29 +++++------
 2 files changed, 34 insertions(+), 44 deletions(-)

diff --git a/mozilla/intl/uconv/ucvlatin/nsISO88597ToUnicode.cpp b/mozilla/intl/uconv/ucvlatin/nsISO88597ToUnicode.cpp
index 13b3325aeb8..5c4aead7055 100644
--- a/mozilla/intl/uconv/ucvlatin/nsISO88597ToUnicode.cpp
+++ b/mozilla/intl/uconv/ucvlatin/nsISO88597ToUnicode.cpp
@@ -17,31 +17,27 @@
  * Netscape Communications Corporation.  All Rights Reserved.
  */
 
-#include "pratom.h"
 #include "nsISO88597ToUnicode.h"
-#include "nsUCvLatinDll.h"
 
-static PRUint16 gMappingTable[] = {
+//----------------------------------------------------------------------
+// Global functions and data [declaration]
+
+static PRUint16 g_ISO88597MappingTable[] = {
 #include "8859-7.ut"
 };
 
-static PRBool gFastTableInit = PR_FALSE;
-static PRUnichar gFastTable [256] ;
+static PRInt16 g_ISO88597ShiftTable[] =  {
+  0, u1ByteCharset ,
+  ShiftCell(0,0,0,0,0,0,0,0)
+};
 
 //----------------------------------------------------------------------
 // Class nsISO88597ToUnicode [implementation]
 
-NS_IMPL_ISUPPORTS(nsISO88597ToUnicode, kIUnicodeDecoderIID);
-
 nsISO88597ToUnicode::nsISO88597ToUnicode() 
+: nsTableDecoderSupport((uShiftTable*) &g_ISO88597ShiftTable, 
+                        (uMappingTable*) &g_ISO88597MappingTable)
 {
-  NS_INIT_REFCNT();
-  PR_AtomicIncrement(&g_InstanceCount);
-}
-
-nsISO88597ToUnicode::~nsISO88597ToUnicode() 
-{
-  PR_AtomicDecrement(&g_InstanceCount);
 }
 
 nsresult nsISO88597ToUnicode::CreateInstance(nsISupports ** aResult) 
@@ -50,22 +46,15 @@ nsresult nsISO88597ToUnicode::CreateInstance(nsISupports ** aResult)
   return (*aResult == NULL)? NS_ERROR_OUT_OF_MEMORY : NS_OK;
 }
 
-uMappingTable* nsISO88597ToUnicode::GetMappingTable() 
-{
-  return (uMappingTable*) &gMappingTable;
-}
+//----------------------------------------------------------------------
+// Subclassing of nsTableDecoderSupport class [implementation]
 
-PRUnichar * nsISO88597ToUnicode::GetFastTable() 
+NS_IMETHODIMP nsISO88597ToUnicode::Length(const char * aSrc, 
+                                          PRInt32 aSrcOffset, 
+                                          PRInt32 aSrcLength, 
+                                          PRInt32 * aDestLength)
 {
-  return gFastTable;
-}
-
-PRBool nsISO88597ToUnicode::GetFastTableInitState() 
-{
-  return gFastTableInit;
-}
-
-void nsISO88597ToUnicode::SetFastTableInit() 
-{
-  gFastTableInit = PR_TRUE;
+  // we are a single byte to Unicode converter, so...
+  *aDestLength = aSrcLength;
+  return NS_OK_UDEC_EXACTLENGTH;
 }
diff --git a/mozilla/intl/uconv/ucvlatin/nsISO88597ToUnicode.h b/mozilla/intl/uconv/ucvlatin/nsISO88597ToUnicode.h
index b8064b6f404..2d212ce7edd 100644
--- a/mozilla/intl/uconv/ucvlatin/nsISO88597ToUnicode.h
+++ b/mozilla/intl/uconv/ucvlatin/nsISO88597ToUnicode.h
@@ -20,15 +20,19 @@
 #ifndef nsISO88597ToUnicode_h___
 #define nsISO88597ToUnicode_h___
 
-#include "ns1ByteToUnicodeBase.h"
+#include "nsUCvLatinSupport.h"
 
 //----------------------------------------------------------------------
 // Class nsISO88597ToUnicode [declaration]
 
-class nsISO88597ToUnicode : public ns1ByteToUnicodeBase
+/**
+ * A character set converter from ISO-8859-7 to Unicode.
+ *
+ * @created         23/Mar/1998
+ * @author  Catalin Rotaru [CATA]
+ */
+class nsISO88597ToUnicode : public nsTableDecoderSupport
 {
-  NS_DECL_ISUPPORTS
-
 public:
 
   /**
@@ -36,22 +40,19 @@ public:
    */
   nsISO88597ToUnicode();
 
-  /**
-   * Class destructor.
-   */
-  virtual ~nsISO88597ToUnicode();
-
   /**
    * Static class constructor.
    */
   static nsresult CreateInstance(nsISupports **aResult);
 
 protected:
-  virtual uMappingTable* GetMappingTable();
-  virtual PRUnichar* GetFastTable();
-  virtual PRBool GetFastTableInitState();
-  virtual void SetFastTableInit();
+
+  //--------------------------------------------------------------------
+  // Subclassing of nsDecoderSupport class [declaration]
+
+  NS_IMETHOD Length(const char * aSrc, PRInt32 aSrcOffset, PRInt32 aSrcLength, 
+      PRInt32 * aDestLength);
 
 };
 
-#endif 
+#endif /* nsISO88597ToUnicode_h___ */