ruper2/src/java/core/org/krysalis/ruper/util/text MessageConstants.java,1.11,1.12 Messages.java,1.7,1.8

Update of /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/util/text
In directory sc8-pr-cvs1:/tmp/cvs-serv24751/src/java/core/org/krysalis/ruper/util/text

Modified Files:
	MessageConstants.java Messages.java 
Log Message:
Tinkering...

Index: MessageConstants.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/util/text/MessageConstants.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MessageConstants.java	23 Sep 2003 00:19:17 -0000	1.11
--- MessageConstants.java	23 Sep 2003 05:03:06 -0000	1.12
***************
*** 16,19 ****
--- 16,21 ----
  	// before they get out of control...
  
+ 	public static final String GENERAL_EXCEPTION =
+ 		"GENERAL_EXCEPTION";
  	public static final String GENERAL_EXCEPTION2 =
  		"GENERAL_EXCEPTION2";
***************
*** 56,61 ****
  
  	public static final String UPDATE_FOUND = "UPDATE_FOUND";
! 	
  	public static final String NO_RESOURCES_FOUND = "NO_RESOURCES_FOUND";
  	public static final String NO_UPDATE_FOUND = "NO_UPDATE_FOUND";
  	public static final String LIST_FAILED = "LIST_FAILED";
--- 58,64 ----
  
  	public static final String UPDATE_FOUND = "UPDATE_FOUND";
! 
  	public static final String NO_RESOURCES_FOUND = "NO_RESOURCES_FOUND";
+ 	public static final String NO_RESOURCES_FOUND_IN = "NO_RESOURCES_FOUND_IN";
  	public static final String NO_UPDATE_FOUND = "NO_UPDATE_FOUND";
  	public static final String LIST_FAILED = "LIST_FAILED";

Index: Messages.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper/util/text/Messages.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Messages.java	23 Sep 2003 00:19:17 -0000	1.7
--- Messages.java	23 Sep 2003 05:03:06 -0000	1.8
***************
*** 77,81 ****
  		final Object param1,
  		Object param2) {
! 		return getString(code, new Object[] { param1, param2 });
  	}
  
--- 77,81 ----
  		final Object param1,
  		Object param2) {
! 		return getString(code, new Object[] { param1, param2});
  	}
  
***************
*** 94,98 ****
  		Object param2,
  		Object param3) {
! 		return getString(code, new Object[] { param1, param2, param3 });
  	}
  
--- 94,103 ----
  		Object param2,
  		Object param3) {
! 		return getString(
! 			code,
! 			new Object[] {
! 				param1,
! 				param2,
! 				param3});
  	}
  
***************
*** 108,112 ****
  
  		try {
! 			final MessageFormat msg = findMessage(code);
  
  			if (null != msg)
--- 113,117 ----
  
  		try {
! 			final MessageFormat msg = loadMessageFormat(code);
  
  			if (null != msg)
***************
*** 137,145 ****
  	/**
  	 * Locates a message by its code.
  	 */
! 	static MessageFormat findMessage(final String code)
  		throws MissingResourceException {
  
! 		MessageFormat msg = null;
  
  		String msgText = null;
--- 142,151 ----
  	/**
  	 * Locates a message by its code.
+ 	 * Note: package protected so testable.
  	 */
! 	static MessageFormat loadMessageFormat(final String code)
  		throws MissingResourceException {
  
! 		MessageFormat format = null;
  
  		String msgText = null;
***************
*** 156,162 ****
  		// get the message format
  		if (msgText != null)
! 			msg = new MessageFormat(msgText);
  
! 		return msg;
  	}
  
--- 162,168 ----
  		// get the message format
  		if (msgText != null)
! 			format = new MessageFormat(msgText);
  
! 		return format;
  	}
  
***************
*** 173,176 ****
--- 179,186 ----
  		return codes;
  	}
+ 
+ 	//	public static Object safeParam(Object param) {
+ 	//		return (null == param) ? "*Unset*" : param;
+ 	//	}
  
  	public static void dump() {




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf