[jboss-svn-commits] JBL Code SVN: r36441 - in labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools: views and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: dennyxu
Date: 2010-12-17 01:48:38 -0500 (Fri, 17 Dec 2010)
New Revision: 36441

Modified:
   labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/messages.properties
   labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryView.java
Log:
JBIDE-7820:Display user friendly message when adding file with the same name but different extension to Guvnor Repository

Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/messages.properties
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/messages.properties	2010-12-17 06:40:47 UTC (rev 36440)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/messages.properties	2010-12-17 06:48:38 UTC (rev 36441)
@@ -7,7 +7,7 @@
 action.refresh.rep=Refresh
 action.refresh.rep.desc=Refreshes the current node and its children
 add.failure=Could not add {0} to {1}
-add.failure.exist={0} already exist \r\nFailed to add resource: {1} 
+add.failure.exist=Unable to add {0} to Guvnor Repository because file with the same name and different extension already exists in repository ({1}). No file was added to Guvnor repository
 already.exists={0} already exists
 already.exists.folder={0} already exists in {1} 
 already.guvnor.as={0} is already in Guvnor as {1} 

Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryView.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryView.java	2010-12-17 06:40:47 UTC (rev 36440)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryView.java	2010-12-17 06:48:38 UTC (rev 36441)
@@ -262,10 +262,8 @@
 										addResourceToGuvnor(target.getGuvnorRepository().getLocation(), 
 										                   target.getFullPath(), sourceFile);
 						if (!res) {
-							String fileName = sourceFile.getName();
-							fileName = fileName.substring(0,fileName.lastIndexOf("."));
 							errors.add(MessageFormat.format(Messages.getString("add.failure.exist"), //$NON-NLS-1$ 
-								                            new Object[] { target.getFullPath() + fileName, items[i] }));
+								                            new Object[] {sourceFile.getName(), target.getFullPath()}));
 						}
 					} else {
 						// Need to check if the drop location is the same as the Guvnor