Author: scabanovich Date: 2008-06-06 05:00:11 -0400 (Fri, 06 Jun 2008) New Revision: 8596 Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/AddViewSupport.java Log: JBIDE-2305 Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/AddViewSupport.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/AddViewSupport.java 2008-06-06 08:55:43 UTC (rev 8595) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/AddViewSupport.java 2008-06-06 09:00:11 UTC (rev 8596) @@ -82,13 +82,14 @@ return template.trim().substring(i); } } - return getExtension(); + //Let user specify extension + return ""; //getExtension(); } public static String getExtension() { XModelObject addView = getPreferenceObject(); String v = (addView == null) ? "" : addView.getAttributeValue("Extension"); - if(v == null || v.length() == 0) return ".jsp"; + if(v == null || v.length() == 0) return ".xhtml"; if(!v.startsWith(".")) v = "." + v; return v; } @@ -215,28 +216,33 @@ return path; } - static boolean hasWildCard(String path) { - return path.indexOf('*') >= 0 || path.indexOf("#{") >= 0; - } - String revalidatePath(String path, String template) { if(path != null) path = path.trim(); if(path == null || path.length() == 0) return path; if(!path.startsWith("/") && !path.startsWith("*")) path = "/" + path; if(hasWildCard(path)) return path; if(path.indexOf('.') < 0 && !path.endsWith("/")) { - path += getExtension(template); + path += template == null ? "" : getExtension(template); } return path; } + static boolean hasWildCard(String path) { + return path.indexOf('*') >= 0 || path.indexOf("#{") >= 0; + } + public boolean canCreateFile(String path) { XModelObject fs = getTarget().getModel().getByPath("FileSystems/WEB-ROOT"); if(fs == null) return false; path = revalidatePath(path, getAttributeValue(0, "template")); if(path == null || path.length() == 0 || hasWildCard(path)) return false; - return isCorrectPath(path) && !fileExists(path); + //extension must be available + int m = path.lastIndexOf('.'); + if(m < 0 || m >= path.length() - 1) return false; + + return isCorrectPath(path) && !fileExists(path) + && path.lastIndexOf('.') < path.length() - 1; } static String FORBIDDEN_INDICES = "\"\n\t\\:<>?|"; //* is allowed anywhere