ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/cms/source/util/uk/org/iscream/cms/util/FormatName.java

Comparing projects/cms/source/util/uk/org/iscream/cms/util/FormatName.java (file contents):
Revision 1.9 by tdb, Thu Mar 15 00:44:31 2001 UTC vs.
Revision 1.15 by tdb, Wed Feb 5 14:27:59 2003 UTC

#	Line 1 | Line 1
1	+	/*
2	+	* i-scream central monitoring system
3	+	* http://www.i-scream.org.uk
4	+	* Copyright (C) 2000-2002 i-scream
5	+	*
6	+	* This program is free software; you can redistribute it and/or
7	+	* modify it under the terms of the GNU General Public License
8	+	* as published by the Free Software Foundation; either version 2
9	+	* of the License, or (at your option) any later version.
10	+	*
11	+	* This program is distributed in the hope that it will be useful,
12	+	* but WITHOUT ANY WARRANTY; without even the implied warranty of
13	+	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14	+	* GNU General Public License for more details.
15	+	*
16	+	* You should have received a copy of the GNU General Public License
17	+	* along with this program; if not, write to the Free Software
18	+	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
19	+	*/
20	+
21		//---PACKAGE DECLARATION---
22	<	package uk.org.iscream.util;
22	>	package uk.org.iscream.cms.util;
23
24		//---IMPORTS---
25		import java.util.Date;
#	Line 64 | Line 84 | public class FormatName {
84		* @return The string to be written to the log.
85		*/
86		public static String formatLogLine(String source, int verbosity, String message){
87	<	String date = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM, Locale.UK).format(new Date());
87	>	String date = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM).format(new Date());
88		return "[" + date + "] [" + VERBOSITY_NAMES[verbosity] + "] " + source + ": " + message;
89		}
90
91		/**
92	<	* If the class name begins with uk.org.iscream
92	>	* If the class name begins with uk.org.iscream.cms.server
93		* this method will trim it off, otherwise it
94		* leaves the string unchanged.
95		*
#	Line 78 | Line 98 | public class FormatName {
98		* @return the tidy version of it
99		*/
100		private static String tidyClassName(String className) {
101	<	String prefix = "uk.org.iscream";
101	>	String prefix = "uk.org.iscream.cms.server";
102		if (className.startsWith(prefix)) {
103	<	return className.substring(prefix.length());
103	>	return className.substring(prefix.length()+1);
104		}
105		return className;
106		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines