[Sandev-cvs] sand/apps/basics/build/generate/org/sandev/generator GeneratorCommon.java, 1.19, 1.20

[Eric P. <th...@us...>]

Update of /cvsroot/sandev/sand/apps/basics/build/generate/org/sandev/generator
In directory vz-cvs-3.sog:/tmp/cvs-serv27816

Modified Files:
	GeneratorCommon.java 
Log Message:
Added a special case to pluralize method so we get things like "ModeDefs"
rather than "ModeDeves"


Index: GeneratorCommon.java
===================================================================
RCS file: /cvsroot/sandev/sand/apps/basics/build/generate/org/sandev/generator/GeneratorCommon.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** GeneratorCommon.java	5 Sep 2010 13:50:16 -0000	1.19
--- GeneratorCommon.java	23 Jul 2011 19:17:39 -0000	1.20
***************
*** 252,257 ****
              case 'z':
                  return base + "es";
!             case 'f': // I'm not sure all -f words work this way, but most do
!                 return base.substring(0, base.length()-1) + "ves";
              case 'e':
                  if (penultChar == 'f') { // life --> lives
--- 252,260 ----
              case 'z':
                  return base + "es";
!             case 'f': 
!                 if(base.endsWith("Def")) {
!                     return base + "s"; }
!                 else { // I'm not sure all -f words work this way, but most do
!                     return base.substring(0, base.length()-1) + "ves"; }
              case 'e':
                  if (penultChar == 'f') { // life --> lives