Fix build.

Some code tidying (issue 1274)


git-svn-id: http://svn.dmdirc.com/trunk@4158 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/parser/IRCParser.java

@@ -1036,11 +1036,10 @@ public class IRCParser implements Runnable {
 			callErrorInfo(ei);
 		}
 	}
-
-
+	
 	/** The IRCStringConverter for this parser */
 	private IRCStringConverter stringConverter = null;
-
+	
 	/**
 	 * Get the IRCStringConverter used by this parser.
 	 *
@@ -1054,13 +1053,6 @@ public class IRCParser implements Runnable {
 		return stringConverter;
 	}
 	
-	/**
-	 * Get last used chararray limit.
-	 *
-	 * @return last used chararray limit
-	 */
-	protected int getLastLimit() { return getIRCStringConverter().getLimit(); }
-
 	/**
 	 * Update the character arrays.
 	 *

src/com/dmdirc/parser/Process004005.java

@@ -68,7 +68,7 @@ public class Process004005 extends IRCProcessor {
 					} else if (!sValue.equalsIgnoreCase("rfc1459")) {
 						myParser.callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Unknown casemapping: '"+sValue+"' - assuming rfc1459", myParser.getLastLine()));
 					}
-					final boolean limitChanged = (myParser.getLastLimit() != limit);
+					final boolean limitChanged = (myParser.getIRCStringConverter().getLimit() != limit);
 					myParser.updateCharArrays(limit);
 					if (limitChanged && myParser.knownClients() == 1) {
 							// This means that the casemapping is not rfc1459

test/com/dmdirc/parser/IRCStringConverterTest.java

@@ -45,21 +45,21 @@ public class IRCStringConverterTest extends junit.framework.TestCase {
         };
 
         for (String[] testcase : testcases) {
-            final String asciiL = asciiParser.toLowerCase(testcase[0]);
-            final String rfcL = rfcParser.toLowerCase(testcase[0]);
-            final String strictL = strictParser.toLowerCase(testcase[0]);
+            final String asciiL = asciiParser.getIRCStringConverter().toLowerCase(testcase[0]);
+            final String rfcL = rfcParser.getIRCStringConverter().toLowerCase(testcase[0]);
+            final String strictL = strictParser.getIRCStringConverter().toLowerCase(testcase[0]);
 
-            final String asciiU = asciiParser.toUpperCase(testcase[1]);
-            final String rfcU = rfcParser.toUpperCase(testcase[2]);
-            final String strictU = strictParser.toUpperCase(testcase[3]);
+            final String asciiU = asciiParser.getIRCStringConverter().toUpperCase(testcase[1]);
+            final String rfcU = rfcParser.getIRCStringConverter().toUpperCase(testcase[2]);
+            final String strictU = strictParser.getIRCStringConverter().toUpperCase(testcase[3]);
 
             assertEquals(testcase[1], asciiL);
             assertEquals(testcase[2], rfcL);
             assertEquals(testcase[3], strictL);
 
-            assertTrue(asciiParser.equalsIgnoreCase(testcase[0], testcase[1]));
-            assertTrue(rfcParser.equalsIgnoreCase(testcase[0], testcase[2]));
-            assertTrue(strictParser.equalsIgnoreCase(testcase[0], testcase[3]));
+            assertTrue(asciiParser.getIRCStringConverter().equalsIgnoreCase(testcase[0], testcase[1]));
+            assertTrue(rfcParser.getIRCStringConverter().equalsIgnoreCase(testcase[0], testcase[2]));
+            assertTrue(strictParser.getIRCStringConverter().equalsIgnoreCase(testcase[0], testcase[3]));
 
             assertEquals(testcase[0], asciiU);
             assertEquals(testcase[0], rfcU);