[richfaces-svn-commits] JBoss Rich Faces SVN: r12046 - trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo.

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

Author: alevkovsky
Date: 2008-12-29 09:26:43 -0500 (Mon, 29 Dec 2008)
New Revision: 12046

Modified:
   trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateSkinMojo.java
Log:
https://jira.jboss.org/jira/browse/RF-4023

Modified: trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateSkinMojo.java
===================================================================
--- trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateSkinMojo.java	2008-12-29 13:41:01 UTC (rev 12045)
+++ trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateSkinMojo.java	2008-12-29 14:26:43 UTC (rev 12046)
@@ -29,7 +29,9 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
@@ -80,6 +82,64 @@
 	private static final String SRC_MAIN_CONFIG_RESOURCES = "src/main/config/resources";
 
 	private static final String META_INF_SKINS = "META-INF/skins/";
+	
+	private static final Set<String> JAVA_RESERVED_WORDS;
+	
+	static{
+		JAVA_RESERVED_WORDS = new HashSet<String>();
+		JAVA_RESERVED_WORDS.add("abstract");
+		JAVA_RESERVED_WORDS.add("assert");
+		JAVA_RESERVED_WORDS.add("boolean");
+		JAVA_RESERVED_WORDS.add("break");
+		JAVA_RESERVED_WORDS.add("byte");
+		JAVA_RESERVED_WORDS.add("case");
+		JAVA_RESERVED_WORDS.add("catch");
+		JAVA_RESERVED_WORDS.add("char");
+		JAVA_RESERVED_WORDS.add("class");
+		JAVA_RESERVED_WORDS.add("const");
+		JAVA_RESERVED_WORDS.add("continue");
+		JAVA_RESERVED_WORDS.add("default");
+		JAVA_RESERVED_WORDS.add("do");
+		JAVA_RESERVED_WORDS.add("double");
+		JAVA_RESERVED_WORDS.add("else");
+		JAVA_RESERVED_WORDS.add("extends");
+		JAVA_RESERVED_WORDS.add("false");
+		JAVA_RESERVED_WORDS.add("final");
+		JAVA_RESERVED_WORDS.add("finally");
+		JAVA_RESERVED_WORDS.add("float");
+		JAVA_RESERVED_WORDS.add("for");
+		JAVA_RESERVED_WORDS.add("goto");		
+		JAVA_RESERVED_WORDS.add("if");
+		JAVA_RESERVED_WORDS.add("implements");
+		JAVA_RESERVED_WORDS.add("import");
+		JAVA_RESERVED_WORDS.add("instanceof");
+		JAVA_RESERVED_WORDS.add("int");
+		JAVA_RESERVED_WORDS.add("interface");
+		JAVA_RESERVED_WORDS.add("long");
+		JAVA_RESERVED_WORDS.add("native");
+		JAVA_RESERVED_WORDS.add("new");
+		JAVA_RESERVED_WORDS.add("null");
+		JAVA_RESERVED_WORDS.add("package");
+		JAVA_RESERVED_WORDS.add("private");
+		JAVA_RESERVED_WORDS.add("protected");
+		JAVA_RESERVED_WORDS.add("public");
+		JAVA_RESERVED_WORDS.add("return");
+		JAVA_RESERVED_WORDS.add("short");
+		JAVA_RESERVED_WORDS.add("static");
+		JAVA_RESERVED_WORDS.add("strictfp");
+		JAVA_RESERVED_WORDS.add("super");
+		JAVA_RESERVED_WORDS.add("switch");
+		JAVA_RESERVED_WORDS.add("synchronized");
+		JAVA_RESERVED_WORDS.add("this");
+		JAVA_RESERVED_WORDS.add("throw");
+		JAVA_RESERVED_WORDS.add("throws");
+		JAVA_RESERVED_WORDS.add("transient");
+		JAVA_RESERVED_WORDS.add("true");
+		JAVA_RESERVED_WORDS.add("try");
+		JAVA_RESERVED_WORDS.add("void");
+		JAVA_RESERVED_WORDS.add("volatile");
+		JAVA_RESERVED_WORDS.add("while");
+	}
 
 	/**
 	 * Name of base package of skin.
@@ -159,8 +219,15 @@
 		getLog().debug("Skin name is supposed to be " + shortName);
 		getLog().debug("Root package " + packageName);
 		getLog().debug("Skin package is " + fullSkinName);
+		
+		//RF-4023
+		if(JAVA_RESERVED_WORDS.contains(skinName)){
+			throw new MojoExecutionException("Invalid skin name '" + skinName + "'. Please type another name.");
+		}
+		if(JAVA_RESERVED_WORDS.contains(packageName)){
+			throw new MojoExecutionException("Invalid skin package '" + packageName + "'. Please type another package.");
+		}
 
-
 		SkinInfo skinInfoTemplate = new SkinInfo();
 		skinInfoTemplate.setShortName(shortName);
 		skinInfoTemplate.setPackageName(fullSkinName.toLowerCase());