[Openproj-commitlog] openproj_core/src/com/projity/field Field.java, 1.19, 1.20

[l <sur...@us...>]

Update of /cvsroot/openproj/openproj_core/src/com/projity/field
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24159/src/com/projity/field

Modified Files:
	Field.java 
Log Message:


Index: Field.java
===================================================================
RCS file: /cvsroot/openproj/openproj_core/src/com/projity/field/Field.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Field.java	13 Feb 2009 17:53:36 -0000	1.19
+++ Field.java	19 Feb 2009 18:33:56 -0000	1.20
@@ -993,7 +993,7 @@
 		if (hasExternalType()) { // does the second pass, converting from
 									// say, Date to long
 			Class type = isMap() ? externalType : internalType;
-				
+
 			value = FieldConverter.convert(value, type, context); // convert
 																			// from
 																			// date
@@ -1308,11 +1308,7 @@
 	}
 
 	public String getIdWithoutPrefix() {
-		int i = id.indexOf('.');
-		if (i != -1)
-			return id.substring(i+1);
-		else
-			return id;
+		return Field.shortName(id);
 	}
 	private int getDefaultColumnWidth() {
 		if (isDuration()) {
@@ -2442,6 +2438,14 @@
 		else
 			return fieldName.substring(pos+1);
 	}
+	public static String longName(String shortFieldName) {
+//		int pos = shortFieldName.indexOf(".");
+//		if (pos == -1)
+//			return "Field."+shortFieldName;
+//		else
+//			return shortFieldName;
+		return "Field."+shortFieldName;
+	}
 	public boolean isNotChoosable() {
 		return notChoosable;
 	}