[jboss-svn-commits] JBL Code SVN: r35154 - in labs/jbossrules/branches/5.1.x/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools: utils and 1 other directories.

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

Author: dennyxu
Date: 2010-09-15 06:02:18 -0400 (Wed, 15 Sep 2010)
New Revision: 35154

Modified:
   labs/jbossrules/branches/5.1.x/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/messages.properties
   labs/jbossrules/branches/5.1.x/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/ActionUtils.java
   labs/jbossrules/branches/5.1.x/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryView.java
Log:
JBIDE-7032: merge the fix into the branch 5.1.x

Modified: labs/jbossrules/branches/5.1.x/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/messages.properties
===================================================================
--- labs/jbossrules/branches/5.1.x/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/messages.properties	2010-09-15 10:00:39 UTC (rev 35153)
+++ labs/jbossrules/branches/5.1.x/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/messages.properties	2010-09-15 10:02:18 UTC (rev 35154)
@@ -102,3 +102,5 @@
 version.dialog.message=Choose a version for {0}
 warning=Guvnor Repository Warning
 rep.connect.fail=Server not reachable
+error.message.isfolder=The file "{0}" is not a valid Guvnor Resource. \nNo file was added.
+error.message.invalid.filename=The file "{0}" has no postfix. \nNo file was added.

Modified: labs/jbossrules/branches/5.1.x/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/ActionUtils.java
===================================================================
--- labs/jbossrules/branches/5.1.x/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/ActionUtils.java	2010-09-15 10:00:39 UTC (rev 35153)
+++ labs/jbossrules/branches/5.1.x/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/ActionUtils.java	2010-09-15 10:02:18 UTC (rev 35154)
@@ -41,6 +41,10 @@
 			for (Iterator<Object> it = sel.iterator(); it.hasNext();) {
 				Object oneSelection = it.next();
 				if (oneSelection instanceof IFile) {
+					if(!(((IFile)oneSelection).getName().indexOf(".") > 0)){
+						res = false;
+						break;
+					}
 					GuvnorMetadataProps props = 
 						GuvnorMetadataUtils.getGuvnorMetadata((IFile)oneSelection);
 					if ((guvnorControlled && props == null)

Modified: labs/jbossrules/branches/5.1.x/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryView.java
===================================================================
--- labs/jbossrules/branches/5.1.x/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryView.java	2010-09-15 10:00:39 UTC (rev 35153)
+++ labs/jbossrules/branches/5.1.x/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/RepositoryView.java	2010-09-15 10:02:18 UTC (rev 35154)
@@ -186,6 +186,11 @@
 					return false;
 				}
 				String[] items = (String[])data;
+				
+				boolean isvalid = validateInputResource(items);
+				
+				if(!isvalid) return false;
+				
 				String[] errors = processDrop(targetNode, items);
 				if (errors.length != 0) {
 					StringBuilder msg = new StringBuilder();
@@ -222,6 +227,27 @@
 		});
 	}
 	
+	private boolean validateInputResource(String[] filenames){
+		
+		for(String filename : filenames){
+			File file = new File(filename);
+			String msg = "";
+			if(!file.isFile()){
+				msg = MessageFormat.format(Messages.getString("error.message.isfolder"), filename);
+				MessageDialog.openError(null, "Problem Occurred", msg);
+				return false;
+			}
+			
+			String name = file.getName();
+			if(!(name.indexOf(".") > 0)){
+				msg = MessageFormat.format(Messages.getString("error.message.invalid.filename"), filename);
+				MessageDialog.openError(null, "Problem Occurred", msg);
+				return false;
+			}
+		}
+		
+		return true;
+	}
 	private String[] processDrop(TreeParent target, String[] items) {
 		List<String> errors = new ArrayList<String>();