--- projects/cms/source/util/uk/org/iscream/cms/util/FormatName.java 2000/12/12 18:24:00 1.3 +++ projects/cms/source/util/uk/org/iscream/cms/util/FormatName.java 2000/12/12 19:15:30 1.4 @@ -10,7 +10,7 @@ package uk.ac.ukc.iscream.util; * a toString String to send to the logger. * * @author $Author: ajm $ - * @version $Id: FormatName.java,v 1.3 2000/12/12 18:24:00 ajm Exp $ + * @version $Id: FormatName.java,v 1.4 2000/12/12 19:15:30 ajm Exp $ */ public class FormatName { @@ -35,12 +35,28 @@ public class FormatName { */ public static String getName(String friendlyName, String className, String revision) { if (friendlyName == null) { - return "{"+ className + "(v" + revision.substring(11, revision.length() - 2) + ")}"; + return "{"+ tidyClassName(className) + "(v" + revision.substring(11, revision.length() - 2) + ")}"; } else if (className == null) { return friendlyName + "{static(v" + revision.substring(11, revision.length() - 2) + ")}"; } else { - return friendlyName + "{"+ className + "(v" + revision.substring(11, revision.length() - 2) + ")}"; + return friendlyName + "{"+ tidyClassName(className) + "(v" + revision.substring(11, revision.length() - 2) + ")}"; } + } + + /** + * If the class name begins with uk.ac.ukc.iscream + * this method will trim it off, otherwise it + * leaves the string unchanged. + * + * @param className the name of a class + * + * @return the tidy version of it + */ + private static String tidyClassName(String className) { + if (className.startsWith("uk.ac.ukc.iscream")) { + return className.substring(18); + } + return className; } //---CONSTRUCTORS---