2006/unicorn/src/org/w3c/unicorn/action InitAction.java,1.7,1.8

Update of /sources/public/2006/unicorn/src/org/w3c/unicorn/action
In directory hutz:/tmp/cvs-serv11909/src/org/w3c/unicorn/action

Modified Files:
	InitAction.java 
Log Message:
fixed: initLanguage() called before initTasklist()

Index: InitAction.java
===================================================================
RCS file: /sources/public/2006/unicorn/src/org/w3c/unicorn/action/InitAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- InitAction.java	19 Oct 2009 12:47:05 -0000	1.7
+++ InitAction.java	17 May 2010 15:51:57 -0000	1.8
@@ -107,19 +107,19 @@
 				}
 			}
 			
-			if (task == null || task.equals("all") || task.equals("tasklist")) {
+			if (task == null || task.equals("all") || task.equals("language")) {
 				
-				if (!Framework.isUcnInitialized && task != null && task.equals("tasklist")) {
-					out.write("Unable to reload the tasklist because Unicorn is not initialized.\n" +
+				if (!Framework.isUcnInitialized && task != null && task.equals("language")) {
+					out.write("Unable to reload the language files because Unicorn is not initialized.\n" +
 							"You should initialize Unicorn fully and successfully one time before trying to perform this task (/init?task=all).");
 					out.close();
 					return;
 				}
 				
-				out.write("Loading tasklist: ");
+				out.write("Loading language files: ");
 				response.flushBuffer();
 				try {
-					Framework.initTasklists();
+					Framework.initLanguages();
 					out.write("OK\n");
 				} catch (InitializationFailedException e) {
 					Framework.logger.fatal(e.getMessage(), e);
@@ -129,19 +129,19 @@
 				}
 			}
 			
-			if (task == null || task.equals("all") || task.equals("language")) {
+			if (task == null || task.equals("all") || task.equals("tasklist")) {
 				
-				if (!Framework.isUcnInitialized && task != null && task.equals("language")) {
-					out.write("Unable to reload the language files because Unicorn is not initialized.\n" +
+				if (!Framework.isUcnInitialized && task != null && task.equals("tasklist")) {
+					out.write("Unable to reload the tasklist because Unicorn is not initialized.\n" +
 							"You should initialize Unicorn fully and successfully one time before trying to perform this task (/init?task=all).");
 					out.close();
 					return;
 				}
 				
-				out.write("Loading language files: ");
+				out.write("Loading tasklist: ");
 				response.flushBuffer();
 				try {
-					Framework.initLanguages();
+					Framework.initTasklists();
 					out.write("OK\n");
 				} catch (InitializationFailedException e) {
 					Framework.logger.fatal(e.getMessage(), e);

Received on Monday, 17 May 2010 15:52:01 UTC