db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1365468 [2/2] - in /db/derby/code/trunk/java: client/org/apache/derby/client/am/ client/org/apache/derby/client/net/ client/org/apache/derby/jdbc/ drda/org/apache/derby/impl/drda/
Date Wed, 25 Jul 2012 06:47:21 GMT
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CharacterEncodings.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CharacterEncodings.java?rev=1365468&r1=1365467&r2=1365468&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CharacterEncodings.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CharacterEncodings.java Wed Jul 25 06:47:20 2012
@@ -29,361 +29,213 @@ final class CharacterEncodings
   // This is a static class, so hide the default constructor.
   private CharacterEncodings () {}
 
-  //private static java.util.Hashtable javaEncodingToCCSIDTable__ = new java.util.Hashtable();
   private static final HashMap<Integer, String> ccsidToJavaEncodingTable__ =
           new HashMap<Integer, String>();
 
   static {
     populate_ccsidToJavaEncodingTable();
-    //populate_javaEncodingToCCSIDTable();
   }
 
-  /*
-  static void populate_javaEncodingToCCSIDTable ()
-  {
-    javaEncodingToCCSIDTable__.put ("Cp037", new Integer (37));
-    javaEncodingToCCSIDTable__.put ("Cp273", new Integer (273));
-    javaEncodingToCCSIDTable__.put ("Cp277", new Integer (277));
-    javaEncodingToCCSIDTable__.put ("Cp278", new Integer (278));
-    javaEncodingToCCSIDTable__.put ("Cp280", new Integer (280));
-    javaEncodingToCCSIDTable__.put ("Cp284", new Integer (284));
-    javaEncodingToCCSIDTable__.put ("Cp285", new Integer (285));
-    javaEncodingToCCSIDTable__.put ("Cp297", new Integer (297));
-    javaEncodingToCCSIDTable__.put ("Cp420", new Integer (420));
-    javaEncodingToCCSIDTable__.put ("Cp424", new Integer (424));
-    javaEncodingToCCSIDTable__.put ("Cp747", new Integer (437));
-    javaEncodingToCCSIDTable__.put ("Cp500", new Integer (500));
-    javaEncodingToCCSIDTable__.put ("Cp737", new Integer (737));
-    javaEncodingToCCSIDTable__.put ("Cp775", new Integer (775));
-    javaEncodingToCCSIDTable__.put ("ISO8859_7", new Integer (813));
-    javaEncodingToCCSIDTable__.put ("ISO8859_1", new Integer (819));
-    javaEncodingToCCSIDTable__.put ("Cp838", new Integer (838));
-    javaEncodingToCCSIDTable__.put ("Cp850", new Integer (850));
-    javaEncodingToCCSIDTable__.put ("Cp852", new Integer (852));
-    javaEncodingToCCSIDTable__.put ("Cp855", new Integer (855));
-    javaEncodingToCCSIDTable__.put ("Cp856", new Integer (856));
-    javaEncodingToCCSIDTable__.put ("Cp857", new Integer (857));
-    javaEncodingToCCSIDTable__.put ("Cp858", new Integer (858));
-    javaEncodingToCCSIDTable__.put ("Cp860", new Integer (860));
-    javaEncodingToCCSIDTable__.put ("Cp861", new Integer (861));
-    javaEncodingToCCSIDTable__.put ("Cp862", new Integer (862));
-    javaEncodingToCCSIDTable__.put ("Cp863", new Integer (863));
-    javaEncodingToCCSIDTable__.put ("Cp864", new Integer (864));
-    javaEncodingToCCSIDTable__.put ("Cp865", new Integer (865));
-    javaEncodingToCCSIDTable__.put ("Cp866", new Integer (866));
-    javaEncodingToCCSIDTable__.put ("Cp868", new Integer (868));
-    javaEncodingToCCSIDTable__.put ("Cp869", new Integer (869));
-    javaEncodingToCCSIDTable__.put ("Cp870", new Integer (870));
-    javaEncodingToCCSIDTable__.put ("Cp871", new Integer (871));
-    javaEncodingToCCSIDTable__.put ("Cp874", new Integer (874));
-    javaEncodingToCCSIDTable__.put ("Cp875", new Integer (875));
-    javaEncodingToCCSIDTable__.put ("KOI8_R", new Integer (878));
-    javaEncodingToCCSIDTable__.put ("ISO8859_2", new Integer (912));
-    javaEncodingToCCSIDTable__.put ("ISO8859_3", new Integer (913));
-    javaEncodingToCCSIDTable__.put ("ISO8859_4", new Integer (914));
-    javaEncodingToCCSIDTable__.put ("ISO8859_5", new Integer (915));
-    javaEncodingToCCSIDTable__.put ("ISO8859_8", new Integer (916));
-    javaEncodingToCCSIDTable__.put ("Cp918", new Integer (918));
-    javaEncodingToCCSIDTable__.put ("ISO8859_9", new Integer (920));
-    javaEncodingToCCSIDTable__.put ("ISO8859_15_FDIS", new Integer (923));
-    javaEncodingToCCSIDTable__.put ("Cp921", new Integer (921));
-    javaEncodingToCCSIDTable__.put ("Cp922", new Integer (922));
-    javaEncodingToCCSIDTable__.put ("Cp930", new Integer (930));
-    javaEncodingToCCSIDTable__.put ("Cp933", new Integer (933));
-    javaEncodingToCCSIDTable__.put ("Cp935", new Integer (935));
-    javaEncodingToCCSIDTable__.put ("Cp937", new Integer (937));
-    javaEncodingToCCSIDTable__.put ("Cp939", new Integer (939));
-    javaEncodingToCCSIDTable__.put ("Cp948", new Integer (948));
-    javaEncodingToCCSIDTable__.put ("Cp950", new Integer (950));
-    javaEncodingToCCSIDTable__.put ("Cp964", new Integer (964));
-    javaEncodingToCCSIDTable__.put ("Cp970", new Integer (970));
-    javaEncodingToCCSIDTable__.put ("Cp1006", new Integer (1006));
-    javaEncodingToCCSIDTable__.put ("Cp1025", new Integer (1025));
-    javaEncodingToCCSIDTable__.put ("Cp1026", new Integer (1026));
-    javaEncodingToCCSIDTable__.put ("Cp1046", new Integer (1046));
-    javaEncodingToCCSIDTable__.put ("ISO8859_6", new Integer (1089));
-    javaEncodingToCCSIDTable__.put ("Cp1097", new Integer (1097));
-    javaEncodingToCCSIDTable__.put ("Cp1098", new Integer (1098));
-    javaEncodingToCCSIDTable__.put ("Cp1112", new Integer (1112));
-    javaEncodingToCCSIDTable__.put ("Cp1122", new Integer (1122));
-    javaEncodingToCCSIDTable__.put ("Cp1123", new Integer (1123));
-    javaEncodingToCCSIDTable__.put ("Cp1124", new Integer (1124));
-    javaEncodingToCCSIDTable__.put ("Cp1140", new Integer (1140));
-    javaEncodingToCCSIDTable__.put ("Cp1141", new Integer (1141));
-    javaEncodingToCCSIDTable__.put ("Cp1142", new Integer (1142));
-    javaEncodingToCCSIDTable__.put ("Cp1143", new Integer (1143));
-    javaEncodingToCCSIDTable__.put ("Cp1144", new Integer (1144));
-    javaEncodingToCCSIDTable__.put ("Cp1145", new Integer (1145));
-    javaEncodingToCCSIDTable__.put ("Cp1146", new Integer (1146));
-    javaEncodingToCCSIDTable__.put ("Cp1147", new Integer (1147));
-    javaEncodingToCCSIDTable__.put ("Cp1148", new Integer (1148));
-    javaEncodingToCCSIDTable__.put ("Cp1149", new Integer (1149));
-    javaEncodingToCCSIDTable__.put ("UTF8", new Integer (1208));
-    javaEncodingToCCSIDTable__.put ("Cp1250", new Integer (1250));
-    javaEncodingToCCSIDTable__.put ("Cp1251", new Integer (1251));
-    javaEncodingToCCSIDTable__.put ("Cp1252", new Integer (1252));
-    javaEncodingToCCSIDTable__.put ("Cp1253", new Integer (1253));
-    javaEncodingToCCSIDTable__.put ("Cp1254", new Integer (1254));
-    javaEncodingToCCSIDTable__.put ("Cp1255", new Integer (1255));
-    javaEncodingToCCSIDTable__.put ("Cp1256", new Integer (1256));
-    javaEncodingToCCSIDTable__.put ("Cp1257", new Integer (1257));
-    javaEncodingToCCSIDTable__.put ("Cp1258", new Integer (1258));
-    javaEncodingToCCSIDTable__.put ("MacGreek", new Integer (1280));
-    javaEncodingToCCSIDTable__.put ("MacTurkish", new Integer (1281));
-    javaEncodingToCCSIDTable__.put ("MacCyrillic", new Integer (1283));
-    javaEncodingToCCSIDTable__.put ("MacCroatian", new Integer (1284));
-    javaEncodingToCCSIDTable__.put ("MacRomania", new Integer (1285));
-    javaEncodingToCCSIDTable__.put ("MacIceland", new Integer (1286));
-    javaEncodingToCCSIDTable__.put ("Cp1381", new Integer (1381));
-    javaEncodingToCCSIDTable__.put ("Cp1383", new Integer (1383));
-    javaEncodingToCCSIDTable__.put ("Cp33722", new Integer (33722));
-
-    javaEncodingToCCSIDTable__.put ("Cp290", new Integer (8482));
-    javaEncodingToCCSIDTable__.put ("Cp300", new Integer (16684));
-    javaEncodingToCCSIDTable__.put ("Cp930", new Integer (1390));
-    javaEncodingToCCSIDTable__.put ("Cp833", new Integer (13121));
-    javaEncodingToCCSIDTable__.put ("Cp834", new Integer (4930));
-    javaEncodingToCCSIDTable__.put ("Cp836", new Integer (13124));
-    javaEncodingToCCSIDTable__.put ("Cp837", new Integer (4933));
-    javaEncodingToCCSIDTable__.put ("Cp943", new Integer (941));
-    javaEncodingToCCSIDTable__.put ("Cp1027", new Integer (5123));
-    javaEncodingToCCSIDTable__.put ("Cp1043", new Integer (904));
-    javaEncodingToCCSIDTable__.put ("Cp1114", new Integer (5210));
-    javaEncodingToCCSIDTable__.put ("ASCII", new Integer (367));
-    javaEncodingToCCSIDTable__.put ("MS932", new Integer (932));
-    javaEncodingToCCSIDTable__.put ("UnicodeBigUnmarked", new Integer (1200));
-    javaEncodingToCCSIDTable__.put ("Cp943", new Integer (943));
-    javaEncodingToCCSIDTable__.put ("Cp1362", new Integer (1114));
-    javaEncodingToCCSIDTable__.put ("Cp301", new Integer (301));
-    javaEncodingToCCSIDTable__.put ("Cp1041", new Integer (1041));
-    javaEncodingToCCSIDTable__.put ("Cp1351", new Integer (1351));
-    javaEncodingToCCSIDTable__.put ("Cp1088", new Integer (1088));
-    javaEncodingToCCSIDTable__.put ("Cp951", new Integer (951));
-    javaEncodingToCCSIDTable__.put ("Cp971", new Integer (971));
-    javaEncodingToCCSIDTable__.put ("Cp1362", new Integer (1362));
-    javaEncodingToCCSIDTable__.put ("Cp1363", new Integer (1363));
-    javaEncodingToCCSIDTable__.put ("Cp1115", new Integer (1115));
-    javaEncodingToCCSIDTable__.put ("Cp1380", new Integer (1380));
-    javaEncodingToCCSIDTable__.put ("Cp1385", new Integer (1385));
-    javaEncodingToCCSIDTable__.put ("Cp947", new Integer (947));
-    javaEncodingToCCSIDTable__.put ("Cp942", new Integer (942));
-    javaEncodingToCCSIDTable__.put ("Cp897", new Integer (897));
-    javaEncodingToCCSIDTable__.put ("Cp949", new Integer (949));
-    javaEncodingToCCSIDTable__.put ("Cp1370", new Integer (1370));
-    javaEncodingToCCSIDTable__.put ("Cp927", new Integer (927));
-    javaEncodingToCCSIDTable__.put ("Cp1382", new Integer (1382));
-    javaEncodingToCCSIDTable__.put ("Cp1386", new Integer (1386));
-    javaEncodingToCCSIDTable__.put ("Cp835", new Integer (835));
-    javaEncodingToCCSIDTable__.put ("Cp1051", new Integer (1051));
-  }
-  */
-
   static void populate_ccsidToJavaEncodingTable ()
   {
-    ccsidToJavaEncodingTable__.put (new Integer (5346), "Cp1250");
-    ccsidToJavaEncodingTable__.put (new Integer (5347), "Cp1251");
-    ccsidToJavaEncodingTable__.put (new Integer (5348), "Cp1252");
-    ccsidToJavaEncodingTable__.put (new Integer (5349), "Cp1253");
-    ccsidToJavaEncodingTable__.put (new Integer (5350), "Cp1254");
-    ccsidToJavaEncodingTable__.put (new Integer (5351), "Cp1255");
-    ccsidToJavaEncodingTable__.put (new Integer (4909), "Cp813");
-    ccsidToJavaEncodingTable__.put (new Integer (858), "Cp850"); //we can't map 858 to Cp850 because 858 has Euro characters that Cp858 doesn't support
-    ccsidToJavaEncodingTable__.put (new Integer (872), "Cp855");
-    ccsidToJavaEncodingTable__.put (new Integer (867), "Cp862");
-    ccsidToJavaEncodingTable__.put (new Integer (17248), "Cp864");
-    ccsidToJavaEncodingTable__.put (new Integer (808), "Cp866");
-    ccsidToJavaEncodingTable__.put (new Integer (1162), "Cp847");
-    ccsidToJavaEncodingTable__.put (new Integer (9044), "Cp852");
-    ccsidToJavaEncodingTable__.put (new Integer (9048), "Cp856");
-    ccsidToJavaEncodingTable__.put (new Integer (9049), "Cp857");
-    ccsidToJavaEncodingTable__.put (new Integer (9061), "Cp869");
-    ccsidToJavaEncodingTable__.put (new Integer (901), "Cp921");
-    ccsidToJavaEncodingTable__.put (new Integer (902), "Cp922");
-    ccsidToJavaEncodingTable__.put (new Integer (21427), "Cp947");
-    ccsidToJavaEncodingTable__.put (new Integer (1370), "Cp950"); //we can't map 1370 to Cp1370 becasue 1370 has Euro character that Cp1370 doesn't support
-    ccsidToJavaEncodingTable__.put (new Integer (5104), "Cp1008");
-    ccsidToJavaEncodingTable__.put (new Integer (9238), "Cp1046");
-    ccsidToJavaEncodingTable__.put (new Integer (848), "Cp1125");
-    ccsidToJavaEncodingTable__.put (new Integer (1163), "Cp1129");
-    ccsidToJavaEncodingTable__.put (new Integer (849), "Cp1131");
-    ccsidToJavaEncodingTable__.put (new Integer (5352), "Cp1256");
-    ccsidToJavaEncodingTable__.put (new Integer (5353), "Cp1257");
-    ccsidToJavaEncodingTable__.put (new Integer (5354), "Cp1258");
-
-    ccsidToJavaEncodingTable__.put (new Integer (37), "Cp037");
-    ccsidToJavaEncodingTable__.put (new Integer (273), "Cp273");
-    ccsidToJavaEncodingTable__.put (new Integer (277), "Cp277");
-    ccsidToJavaEncodingTable__.put (new Integer (278), "Cp278");
-    ccsidToJavaEncodingTable__.put (new Integer (280), "Cp280");
-    ccsidToJavaEncodingTable__.put (new Integer (284), "Cp284");
-    ccsidToJavaEncodingTable__.put (new Integer (285), "Cp285");
-    ccsidToJavaEncodingTable__.put (new Integer (297), "Cp297");
-    ccsidToJavaEncodingTable__.put (new Integer (420), "Cp420");
-    ccsidToJavaEncodingTable__.put (new Integer (424), "Cp424");
-    ccsidToJavaEncodingTable__.put (new Integer (437), "Cp437");
-    ccsidToJavaEncodingTable__.put (new Integer (500), "Cp500");
-    ccsidToJavaEncodingTable__.put (new Integer (737), "Cp737");
-    ccsidToJavaEncodingTable__.put (new Integer (775), "Cp775");
-    ccsidToJavaEncodingTable__.put (new Integer (838), "Cp838");
-    ccsidToJavaEncodingTable__.put (new Integer (850), "Cp850");
-    ccsidToJavaEncodingTable__.put (new Integer (852), "Cp852");
-    ccsidToJavaEncodingTable__.put (new Integer (855), "Cp855");
-    ccsidToJavaEncodingTable__.put (new Integer (856), "Cp856");
-    ccsidToJavaEncodingTable__.put (new Integer (857), "Cp857");
-    //ccsidToJavaEncodingTable__.put (new Integer (858), "Cp858");
-    ccsidToJavaEncodingTable__.put (new Integer (860), "Cp860");
-    ccsidToJavaEncodingTable__.put (new Integer (861), "Cp861");
-    ccsidToJavaEncodingTable__.put (new Integer (862), "Cp862");
-    ccsidToJavaEncodingTable__.put (new Integer (863), "Cp863");
-    ccsidToJavaEncodingTable__.put (new Integer (864), "Cp864");
-    ccsidToJavaEncodingTable__.put (new Integer (865), "Cp865");
-    ccsidToJavaEncodingTable__.put (new Integer (866), "Cp866");
-    ccsidToJavaEncodingTable__.put (new Integer (868), "Cp868");
-    ccsidToJavaEncodingTable__.put (new Integer (869), "Cp869");
-    ccsidToJavaEncodingTable__.put (new Integer (870), "Cp870");
-    ccsidToJavaEncodingTable__.put (new Integer (871), "Cp871");
-    ccsidToJavaEncodingTable__.put (new Integer (874), "Cp874");
-    ccsidToJavaEncodingTable__.put (new Integer (875), "Cp875");
-    ccsidToJavaEncodingTable__.put (new Integer (918), "Cp918");
-    ccsidToJavaEncodingTable__.put (new Integer (921), "Cp921");
-    ccsidToJavaEncodingTable__.put (new Integer (922), "Cp922");
-    ccsidToJavaEncodingTable__.put (new Integer (930), "Cp930");
-    ccsidToJavaEncodingTable__.put (new Integer (933), "Cp933");
-    ccsidToJavaEncodingTable__.put (new Integer (935), "Cp935");
-    ccsidToJavaEncodingTable__.put (new Integer (937), "Cp937");
-    ccsidToJavaEncodingTable__.put (new Integer (939), "Cp939");
-    ccsidToJavaEncodingTable__.put (new Integer (948), "Cp948");
-    ccsidToJavaEncodingTable__.put (new Integer (950), "Cp950");
-    ccsidToJavaEncodingTable__.put (new Integer (964), "Cp964");
-    ccsidToJavaEncodingTable__.put (new Integer (970), "Cp970");
-    ccsidToJavaEncodingTable__.put (new Integer (1006), "Cp1006");
-    ccsidToJavaEncodingTable__.put (new Integer (1025), "Cp1025");
-    ccsidToJavaEncodingTable__.put (new Integer (1026), "Cp1026");
-    ccsidToJavaEncodingTable__.put (new Integer (1046), "Cp1046");
-    ccsidToJavaEncodingTable__.put (new Integer (1097), "Cp1097");
-    ccsidToJavaEncodingTable__.put (new Integer (1098), "Cp1098");
-    ccsidToJavaEncodingTable__.put (new Integer (1112), "Cp1112");
-    ccsidToJavaEncodingTable__.put (new Integer (1122), "Cp1122");
-    ccsidToJavaEncodingTable__.put (new Integer (1123), "Cp1123");
-    ccsidToJavaEncodingTable__.put (new Integer (1124), "Cp1124");
-    ccsidToJavaEncodingTable__.put (new Integer (1140), "Cp1140");
-    ccsidToJavaEncodingTable__.put (new Integer (1141), "Cp1141");
-    ccsidToJavaEncodingTable__.put (new Integer (1142), "Cp1142");
-    ccsidToJavaEncodingTable__.put (new Integer (1143), "Cp1143");
-    ccsidToJavaEncodingTable__.put (new Integer (1144), "Cp1144");
-    ccsidToJavaEncodingTable__.put (new Integer (1145), "Cp1145");
-    ccsidToJavaEncodingTable__.put (new Integer (1146), "Cp1146");
-    ccsidToJavaEncodingTable__.put (new Integer (1147), "Cp1147");
-    ccsidToJavaEncodingTable__.put (new Integer (1148), "Cp1148");
-    ccsidToJavaEncodingTable__.put (new Integer (1149), "Cp1149");
-    ccsidToJavaEncodingTable__.put (new Integer (1250), "Cp1250");
-    ccsidToJavaEncodingTable__.put (new Integer (1251), "Cp1251");
-    ccsidToJavaEncodingTable__.put (new Integer (1252), "Cp1252");
-    ccsidToJavaEncodingTable__.put (new Integer (1253), "Cp1253");
-    ccsidToJavaEncodingTable__.put (new Integer (1254), "Cp1254");
-    ccsidToJavaEncodingTable__.put (new Integer (1255), "Cp1255");
-    ccsidToJavaEncodingTable__.put (new Integer (1256), "Cp1256");
-    ccsidToJavaEncodingTable__.put (new Integer (1257), "Cp1257");
-    ccsidToJavaEncodingTable__.put (new Integer (1258), "Cp1258");
-    ccsidToJavaEncodingTable__.put (new Integer (1381), "Cp1381");
-    ccsidToJavaEncodingTable__.put (new Integer (1383), "Cp1383");
-    ccsidToJavaEncodingTable__.put (new Integer (33722), "Cp33722");
-    ccsidToJavaEncodingTable__.put (new Integer (943), "Cp943");
-    ccsidToJavaEncodingTable__.put (new Integer (1043), "Cp1043");
-
-    ccsidToJavaEncodingTable__.put (new Integer (813), "ISO8859_7");
-    ccsidToJavaEncodingTable__.put (new Integer (819), "ISO8859_1");
-    ccsidToJavaEncodingTable__.put (new Integer (878), "KOI8_R");
-    ccsidToJavaEncodingTable__.put (new Integer (912), "ISO8859_2");
-    ccsidToJavaEncodingTable__.put (new Integer (913), "ISO8859_3");
-    ccsidToJavaEncodingTable__.put (new Integer (914), "ISO8859_4");
-    ccsidToJavaEncodingTable__.put (new Integer (915), "ISO8859_5");
-    ccsidToJavaEncodingTable__.put (new Integer (916), "ISO8859_8");
-    ccsidToJavaEncodingTable__.put (new Integer (920), "ISO8859_9");
-    ccsidToJavaEncodingTable__.put (new Integer (923), "ISO8859_15_FDIS");
-    ccsidToJavaEncodingTable__.put (new Integer (1089), "ISO8859_6");
-    ccsidToJavaEncodingTable__.put (new Integer (1208), "UTF8");
-    ccsidToJavaEncodingTable__.put (new Integer (1280), "MacGreek");
-    ccsidToJavaEncodingTable__.put (new Integer (1281), "MacTurkish");
-    ccsidToJavaEncodingTable__.put (new Integer (1283), "MacCyrillic");
-    ccsidToJavaEncodingTable__.put (new Integer (1284), "MacCroatian");
-    ccsidToJavaEncodingTable__.put (new Integer (1285), "MacRomania");
-    ccsidToJavaEncodingTable__.put (new Integer (1286), "MacIceland");
-    ccsidToJavaEncodingTable__.put (new Integer (8482), "Cp290");
-    ccsidToJavaEncodingTable__.put (new Integer (16684), "Cp300");
-    ccsidToJavaEncodingTable__.put (new Integer (1390), "Cp930");
-    ccsidToJavaEncodingTable__.put (new Integer (13121), "Cp833");
-    ccsidToJavaEncodingTable__.put (new Integer (4930), "Cp834");
-    ccsidToJavaEncodingTable__.put (new Integer (13124), "Cp836");
-    ccsidToJavaEncodingTable__.put (new Integer (4933), "Cp837");
-    ccsidToJavaEncodingTable__.put (new Integer (941), "Cp943");
-    ccsidToJavaEncodingTable__.put (new Integer (5123), "Cp1027");
-    ccsidToJavaEncodingTable__.put (new Integer (904), "Cp1043");
-    ccsidToJavaEncodingTable__.put (new Integer (5210), "Cp1114");
-    ccsidToJavaEncodingTable__.put (new Integer (367), "ASCII");
-    ccsidToJavaEncodingTable__.put (new Integer (932), "MS932");
-    ccsidToJavaEncodingTable__.put (new Integer (1200), "UnicodeBigUnmarked");
-    ccsidToJavaEncodingTable__.put (new Integer (5026), "Cp930");
-    ccsidToJavaEncodingTable__.put (new Integer (1399), "Cp939");
-    ccsidToJavaEncodingTable__.put (new Integer (4396), "Cp300");
-    ccsidToJavaEncodingTable__.put (new Integer (1388), "Cp935");
-    ccsidToJavaEncodingTable__.put (new Integer (1364), "Cp933");
-    ccsidToJavaEncodingTable__.put (new Integer (5035), "Cp939");
-    ccsidToJavaEncodingTable__.put (new Integer (28709), "Cp37");
-    ccsidToJavaEncodingTable__.put (new Integer (1114), "Cp1362");
-    ccsidToJavaEncodingTable__.put (new Integer (954), "Cp33722");
+    ccsidToJavaEncodingTable__.put(5346, "Cp1250");
+    ccsidToJavaEncodingTable__.put(5347, "Cp1251");
+    ccsidToJavaEncodingTable__.put(5348, "Cp1252");
+    ccsidToJavaEncodingTable__.put(5349, "Cp1253");
+    ccsidToJavaEncodingTable__.put(5350, "Cp1254");
+    ccsidToJavaEncodingTable__.put(5351, "Cp1255");
+    ccsidToJavaEncodingTable__.put(4909, "Cp813");
+    // We can't map 858 to Cp850 because 858 has Euro characters that
+    // Cp858 doesn't support.
+    ccsidToJavaEncodingTable__.put(858, "Cp850");
+    ccsidToJavaEncodingTable__.put(872, "Cp855");
+    ccsidToJavaEncodingTable__.put(867, "Cp862");
+    ccsidToJavaEncodingTable__.put(17248, "Cp864");
+    ccsidToJavaEncodingTable__.put(808, "Cp866");
+    ccsidToJavaEncodingTable__.put(1162, "Cp847");
+    ccsidToJavaEncodingTable__.put(9044, "Cp852");
+    ccsidToJavaEncodingTable__.put(9048, "Cp856");
+    ccsidToJavaEncodingTable__.put(9049, "Cp857");
+    ccsidToJavaEncodingTable__.put(9061, "Cp869");
+    ccsidToJavaEncodingTable__.put(901, "Cp921");
+    ccsidToJavaEncodingTable__.put(902, "Cp922");
+    ccsidToJavaEncodingTable__.put(21427, "Cp947");
+    // We can't map 1370 to Cp1370 because 1370 has Euro character that
+    // Cp1370 doesn't support.
+    ccsidToJavaEncodingTable__.put(1370, "Cp950");
+    ccsidToJavaEncodingTable__.put(5104, "Cp1008");
+    ccsidToJavaEncodingTable__.put(9238, "Cp1046");
+    ccsidToJavaEncodingTable__.put(848, "Cp1125");
+    ccsidToJavaEncodingTable__.put(1163, "Cp1129");
+    ccsidToJavaEncodingTable__.put(849, "Cp1131");
+    ccsidToJavaEncodingTable__.put(5352, "Cp1256");
+    ccsidToJavaEncodingTable__.put(5353, "Cp1257");
+    ccsidToJavaEncodingTable__.put(5354, "Cp1258");
+
+    ccsidToJavaEncodingTable__.put(37, "Cp037");
+    ccsidToJavaEncodingTable__.put(273, "Cp273");
+    ccsidToJavaEncodingTable__.put(277, "Cp277");
+    ccsidToJavaEncodingTable__.put(278, "Cp278");
+    ccsidToJavaEncodingTable__.put(280, "Cp280");
+    ccsidToJavaEncodingTable__.put(284, "Cp284");
+    ccsidToJavaEncodingTable__.put(285, "Cp285");
+    ccsidToJavaEncodingTable__.put(297, "Cp297");
+    ccsidToJavaEncodingTable__.put(420, "Cp420");
+    ccsidToJavaEncodingTable__.put(424, "Cp424");
+    ccsidToJavaEncodingTable__.put(437, "Cp437");
+    ccsidToJavaEncodingTable__.put(500, "Cp500");
+    ccsidToJavaEncodingTable__.put(737, "Cp737");
+    ccsidToJavaEncodingTable__.put(775, "Cp775");
+    ccsidToJavaEncodingTable__.put(838, "Cp838");
+    ccsidToJavaEncodingTable__.put(850, "Cp850");
+    ccsidToJavaEncodingTable__.put(852, "Cp852");
+    ccsidToJavaEncodingTable__.put(855, "Cp855");
+    ccsidToJavaEncodingTable__.put(856, "Cp856");
+    ccsidToJavaEncodingTable__.put(857, "Cp857");
+    //ccsidToJavaEncodingTable__.put(858, "Cp858");
+    ccsidToJavaEncodingTable__.put(860, "Cp860");
+    ccsidToJavaEncodingTable__.put(861, "Cp861");
+    ccsidToJavaEncodingTable__.put(862, "Cp862");
+    ccsidToJavaEncodingTable__.put(863, "Cp863");
+    ccsidToJavaEncodingTable__.put(864, "Cp864");
+    ccsidToJavaEncodingTable__.put(865, "Cp865");
+    ccsidToJavaEncodingTable__.put(866, "Cp866");
+    ccsidToJavaEncodingTable__.put(868, "Cp868");
+    ccsidToJavaEncodingTable__.put(869, "Cp869");
+    ccsidToJavaEncodingTable__.put(870, "Cp870");
+    ccsidToJavaEncodingTable__.put(871, "Cp871");
+    ccsidToJavaEncodingTable__.put(874, "Cp874");
+    ccsidToJavaEncodingTable__.put(875, "Cp875");
+    ccsidToJavaEncodingTable__.put(918, "Cp918");
+    ccsidToJavaEncodingTable__.put(921, "Cp921");
+    ccsidToJavaEncodingTable__.put(922, "Cp922");
+    ccsidToJavaEncodingTable__.put(930, "Cp930");
+    ccsidToJavaEncodingTable__.put(933, "Cp933");
+    ccsidToJavaEncodingTable__.put(935, "Cp935");
+    ccsidToJavaEncodingTable__.put(937, "Cp937");
+    ccsidToJavaEncodingTable__.put(939, "Cp939");
+    ccsidToJavaEncodingTable__.put(948, "Cp948");
+    ccsidToJavaEncodingTable__.put(950, "Cp950");
+    ccsidToJavaEncodingTable__.put(964, "Cp964");
+    ccsidToJavaEncodingTable__.put(970, "Cp970");
+    ccsidToJavaEncodingTable__.put(1006, "Cp1006");
+    ccsidToJavaEncodingTable__.put(1025, "Cp1025");
+    ccsidToJavaEncodingTable__.put(1026, "Cp1026");
+    ccsidToJavaEncodingTable__.put(1046, "Cp1046");
+    ccsidToJavaEncodingTable__.put(1097, "Cp1097");
+    ccsidToJavaEncodingTable__.put(1098, "Cp1098");
+    ccsidToJavaEncodingTable__.put(1112, "Cp1112");
+    ccsidToJavaEncodingTable__.put(1122, "Cp1122");
+    ccsidToJavaEncodingTable__.put(1123, "Cp1123");
+    ccsidToJavaEncodingTable__.put(1124, "Cp1124");
+    ccsidToJavaEncodingTable__.put(1140, "Cp1140");
+    ccsidToJavaEncodingTable__.put(1141, "Cp1141");
+    ccsidToJavaEncodingTable__.put(1142, "Cp1142");
+    ccsidToJavaEncodingTable__.put(1143, "Cp1143");
+    ccsidToJavaEncodingTable__.put(1144, "Cp1144");
+    ccsidToJavaEncodingTable__.put(1145, "Cp1145");
+    ccsidToJavaEncodingTable__.put(1146, "Cp1146");
+    ccsidToJavaEncodingTable__.put(1147, "Cp1147");
+    ccsidToJavaEncodingTable__.put(1148, "Cp1148");
+    ccsidToJavaEncodingTable__.put(1149, "Cp1149");
+    ccsidToJavaEncodingTable__.put(1250, "Cp1250");
+    ccsidToJavaEncodingTable__.put(1251, "Cp1251");
+    ccsidToJavaEncodingTable__.put(1252, "Cp1252");
+    ccsidToJavaEncodingTable__.put(1253, "Cp1253");
+    ccsidToJavaEncodingTable__.put(1254, "Cp1254");
+    ccsidToJavaEncodingTable__.put(1255, "Cp1255");
+    ccsidToJavaEncodingTable__.put(1256, "Cp1256");
+    ccsidToJavaEncodingTable__.put(1257, "Cp1257");
+    ccsidToJavaEncodingTable__.put(1258, "Cp1258");
+    ccsidToJavaEncodingTable__.put(1381, "Cp1381");
+    ccsidToJavaEncodingTable__.put(1383, "Cp1383");
+    ccsidToJavaEncodingTable__.put(33722, "Cp33722");
+    ccsidToJavaEncodingTable__.put(943, "Cp943");
+    ccsidToJavaEncodingTable__.put(1043, "Cp1043");
+
+    ccsidToJavaEncodingTable__.put(813, "ISO8859_7");
+    ccsidToJavaEncodingTable__.put(819, "ISO8859_1");
+    ccsidToJavaEncodingTable__.put(878, "KOI8_R");
+    ccsidToJavaEncodingTable__.put(912, "ISO8859_2");
+    ccsidToJavaEncodingTable__.put(913, "ISO8859_3");
+    ccsidToJavaEncodingTable__.put(914, "ISO8859_4");
+    ccsidToJavaEncodingTable__.put(915, "ISO8859_5");
+    ccsidToJavaEncodingTable__.put(916, "ISO8859_8");
+    ccsidToJavaEncodingTable__.put(920, "ISO8859_9");
+    ccsidToJavaEncodingTable__.put(923, "ISO8859_15_FDIS");
+    ccsidToJavaEncodingTable__.put(1089, "ISO8859_6");
+    ccsidToJavaEncodingTable__.put(1208, "UTF8");
+    ccsidToJavaEncodingTable__.put(1280, "MacGreek");
+    ccsidToJavaEncodingTable__.put(1281, "MacTurkish");
+    ccsidToJavaEncodingTable__.put(1283, "MacCyrillic");
+    ccsidToJavaEncodingTable__.put(1284, "MacCroatian");
+    ccsidToJavaEncodingTable__.put(1285, "MacRomania");
+    ccsidToJavaEncodingTable__.put(1286, "MacIceland");
+    ccsidToJavaEncodingTable__.put(8482, "Cp290");
+    ccsidToJavaEncodingTable__.put(16684, "Cp300");
+    ccsidToJavaEncodingTable__.put(1390, "Cp930");
+    ccsidToJavaEncodingTable__.put(13121, "Cp833");
+    ccsidToJavaEncodingTable__.put(4930, "Cp834");
+    ccsidToJavaEncodingTable__.put(13124, "Cp836");
+    ccsidToJavaEncodingTable__.put(4933, "Cp837");
+    ccsidToJavaEncodingTable__.put(941, "Cp943");
+    ccsidToJavaEncodingTable__.put(5123, "Cp1027");
+    ccsidToJavaEncodingTable__.put(904, "Cp1043");
+    ccsidToJavaEncodingTable__.put(5210, "Cp1114");
+    ccsidToJavaEncodingTable__.put(367, "ASCII");
+    ccsidToJavaEncodingTable__.put(932, "MS932");
+    ccsidToJavaEncodingTable__.put(1200, "UnicodeBigUnmarked");
+    ccsidToJavaEncodingTable__.put(5026, "Cp930");
+    ccsidToJavaEncodingTable__.put(1399, "Cp939");
+    ccsidToJavaEncodingTable__.put(4396, "Cp300");
+    ccsidToJavaEncodingTable__.put(1388, "Cp935");
+    ccsidToJavaEncodingTable__.put(1364, "Cp933");
+    ccsidToJavaEncodingTable__.put(5035, "Cp939");
+    ccsidToJavaEncodingTable__.put(28709, "Cp37");
+    ccsidToJavaEncodingTable__.put(1114, "Cp1362");
+    ccsidToJavaEncodingTable__.put(954, "Cp33722");
 
     //----the following codepages may  only be supported by IBMSDk 1.3.1
-    ccsidToJavaEncodingTable__.put (new Integer (301), "Cp301");
-    ccsidToJavaEncodingTable__.put (new Integer (1041), "Cp1041");
-    ccsidToJavaEncodingTable__.put (new Integer (1351), "Cp1351");
-    ccsidToJavaEncodingTable__.put (new Integer (1088), "Cp1088");
-    ccsidToJavaEncodingTable__.put (new Integer (951), "Cp951");
-    ccsidToJavaEncodingTable__.put (new Integer (971), "Cp971");
-    ccsidToJavaEncodingTable__.put (new Integer (1362), "Cp1362");
-    ccsidToJavaEncodingTable__.put (new Integer (1363), "Cp1363");
-    ccsidToJavaEncodingTable__.put (new Integer (1115), "Cp1115");
-    ccsidToJavaEncodingTable__.put (new Integer (1380), "Cp1380");
-    ccsidToJavaEncodingTable__.put (new Integer (1386), "Cp1386");
-    ccsidToJavaEncodingTable__.put (new Integer (1385), "Cp1385");
-    ccsidToJavaEncodingTable__.put (new Integer (947), "Cp947");
-    ccsidToJavaEncodingTable__.put (new Integer (942), "Cp942");
-    ccsidToJavaEncodingTable__.put (new Integer (897), "Cp897");
-    ccsidToJavaEncodingTable__.put (new Integer (949), "Cp949");
-    ccsidToJavaEncodingTable__.put (new Integer (927), "Cp927");
-    ccsidToJavaEncodingTable__.put (new Integer (1382), "Cp1382");
-    ccsidToJavaEncodingTable__.put (new Integer (290), "Cp290");
-    ccsidToJavaEncodingTable__.put (new Integer (300), "Cp300");
-    ccsidToJavaEncodingTable__.put (new Integer (1027), "Cp1027");
-    ccsidToJavaEncodingTable__.put (new Integer (16686), "Cp16686");
-    ccsidToJavaEncodingTable__.put (new Integer (833), "Cp833");
-    ccsidToJavaEncodingTable__.put (new Integer (834), "Cp834");
-    ccsidToJavaEncodingTable__.put (new Integer (836), "Cp836");
-    ccsidToJavaEncodingTable__.put (new Integer (837), "Cp837");
-    ccsidToJavaEncodingTable__.put (new Integer (835), "Cp835");
-    ccsidToJavaEncodingTable__.put (new Integer (895), "Cp33722");
-    ccsidToJavaEncodingTable__.put (new Integer (1051), "Cp1051");
-    ccsidToJavaEncodingTable__.put (new Integer (13488), "UnicodeBigUnmarked");
-
-  }
+    ccsidToJavaEncodingTable__.put(301, "Cp301");
+    ccsidToJavaEncodingTable__.put(1041, "Cp1041");
+    ccsidToJavaEncodingTable__.put(1351, "Cp1351");
+    ccsidToJavaEncodingTable__.put(1088, "Cp1088");
+    ccsidToJavaEncodingTable__.put(951, "Cp951");
+    ccsidToJavaEncodingTable__.put(971, "Cp971");
+    ccsidToJavaEncodingTable__.put(1362, "Cp1362");
+    ccsidToJavaEncodingTable__.put(1363, "Cp1363");
+    ccsidToJavaEncodingTable__.put(1115, "Cp1115");
+    ccsidToJavaEncodingTable__.put(1380, "Cp1380");
+    ccsidToJavaEncodingTable__.put(1386, "Cp1386");
+    ccsidToJavaEncodingTable__.put(1385, "Cp1385");
+    ccsidToJavaEncodingTable__.put(947, "Cp947");
+    ccsidToJavaEncodingTable__.put(942, "Cp942");
+    ccsidToJavaEncodingTable__.put(897, "Cp897");
+    ccsidToJavaEncodingTable__.put(949, "Cp949");
+    ccsidToJavaEncodingTable__.put(927, "Cp927");
+    ccsidToJavaEncodingTable__.put(1382, "Cp1382");
+    ccsidToJavaEncodingTable__.put(290, "Cp290");
+    ccsidToJavaEncodingTable__.put(300, "Cp300");
+    ccsidToJavaEncodingTable__.put(1027, "Cp1027");
+    ccsidToJavaEncodingTable__.put(16686, "Cp16686");
+    ccsidToJavaEncodingTable__.put(833, "Cp833");
+    ccsidToJavaEncodingTable__.put(834, "Cp834");
+    ccsidToJavaEncodingTable__.put(836, "Cp836");
+    ccsidToJavaEncodingTable__.put(837, "Cp837");
+    ccsidToJavaEncodingTable__.put(835, "Cp835");
+    ccsidToJavaEncodingTable__.put(895, "Cp33722");
+    ccsidToJavaEncodingTable__.put(1051, "Cp1051");
+    ccsidToJavaEncodingTable__.put(13488, "UnicodeBigUnmarked");
 
-  /*
-  public static int getCCSID (String javaEncoding) throws java.io.UnsupportedEncodingException
-  {
-    int ccsid = ((Integer) javaEncodingToCCSIDTable__.get (javaEncoding)).intValue();
-    if (ccsid == 0)
-      throw new java.io.UnsupportedEncodingException ("unsupported java encoding");
-    else
-      return ccsid;
   }
-  */
 
   public static String getJavaEncoding (int ccsid) throws java.io.UnsupportedEncodingException
   {
     String javaEncoding = ccsidToJavaEncodingTable__.get(ccsid);
-    if (javaEncoding == null)
+    if (javaEncoding == null) {
       throw new java.io.UnsupportedEncodingException ("unsupported ccsid");
-    else
+    } else {
       return javaEncoding;
+    }
   }
 }

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CodePointNameTable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CodePointNameTable.java?rev=1365468&r1=1365467&r2=1365468&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CodePointNameTable.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/CodePointNameTable.java Wed Jul 25 06:47:20 2012
@@ -30,137 +30,137 @@ class CodePointNameTable extends java.ut
 {
   CodePointNameTable ()
   {
-    put (new Integer (CodePoint.ABNUOWRM), "ABNUOWRM");
-    put (new Integer (CodePoint.ACCRDB), "ACCRDB");
-    put (new Integer (CodePoint.ACCRDBRM), "ACCRDBRM");
-    put (new Integer (CodePoint.ACCSEC), "ACCSEC");
-    put (new Integer (CodePoint.ACCSECRD), "ACCSECRD");
-    put (new Integer (CodePoint.AGENT), "AGENT");
-    put (new Integer (CodePoint.AGNPRMRM), "AGNPRMRM");
-    put (new Integer (CodePoint.BGNBND), "BGNBND");
-    put (new Integer (CodePoint.BGNBNDRM), "BGNBNDRM");
-    put (new Integer (CodePoint.BNDSQLSTT), "BNDSQLSTT");
-    put (new Integer (CodePoint.CCSIDSBC), "CCSIDSBC");
-    put (new Integer (CodePoint.CCSIDMBC), "CCSIDMBC");
-    put (new Integer (CodePoint.CCSIDDBC), "CCSIDDBC");
-    put (new Integer (CodePoint.CLSQRY), "CLSQRY");
-    put (new Integer (CodePoint.CMDATHRM), "CMDATHRM");
-    put (new Integer (CodePoint.CMDCHKRM), "CMDCHKRM");
-    put (new Integer (CodePoint.CMDCMPRM), "CMDCMPRM");
-    put (new Integer (CodePoint.CMDNSPRM), "CMDNSPRM");
-    put (new Integer (CodePoint.CMMRQSRM), "CMMRQSRM");
-    put (new Integer (CodePoint.CMDVLTRM), "CMDVLTRM");
-    put (new Integer (CodePoint.CNTQRY), "CNTQRY");
-    put (new Integer (CodePoint.CRRTKN), "CRRTKN");
-    put (new Integer (CodePoint.DRPPKG), "DRPPKG");
-    put (new Integer (CodePoint.DSCRDBTBL), "DSCRDBTBL");
-    put (new Integer (CodePoint.DSCINVRM), "DSCINVRM");
-    put (new Integer (CodePoint.DSCSQLSTT), "DSCSQLSTT");
-    put (new Integer (CodePoint.DTAMCHRM), "DTAMCHRM");
-    put (new Integer (CodePoint.ENDBND), "ENDBND");
-    put (new Integer (CodePoint.ENDQRYRM), "ENDQRYRM");
-    put (new Integer (CodePoint.ENDUOWRM), "ENDUOWRM");
-    put (new Integer (CodePoint.EXCSAT), "EXCSAT");
-    put (new Integer (CodePoint.EXCSATRD), "EXCSATRD");
-    put (new Integer (CodePoint.EXCSQLIMM), "EXCSQLIMM");
-    put (new Integer (CodePoint.EXCSQLSET), "EXCSQLSET");
-    put (new Integer (CodePoint.EXCSQLSTT), "EXCSQLSTT");
-    put (new Integer (CodePoint.EXTNAM), "EXTNAM");
-    put (new Integer (CodePoint.FRCFIXROW), "FRCFIXROW");
-    put (new Integer (CodePoint.MAXBLKEXT), "MAXBLKEXT");
-    put (new Integer (CodePoint.MAXRSLCNT), "MAXRSLCNT");
-    put (new Integer (CodePoint.MGRDEPRM), "MGRDEPRM");
-    put (new Integer (CodePoint.MGRLVLLS), "MGRLVLLS");
-    put (new Integer (CodePoint.MGRLVLRM), "MGRLVLRM");
-    put (new Integer (CodePoint.MONITOR), "MONITOR");
-    put (new Integer (CodePoint.NBRROW), "NBRROW");
-    put (new Integer (CodePoint.OBJNSPRM), "OBJNSPRM");
-    put (new Integer (CodePoint.OPNQFLRM), "OPNQFLRM");
-    put (new Integer (CodePoint.OPNQRY), "OPNQRY");
-    put (new Integer (CodePoint.OPNQRYRM), "OPNQRYRM");
-    put (new Integer (CodePoint.OUTEXP), "OUTEXP");
-    put (new Integer (CodePoint.OUTOVR), "OUTOVR");
-    put (new Integer (CodePoint.OUTOVROPT), "OUTOVROPT");
-    put (new Integer (CodePoint.PASSWORD), "PASSWORD");
-    put (new Integer (CodePoint.PKGID), "PKGID");
-    put (new Integer (CodePoint.PKGBNARM), "PKGBNARM");
-    put (new Integer (CodePoint.PKGBPARM), "PKGBPARM");
-    put (new Integer (CodePoint.PKGNAMCSN), "PKGNAMCSN");
-    put (new Integer (CodePoint.PKGNAMCT), "PKGNAMCT");
-    put (new Integer (CodePoint.PRCCNVRM), "PRCCNVRM");
-    put (new Integer (CodePoint.PRDID), "PRDID");
-    put (new Integer (CodePoint.PRDDTA), "PRDDTA");
-    put (new Integer (CodePoint.PRMNSPRM), "PRMNSPRM");
-    put (new Integer (CodePoint.PRPSQLSTT), "PRPSQLSTT");
-    put (new Integer (CodePoint.QRYBLKCTL), "QRYBLKCTL");
-    put (new Integer (CodePoint.QRYBLKRST), "QRYBLKRST");
-    put (new Integer (CodePoint.QRYBLKSZ), "QRYBLKSZ");
-    put (new Integer (CodePoint.QRYCLSIMP), "QRYCLSIMP");
-    put (new Integer (CodePoint.QRYCLSRLS), "QRYCLSRLS");
-    put (new Integer (CodePoint.QRYDSC), "QRYDSC");
-    put (new Integer (CodePoint.QRYDTA), "QRYDTA");
-    put (new Integer (CodePoint.QRYINSID), "QRYINSID");
-    put (new Integer (CodePoint.QRYNOPRM), "QRYNOPRM");
-    put (new Integer (CodePoint.QRYPOPRM), "QRYPOPRM");
-    put (new Integer (CodePoint.QRYRELSCR), "QRYRELSCR");
-    put (new Integer (CodePoint.QRYRFRTBL), "QRYRFRTBL");
-    put (new Integer (CodePoint.QRYROWNBR), "QRYROWNBR");
-    put (new Integer (CodePoint.QRYROWSNS), "QRYROWSNS");
-    put (new Integer (CodePoint.QRYRTNDTA), "QRYRTNDTA");
-    put (new Integer (CodePoint.QRYSCRORN), "QRYSCRORN");
-    put (new Integer (CodePoint.QRYROWSET), "QRYROWSET");
-    put (new Integer (CodePoint.RDBAFLRM), "RDBAFLRM");
-    put (new Integer (CodePoint.RDBACCCL), "RDBACCCL");
-    put (new Integer (CodePoint.RDBACCRM), "RDBACCRM");
-    put (new Integer (CodePoint.RDBALWUPD), "RDBALWUPD");
-    put (new Integer (CodePoint.RDBATHRM), "RDBATHRM");
-    put (new Integer (CodePoint.RDBCMM), "RDBCMM");
-    put (new Integer (CodePoint.RDBCMTOK), "RDBCMTOK");
-    put (new Integer (CodePoint.RDBNACRM), "RDBNACRM");
-    put (new Integer (CodePoint.RDBNAM), "RDBNAM");
-    put (new Integer (CodePoint.RDBNFNRM), "RDBNFNRM");
-    put (new Integer (CodePoint.RDBRLLBCK), "RDBRLLBCK");
-    put (new Integer (CodePoint.RDBUPDRM), "RDBUPDRM");
-    put (new Integer (CodePoint.REBIND), "REBIND");
-    put (new Integer (CodePoint.RSCLMTRM), "RSCLMTRM");
-    put (new Integer (CodePoint.RSLSETRM), "RSLSETRM");
-    put (new Integer (CodePoint.RTNEXTDTA), "RTNEXTDTA");
-    put (new Integer (CodePoint.RTNSQLDA), "RTNSQLDA");
-    put (new Integer (CodePoint.SECCHK), "SECCHK");
-    put (new Integer (CodePoint.SECCHKCD), "SECCHKCD");
-    put (new Integer (CodePoint.SECCHKRM), "SECCHKRM");
-    put (new Integer (CodePoint.SECMEC), "SECMEC");
-    put (new Integer (CodePoint.SECMGRNM), "SECMGRNM");
-    put (new Integer (CodePoint.SECTKN), "SECTKN");
-    put (new Integer (CodePoint.SPVNAM), "SPVNAM");
-    put (new Integer (CodePoint.SQLAM), "SQLAM");
-    put (new Integer (CodePoint.SQLATTR), "SQLATTR");
-    put (new Integer (CodePoint.SQLCARD), "SQLCARD");
-    put (new Integer (CodePoint.SQLERRRM), "SQLERRRM");
-    put (new Integer (CodePoint.SQLDARD), "SQLDARD");
-    put (new Integer (CodePoint.SQLDTA), "SQLDTA");
-    put (new Integer (CodePoint.SQLDTARD), "SQLDTARD");
-    put (new Integer (CodePoint.SQLSTT), "SQLSTT");
-    put (new Integer (CodePoint.SQLSTTVRB), "SQLSTTVRB");
-    put (new Integer (CodePoint.SRVCLSNM), "SRVCLSNM");
-    put (new Integer (CodePoint.SRVRLSLV), "SRVRLSLV");
-    put (new Integer (CodePoint.SRVNAM), "SRVNAM");
-    put (new Integer (CodePoint.SVRCOD), "SVRCOD");
-    put (new Integer (CodePoint.SYNCCTL), "SYNCCTL");
-    put (new Integer (CodePoint.SYNCLOG), "SYNCLOG");
-    put (new Integer (CodePoint.SYNCRSY), "SYNCRSY");
-    put (new Integer (CodePoint.SYNTAXRM), "SYNTAXRM");
-    put (new Integer (CodePoint.TRGNSPRM), "TRGNSPRM");
-    put (new Integer (CodePoint.TYPDEFNAM), "TYPDEFNAM");
-    put (new Integer (CodePoint.TYPDEFOVR), "TYPDEFOVR");
-    put (new Integer (CodePoint.TYPSQLDA), "TYPSQLDA");
-    put (new Integer (CodePoint.UOWDSP), "UOWDSP");
-    put (new Integer (CodePoint.USRID), "USRID");
-    put (new Integer (CodePoint.VALNSPRM), "VALNSPRM");
-    put (new Integer (CodePoint.PBSD), "PBSD");
-    put (new Integer (CodePoint.PBSD_ISO), "PBSD_ISO");
-    put (new Integer (CodePoint.PBSD_SCHEMA), "PBSD_SCHEMA");
-    put (new Integer (CodePoint.UNICODEMGR), "UNICODEMGR");
+    put(CodePoint.ABNUOWRM, "ABNUOWRM");
+    put(CodePoint.ACCRDB, "ACCRDB");
+    put(CodePoint.ACCRDBRM, "ACCRDBRM");
+    put(CodePoint.ACCSEC, "ACCSEC");
+    put(CodePoint.ACCSECRD, "ACCSECRD");
+    put(CodePoint.AGENT, "AGENT");
+    put(CodePoint.AGNPRMRM, "AGNPRMRM");
+    put(CodePoint.BGNBND, "BGNBND");
+    put(CodePoint.BGNBNDRM, "BGNBNDRM");
+    put(CodePoint.BNDSQLSTT, "BNDSQLSTT");
+    put(CodePoint.CCSIDSBC, "CCSIDSBC");
+    put(CodePoint.CCSIDMBC, "CCSIDMBC");
+    put(CodePoint.CCSIDDBC, "CCSIDDBC");
+    put(CodePoint.CLSQRY, "CLSQRY");
+    put(CodePoint.CMDATHRM, "CMDATHRM");
+    put(CodePoint.CMDCHKRM, "CMDCHKRM");
+    put(CodePoint.CMDCMPRM, "CMDCMPRM");
+    put(CodePoint.CMDNSPRM, "CMDNSPRM");
+    put(CodePoint.CMMRQSRM, "CMMRQSRM");
+    put(CodePoint.CMDVLTRM, "CMDVLTRM");
+    put(CodePoint.CNTQRY, "CNTQRY");
+    put(CodePoint.CRRTKN, "CRRTKN");
+    put(CodePoint.DRPPKG, "DRPPKG");
+    put(CodePoint.DSCRDBTBL, "DSCRDBTBL");
+    put(CodePoint.DSCINVRM, "DSCINVRM");
+    put(CodePoint.DSCSQLSTT, "DSCSQLSTT");
+    put(CodePoint.DTAMCHRM, "DTAMCHRM");
+    put(CodePoint.ENDBND, "ENDBND");
+    put(CodePoint.ENDQRYRM, "ENDQRYRM");
+    put(CodePoint.ENDUOWRM, "ENDUOWRM");
+    put(CodePoint.EXCSAT, "EXCSAT");
+    put(CodePoint.EXCSATRD, "EXCSATRD");
+    put(CodePoint.EXCSQLIMM, "EXCSQLIMM");
+    put(CodePoint.EXCSQLSET, "EXCSQLSET");
+    put(CodePoint.EXCSQLSTT, "EXCSQLSTT");
+    put(CodePoint.EXTNAM, "EXTNAM");
+    put(CodePoint.FRCFIXROW, "FRCFIXROW");
+    put(CodePoint.MAXBLKEXT, "MAXBLKEXT");
+    put(CodePoint.MAXRSLCNT, "MAXRSLCNT");
+    put(CodePoint.MGRDEPRM, "MGRDEPRM");
+    put(CodePoint.MGRLVLLS, "MGRLVLLS");
+    put(CodePoint.MGRLVLRM, "MGRLVLRM");
+    put(CodePoint.MONITOR, "MONITOR");
+    put(CodePoint.NBRROW, "NBRROW");
+    put(CodePoint.OBJNSPRM, "OBJNSPRM");
+    put(CodePoint.OPNQFLRM, "OPNQFLRM");
+    put(CodePoint.OPNQRY, "OPNQRY");
+    put(CodePoint.OPNQRYRM, "OPNQRYRM");
+    put(CodePoint.OUTEXP, "OUTEXP");
+    put(CodePoint.OUTOVR, "OUTOVR");
+    put(CodePoint.OUTOVROPT, "OUTOVROPT");
+    put(CodePoint.PASSWORD, "PASSWORD");
+    put(CodePoint.PKGID, "PKGID");
+    put(CodePoint.PKGBNARM, "PKGBNARM");
+    put(CodePoint.PKGBPARM, "PKGBPARM");
+    put(CodePoint.PKGNAMCSN, "PKGNAMCSN");
+    put(CodePoint.PKGNAMCT, "PKGNAMCT");
+    put(CodePoint.PRCCNVRM, "PRCCNVRM");
+    put(CodePoint.PRDID, "PRDID");
+    put(CodePoint.PRDDTA, "PRDDTA");
+    put(CodePoint.PRMNSPRM, "PRMNSPRM");
+    put(CodePoint.PRPSQLSTT, "PRPSQLSTT");
+    put(CodePoint.QRYBLKCTL, "QRYBLKCTL");
+    put(CodePoint.QRYBLKRST, "QRYBLKRST");
+    put(CodePoint.QRYBLKSZ, "QRYBLKSZ");
+    put(CodePoint.QRYCLSIMP, "QRYCLSIMP");
+    put(CodePoint.QRYCLSRLS, "QRYCLSRLS");
+    put(CodePoint.QRYDSC, "QRYDSC");
+    put(CodePoint.QRYDTA, "QRYDTA");
+    put(CodePoint.QRYINSID, "QRYINSID");
+    put(CodePoint.QRYNOPRM, "QRYNOPRM");
+    put(CodePoint.QRYPOPRM, "QRYPOPRM");
+    put(CodePoint.QRYRELSCR, "QRYRELSCR");
+    put(CodePoint.QRYRFRTBL, "QRYRFRTBL");
+    put(CodePoint.QRYROWNBR, "QRYROWNBR");
+    put(CodePoint.QRYROWSNS, "QRYROWSNS");
+    put(CodePoint.QRYRTNDTA, "QRYRTNDTA");
+    put(CodePoint.QRYSCRORN, "QRYSCRORN");
+    put(CodePoint.QRYROWSET, "QRYROWSET");
+    put(CodePoint.RDBAFLRM, "RDBAFLRM");
+    put(CodePoint.RDBACCCL, "RDBACCCL");
+    put(CodePoint.RDBACCRM, "RDBACCRM");
+    put(CodePoint.RDBALWUPD, "RDBALWUPD");
+    put(CodePoint.RDBATHRM, "RDBATHRM");
+    put(CodePoint.RDBCMM, "RDBCMM");
+    put(CodePoint.RDBCMTOK, "RDBCMTOK");
+    put(CodePoint.RDBNACRM, "RDBNACRM");
+    put(CodePoint.RDBNAM, "RDBNAM");
+    put(CodePoint.RDBNFNRM, "RDBNFNRM");
+    put(CodePoint.RDBRLLBCK, "RDBRLLBCK");
+    put(CodePoint.RDBUPDRM, "RDBUPDRM");
+    put(CodePoint.REBIND, "REBIND");
+    put(CodePoint.RSCLMTRM, "RSCLMTRM");
+    put(CodePoint.RSLSETRM, "RSLSETRM");
+    put(CodePoint.RTNEXTDTA, "RTNEXTDTA");
+    put(CodePoint.RTNSQLDA, "RTNSQLDA");
+    put(CodePoint.SECCHK, "SECCHK");
+    put(CodePoint.SECCHKCD, "SECCHKCD");
+    put(CodePoint.SECCHKRM, "SECCHKRM");
+    put(CodePoint.SECMEC, "SECMEC");
+    put(CodePoint.SECMGRNM, "SECMGRNM");
+    put(CodePoint.SECTKN, "SECTKN");
+    put(CodePoint.SPVNAM, "SPVNAM");
+    put(CodePoint.SQLAM, "SQLAM");
+    put(CodePoint.SQLATTR, "SQLATTR");
+    put(CodePoint.SQLCARD, "SQLCARD");
+    put(CodePoint.SQLERRRM, "SQLERRRM");
+    put(CodePoint.SQLDARD, "SQLDARD");
+    put(CodePoint.SQLDTA, "SQLDTA");
+    put(CodePoint.SQLDTARD, "SQLDTARD");
+    put(CodePoint.SQLSTT, "SQLSTT");
+    put(CodePoint.SQLSTTVRB, "SQLSTTVRB");
+    put(CodePoint.SRVCLSNM, "SRVCLSNM");
+    put(CodePoint.SRVRLSLV, "SRVRLSLV");
+    put(CodePoint.SRVNAM, "SRVNAM");
+    put(CodePoint.SVRCOD, "SVRCOD");
+    put(CodePoint.SYNCCTL, "SYNCCTL");
+    put(CodePoint.SYNCLOG, "SYNCLOG");
+    put(CodePoint.SYNCRSY, "SYNCRSY");
+    put(CodePoint.SYNTAXRM, "SYNTAXRM");
+    put(CodePoint.TRGNSPRM, "TRGNSPRM");
+    put(CodePoint.TYPDEFNAM, "TYPDEFNAM");
+    put(CodePoint.TYPDEFOVR, "TYPDEFOVR");
+    put(CodePoint.TYPSQLDA, "TYPSQLDA");
+    put(CodePoint.UOWDSP, "UOWDSP");
+    put(CodePoint.USRID, "USRID");
+    put(CodePoint.VALNSPRM, "VALNSPRM");
+    put(CodePoint.PBSD, "PBSD");
+    put(CodePoint.PBSD_ISO, "PBSD_ISO");
+    put(CodePoint.PBSD_SCHEMA, "PBSD_SCHEMA");
+    put(CodePoint.UNICODEMGR, "UNICODEMGR");
   }
 
   String lookup (int codePoint)

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java?rev=1365468&r1=1365467&r2=1365468&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java Wed Jul 25 06:47:20 2012
@@ -1721,7 +1721,7 @@ class DRDAConnThread extends Thread {
 			managerLevel = reader.readNetworkShort();
 			if (CodePoint.isKnownManager(manager))
 			{
-				knownManagers.add(new Integer(manager));
+                knownManagers.add(manager);
 				//if the manager level hasn't been set, set it
 				currentLevel = appRequester.getManagerLevel(manager);
 				if (currentLevel == AppRequester.MGR_LEVEL_UNKNOWN)
@@ -1734,15 +1734,15 @@ class DRDAConnThread extends Thread {
 					if (currentLevel != managerLevel)
 					{
 						//keep a list of conflicting managers
-						errorManagers.add(new Integer(manager));
-						errorManagersLevel.add(new Integer (managerLevel));
+                        errorManagers.add(manager);
+                        errorManagersLevel.add(managerLevel);
 					}
 				}
 
 			}
 			else
             {
-				unknownManagers.add(new Integer(manager));
+                unknownManagers.add(manager);
             }
 
             if (SanityManager.DEBUG) {

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAProtocolException.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAProtocolException.java?rev=1365468&r1=1365467&r2=1365468&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAProtocolException.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAProtocolException.java Wed Jul 25 06:47:20 2012
@@ -336,7 +336,7 @@ class DRDAProtocolException extends Exce
 	{
         if ( SanityManager.DEBUG )
             agent.trace("agentError in " + agent);
-		Object[] oa = {new Integer(svrcod), rdbnam, srvdgn};
+        Object[] oa = {svrcod, rdbnam, srvdgn};
 		return new DRDAProtocolException(DRDA_AgentError,
 										agent,
 										NO_CODPNT_ARG,

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java?rev=1365468&r1=1365467&r2=1365468&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java Wed Jul 25 06:47:20 2012
@@ -263,7 +263,7 @@ class DRDAResultSet
 			rsExtPositions = new java.util.ArrayList<Integer>();
 		
 		// need to record the 0 based position so subtract 1
-		rsExtPositions.add (new Integer(jdbcIndex -1 ));
+        rsExtPositions.add(jdbcIndex - 1);
 
 	}
 

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DssTrace.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DssTrace.java?rev=1365468&r1=1365467&r2=1365468&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DssTrace.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DssTrace.java Wed Jul 25 06:47:20 2012
@@ -145,7 +145,7 @@ public class DssTrace
   // method entry and exit tracing.  Since each trace may be writing
   // to different logs, separate objects will be used to perform the
   // synchronization.
-  private Boolean comBufferSync = new Boolean (true);
+  private final Object comBufferSync = new Object();
 
 
   // The zero character is defined for convinience.

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?rev=1365468&r1=1365467&r2=1365468&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java Wed Jul 25 06:47:20 2012
@@ -1302,9 +1302,10 @@ public final class NetworkServerControlI
 			consolePropertyMessage("DRDA_TraceChangeAll.I", on ? "DRDA_ON.I" : "DRDA_OFF.I");
 		else
 		{
-			String[] args = new String[2];
-			args[0] = on ? "DRDA_ON.I" : "DRDA_OFF.I";
-			args[1] = new Integer(connNum).toString();
+            String[] args = {
+                on ? "DRDA_ON.I" : "DRDA_OFF.I",
+                Integer.toString(connNum),
+            };
 			consolePropertyMessage("DRDA_TraceChangeOne.I", args);
 		}
 	}
@@ -1411,8 +1412,8 @@ public final class NetworkServerControlI
             send();
             readResult();
             int newval = readInt();
-            consolePropertyMessage("DRDA_MaxThreadsChange.I", new Integer(
-                    newval).toString());
+            consolePropertyMessage("DRDA_MaxThreadsChange.I",
+                    String.valueOf(newval));
         } finally {
             closeSocket();
         }		
@@ -1438,7 +1439,7 @@ public final class NetworkServerControlI
             readResult();
             int newval = readInt();
             consolePropertyMessage("DRDA_TimeSliceChange.I",
-                    new Integer(newval).toString());
+                    String.valueOf(newval));
         } finally {
             closeSocket();
         }  
@@ -1500,7 +1501,7 @@ public final class NetworkServerControlI
 	 */
 	protected void removeFromSessionTable(int sessionid)
 	{
-		sessionTable.remove(new Integer(sessionid));
+        sessionTable.remove(sessionid);
 	}
 
 	/**
@@ -1631,8 +1632,10 @@ public final class NetworkServerControlI
 			String codeset = null;
 			// get the version
 			int version = reader.readNetworkShort();
-			if (version <= 0 || version > MAX_ALLOWED_PROTOCOL_VERSION)
-				throw new Throwable(langUtil.getTextMessage("DRDA_UnknownProtocol.S",  new Integer(version).toString()));
+            if (version <= 0 || version > MAX_ALLOWED_PROTOCOL_VERSION) {
+                throw new Throwable(langUtil.getTextMessage(
+                        "DRDA_UnknownProtocol.S", version));
+            }
 			int localeLen = reader.readByte();
 			if (localeLen > 0)
 			{
@@ -1700,7 +1703,7 @@ public final class NetworkServerControlI
 							sendMessage(writer, ERROR,  
 							    localizeMessage("DRDA_SessionNotFound.U", 
 									    (session.langUtil == null) ? langUtil : session.langUtil,
-									    new String [] {new Integer(sessionArg).toString()}));
+									    new String [] {Integer.toString(sessionArg)}));
 					    else
 							sendMessage(writer, ERROR,  
 										localizeMessage("DRDA_ErrorStartingTracing.S",null));          
@@ -1747,7 +1750,7 @@ public final class NetworkServerControlI
 					int newval = getMaxThreads();
 					sendOKInt(writer, newval);
 					consolePropertyMessage("DRDA_MaxThreadsChange.I", 
-						new Integer(newval).toString());
+                        String.valueOf(newval));
 					break;
 				case COMMAND_TIMESLICE:
 					int timeslice = reader.readNetworkInt();
@@ -1760,7 +1763,7 @@ public final class NetworkServerControlI
 					newval = getTimeSlice();
 					sendOKInt(writer, newval);
 					consolePropertyMessage("DRDA_TimeSliceChange.I", 
-						new Integer(newval).toString());
+                        String.valueOf(newval));
 					break;
 			}
 		} catch (DRDAProtocolException e) {
@@ -2239,7 +2242,7 @@ public final class NetworkServerControlI
 			case COMMAND_TESTCONNECTION:
 				ping();
 				consolePropertyMessage("DRDA_ConnectionTested.I", new String [] 
-					{hostArg, (new Integer(portNumber)).toString()});
+					{hostArg, Integer.toString(portNumber)});
 				break;
 			case COMMAND_LOGCONNECTIONS:
 				{
@@ -2264,7 +2267,7 @@ public final class NetworkServerControlI
 				}
 				if (max < MIN_MAXTHREADS)
 					consolePropertyMessage("DRDA_InvalidValue.U", new String [] 
-						{new Integer(max).toString(), "maxthreads"});
+						{Integer.toString(max), "maxthreads"});
 				netSetMaxThreads(max);
 
 				break;
@@ -2283,7 +2286,7 @@ public final class NetworkServerControlI
             	}
 				if (timeslice < MIN_TIMESLICE)
 					consolePropertyMessage("DRDA_InvalidValue.U", new String [] 
-						{new Integer(timeslice).toString(), "timeslice"});
+						{Integer.toString(timeslice), "timeslice"});
 				netSetTimeSlice(timeslice);
 				
 				break;
@@ -2572,9 +2575,11 @@ public final class NetworkServerControlI
 			}
 			else if (e1 instanceof IOException) {
 					consolePropertyMessage("DRDA_NoIO.S",
-										   new String [] {hostArg, 
-														  (new Integer(portNumber)).toString(), 
-														  e1.getMessage()});
+                        new String [] {
+                            hostArg,
+                            Integer.toString(portNumber),
+                            e1.getMessage()
+                        });
 			}
 		} catch (Exception e) {
 		// If we find other (unexpected) errors, we ultimately exit--so make
@@ -3211,7 +3216,7 @@ public final class NetworkServerControlI
 	{
 		int val = 0;
 		try {
-			 val = (new Integer(propVal)).intValue();
+            val = Integer.parseInt(propVal);
 		} catch (Exception e)
 		{
 			consolePropertyMessage("DRDA_InvalidPropVal.S", new String [] 
@@ -3651,7 +3656,7 @@ public final class NetworkServerControlI
 	{
 		if (value < MIN_TIMESLICE)
 			consolePropertyMessage("DRDA_InvalidValue.U", new String [] 
-				{new Integer(value).toString(), "timeslice"});
+				{Integer.toString(value), "timeslice"});
 		if (value == USE_DEFAULT)
 			value = DEFAULT_TIMESLICE;
 		synchronized(timeSliceSync) {
@@ -3711,7 +3716,7 @@ public final class NetworkServerControlI
 	{
 		if (value < MIN_MAXTHREADS)
 			consolePropertyMessage("DRDA_InvalidValue.U", new String [] 
-				{new Integer(value).toString(), "maxthreads"});
+				{Integer.toString(value), "maxthreads"});
 		if (value == USE_DEFAULT)
 			value = DEFAULT_MAXTHREADS;
 		synchronized(threadsSync) {
@@ -3860,20 +3865,20 @@ public final class NetworkServerControlI
 	Properties getPropertyValues()
 	{
 		Properties retval = new Properties();
-		retval.put(Property.DRDA_PROP_PORTNUMBER, new Integer(portNumber).toString());
+		retval.put(Property.DRDA_PROP_PORTNUMBER, Integer.toString(portNumber));
 		retval.put(Property.DRDA_PROP_HOSTNAME, hostArg);
-		retval.put(Property.DRDA_PROP_KEEPALIVE, new Boolean(keepAlive).toString());
+		retval.put(Property.DRDA_PROP_KEEPALIVE, Boolean.toString(keepAlive));
 
 		String tracedir = getTraceDirectory();
 		if (tracedir != null)
 			retval.put(Property.DRDA_PROP_TRACEDIRECTORY, tracedir);
-		retval.put(Property.DRDA_PROP_TRACEALL, new Boolean(getTraceAll()).toString());
-		retval.put(Property.DRDA_PROP_MINTHREADS, new Integer(getMinThreads()).toString());
-		retval.put(Property.DRDA_PROP_MAXTHREADS, new Integer(getMaxThreads()).toString());
-		retval.put(Property.DRDA_PROP_TIMESLICE, new Integer(getTimeSlice()).toString());
+		retval.put(Property.DRDA_PROP_TRACEALL, Boolean.toString(getTraceAll()));
+		retval.put(Property.DRDA_PROP_MINTHREADS, Integer.toString(getMinThreads()));
+		retval.put(Property.DRDA_PROP_MAXTHREADS, Integer.toString(getMaxThreads()));
+		retval.put(Property.DRDA_PROP_TIMESLICE, Integer.toString(getTimeSlice()));
 
-		retval.put(Property.DRDA_PROP_TIMESLICE, new  Integer(getTimeSlice()).toString());
-		retval.put(Property.DRDA_PROP_LOGCONNECTIONS, new Boolean(getLogConnections()).toString());
+		retval.put(Property.DRDA_PROP_TIMESLICE, Integer.toString(getTimeSlice()));
+		retval.put(Property.DRDA_PROP_LOGCONNECTIONS, Boolean.toString(getLogConnections()));
 		String startDRDA = PropertyUtil.getSystemProperty(Property.START_DRDA);
 		//DERBY-375 If a system property is specified without any value, getProperty returns 
 		//an empty string. Use default values in such cases.
@@ -3933,7 +3938,7 @@ public final class NetworkServerControlI
 		Session session = new Session(this,connectionNumber, clientSocket,
 									  getTraceDirectory(), getTraceAll());
 
-		sessionTable.put(new Integer(connectionNumber), session);
+        sessionTable.put(connectionNumber, session);
 
 		// Check whether there are enough free threads to service all the
 		// threads in the run queue in addition to the newly added session.



Mime
View raw message