[jbosstools-commits] JBoss Tools SVN: r6129 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers.

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2008-02-06 06:13:29 -0500 (Wed, 06 Feb 2008)
New Revision: 6129

Modified:
   trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultCreateHandler.java
Log:
JBIDE-1743

Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultCreateHandler.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultCreateHandler.java	2008-02-06 00:34:03 UTC (rev 6128)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultCreateHandler.java	2008-02-06 11:13:29 UTC (rev 6129)
@@ -142,7 +142,7 @@
     public static String getContainsMessage(XModelObject parent, XModelObject child) {
 		String pathpart = child.getPathPart();
 		XModelObject e = parent.getChildByPath(pathpart);
-		if(e != null && e != parent) {
+		if(e != null && e != parent && e != parent.getParent()) {
 			if(child.getModelEntity().getAttribute(XModelObjectLoaderUtil.ATTR_ID_NAME) != null) return null;
 			String tp = title(parent, true), tc = title(child, false), te = title(e, false);
 			String mes = (tc.equals(te))
@@ -224,7 +224,7 @@
     	if(objectTitle != null && objectTitle.equalsIgnoreCase(elementType)) {
     		s = objectTitle;
     	}
-        return (!capitalize || s.length() < 0 || Character.isUpperCase(s.charAt(0)))
+        return (!capitalize || s.length() < 1 || Character.isUpperCase(s.charAt(0)))
                ? s : s.substring(0, 1).toUpperCase() + s.substring(1);
     }