Author: scabanovich Date: 2008-01-22 07:29:28 -0500 (Tue, 22 Jan 2008) New Revision: 5861 Added: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFolderSupport.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/TargetHolder.java Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFileSupport.java Log: JBIDE-1474 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFileSupport.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFileSupport.java 2008-01-22 12:29:00 UTC (rev 5860) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFileSupport.java 2008-01-22 12:29:28 UTC (rev 5861) @@ -34,6 +34,7 @@ boolean useVersions = false; public void reset() { + targetHolder.setAction(action); if(hasTemplate()) { String[] s = getPageTemplateList(); setValueList(0, "template", s); @@ -279,53 +280,6 @@ return targetHolder.target; } - class TargetHolder { - XModelObject target; - String path; - IResource folder; - String addPath = ""; - - public void revalidate(String newPath) { - if(newPath == path || (newPath != null && newPath.equals(path))) return; - path = newPath; - addPath = ""; - folder = (path == null) ? null : ModelPlugin.getWorkspace().getRoot().findMember(path); - target = EclipseResourceUtil.getObjectByResource(folder); - if(path != null && (folder == null || !folder.exists())) { - String p = path.replace('\\', '/'); - String ap = ""; - while(true) { - int q = p.lastIndexOf('/'); - if(q < 0) break; - ap = p.substring(q) + ap; - p = p.substring(0, q); - folder = ModelPlugin.getWorkspace().getRoot().findMember(p); - if(folder != null && folder.exists()) { - addPath = ap; - if(addPath.endsWith("/")) addPath = addPath.substring(0, addPath.length() - 1); - target = EclipseResourceUtil.createObjectForResource(folder); - break; - } - } - } else if(target == null && folder != null && folder.exists()) { - target = EclipseResourceUtil.createObjectForResource(folder); - } else if(target != null && "FileSystems".equals(target.getModelEntity().getName())) { - target = EclipseResourceUtil.findFileSystem(folder, target.getModel()); - if(target == null) target = EclipseResourceUtil.createObjectForResource(folder); - } - } - public void saveLastPath() { - if(path == null || folder == null) return; - QualifiedName n = new QualifiedName("", action.getName() + "_lastPath"); - try { - folder.getProject().setPersistentProperty(n, path); - } catch (Exception e) { - ModelPlugin.getPluginLog().logError("CreateFileSuppport:TargetHolder:saveLastPath:" + e.getMessage()); - } - } - - } - protected DefaultWizardDataValidator validator = createValidator(); public WizardDataValidator getValidator(int step) { Added: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFolderSupport.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFolderSupport.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/CreateFolderSupport.java 2008-01-22 12:29:28 UTC (rev 5861) @@ -0,0 +1,197 @@ +package org.jboss.tools.common.model.files.handlers; + +import java.util.Properties; +import java.util.StringTokenizer; + +import org.eclipse.core.resources.IResource; +import org.jboss.tools.common.meta.action.XEntityData; +import org.jboss.tools.common.meta.action.impl.DefaultWizardDataValidator; +import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport; +import org.jboss.tools.common.meta.action.impl.WizardDataValidator; +import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler; +import org.jboss.tools.common.model.ServiceDialog; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.filesystems.impl.CreateFileHandler; +import org.jboss.tools.common.model.filesystems.impl.FolderImpl; + +public class CreateFolderSupport extends SpecialWizardSupport { + protected TargetHolder targetHolder = new TargetHolder(); + + public CreateFolderSupport() {} + + public void reset() { + targetHolder.setAction(action); + targetHolder.target = getTarget(); + IResource r = (IResource)getTarget().getAdapter(IResource.class); + if(r == null) { + setAttributeValue(0, "folder", ""); + targetHolder.revalidate(null); + } else { + targetHolder.revalidate(r.getFullPath().toString()); + setAttributeValue(0, "folder", "" + targetHolder.path); + } + } + + @Override + public void action(String name) throws Exception { + if(FINISH.equals(name)) { + if(!checkResource()) return; + execute(); + setFinished(true); + } else if(CANCEL.equals(name)) { + setFinished(true); + } else if(HELP.equals(name)) { + help(); + } + } + + public String[] getActionNames(int stepId) { + return new String[]{FINISH, CANCEL, HELP}; + } + + protected boolean checkResource() { + if(targetHolder.addPath.length() == 0) return true; + ServiceDialog d = getTarget().getModel().getService(); + String message = "Folder " + targetHolder.path + " does not exist. Do you want to create it?"; + int q = d.showDialog("Warning", message, new String[]{SpecialWizardSupport.OK, SpecialWizardSupport.CANCEL}, null, ServiceDialog.QUESTION); + return q == 0; + } + + public boolean canCreateResource(String path) { + if(targetHolder.target == null) return false; + if(path == null || path.length() == 0 || path.indexOf('*') >= 0) return false; + return isCorrectPath(path) && !resourceExists(path); + } + + boolean isCorrectPath(String path) { + path = revalidatePath(path); + if(path == null || path.equals("/") || path.indexOf("//") >= 0) return false; + return true; + } + + boolean resourceExists(String path) { + if(path == null || targetHolder.target == null) return false; + path = revalidatePath(path); + if(path.startsWith("/")) path = path.substring(1); + return targetHolder.target.getChildByPath(path) != null; + } + + protected String revalidatePath(String path) { + if(path == null || path.length() == 0) return path; + if(!path.startsWith("/")) path = "/" + path; + if(targetHolder.addPath.length() > 0) { + path = targetHolder.addPath + path; + } + return path; + } + + protected void execute() throws Exception { + Properties p = extractStepData(0); + String path = p.getProperty("name"); + path = revalidatePath(path); + XModelObject f = createFolder(path); + if(f != null) targetHolder.saveLastPath(); + } + + protected XModelObject createFolder(String path) throws Exception { + if(!canCreateResource(path)) return null; + XModelObject fs = targetHolder.target; + + StringTokenizer st = new StringTokenizer(path, "/"); + int c = st.countTokens(), i = 0; + while(i < c) { + String s = st.nextToken(); + XModelObject o = fs.getChildByPath(s); + if(o == null) { + o = fs.getModel().createModelObject("FileFolder", null); + o.setAttributeValue("name", s); + DefaultCreateHandler.addCreatedObject(fs, o, getProperties()); + ((FolderImpl)o).save(); + } + fs = o; + i++; + } + + return fs; + } + + protected final XModelObject getTargetFolder() { + return targetHolder.target; + } + + protected DefaultWizardDataValidator validator = createValidator(); + + public WizardDataValidator getValidator(int step) { + validator.setSupport(this, step); + return validator; + } + + protected DefaultWizardDataValidator createValidator() { + return new Validator(); + } + + protected class Validator extends DefaultWizardDataValidator { + public void validate(Properties data) { + String folder = data.getProperty("folder"); + targetHolder.revalidate(folder); + message = null; + validateFolderName(); + if(message != null) return; + validateChildName(data); + if(message != null) return; + super.validate(data); + } + + String FORBIDDEN_INDICES = "\"\n\t*\\/:<>?|"; + protected void validateChildName(Properties data) { + if(message != null) return; + String name = data.getProperty("name"); + if(name == null || name.length() == 0) return; + if(name.equals(".")) { + message = "Incorrect name."; + } else if(name.endsWith(".") && name.indexOf('.') != name.lastIndexOf('.')) { + message = "Name must not end in a period."; + } else { + for (int i = 0; i < FORBIDDEN_INDICES.length(); i++) { + if(name.indexOf(FORBIDDEN_INDICES.charAt(i)) >= 0) { + message = "Name must not contain character " + FORBIDDEN_INDICES.charAt(i) + " ."; + return; + } + } + } + } + + String FORBIDDEN_FOLDER_LETTERS = "\"\n\t*:<>?|"; + private void validateFolderName() { + if(targetHolder.addPath.length() == 0) return; + for (int i = 0; i < FORBIDDEN_FOLDER_LETTERS.length(); i++) { + if(targetHolder.addPath.indexOf(FORBIDDEN_FOLDER_LETTERS.charAt(i)) >= 0) { + message = "Folder name must not contain character " + FORBIDDEN_FOLDER_LETTERS.charAt(i) + " ."; + return; + } + } + } + + protected void validateAddFile(XEntityData[] ds, Properties data) { + CreateFileHandler.validateNameAndExtension(action, data, null); + if(targetHolder.target != null) { + String entity = action.getProperty("entity"); + if(entity == null) entity = getEntityData()[step].getModelEntity().getName(); + if(targetHolder.addPath == null || targetHolder.addPath.length() == 0) { + if(!checkChild(targetHolder.target, entity, data)) return; + } + } else { + message = "Cannot create file in specified folder."; + } + } + + } + + public String getFocusAttribute(int stepId) { + if(stepId == 0) { + return "name"; + } + return super.getFocusAttribute(stepId); + } + +} Added: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/TargetHolder.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/TargetHolder.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/files/handlers/TargetHolder.java 2008-01-22 12:29:28 UTC (rev 5861) @@ -0,0 +1,61 @@ +package org.jboss.tools.common.model.files.handlers; + +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.QualifiedName; +import org.jboss.tools.common.meta.action.XAction; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.plugin.ModelPlugin; +import org.jboss.tools.common.model.util.EclipseResourceUtil; + +public class TargetHolder { + protected XAction action; + XModelObject target; + String path; + IResource folder; + String addPath = ""; + + public void setAction(XAction action) { + this.action = action; + } + + public void revalidate(String newPath) { + if(newPath == path || (newPath != null && newPath.equals(path))) return; + path = newPath; + addPath = ""; + folder = (path == null) ? null : ModelPlugin.getWorkspace().getRoot().findMember(path); + target = EclipseResourceUtil.getObjectByResource(folder); + if(path != null && (folder == null || !folder.exists())) { + String p = path.replace('\\', '/'); + String ap = ""; + while(true) { + int q = p.lastIndexOf('/'); + if(q < 0) break; + ap = p.substring(q) + ap; + p = p.substring(0, q); + folder = ModelPlugin.getWorkspace().getRoot().findMember(p); + if(folder != null && folder.exists()) { + addPath = ap; + if(addPath.endsWith("/")) addPath = addPath.substring(0, addPath.length() - 1); + target = EclipseResourceUtil.createObjectForResource(folder); + break; + } + } + } else if(target == null && folder != null && folder.exists()) { + target = EclipseResourceUtil.createObjectForResource(folder); + } else if(target != null && "FileSystems".equals(target.getModelEntity().getName())) { + target = EclipseResourceUtil.findFileSystem(folder, target.getModel()); + if(target == null) target = EclipseResourceUtil.createObjectForResource(folder); + } + } + + public void saveLastPath() { + if(path == null || folder == null) return; + QualifiedName n = new QualifiedName("", action.getName() + "_lastPath"); + try { + folder.getProject().setPersistentProperty(n, path); + } catch (Exception e) { + ModelPlugin.getPluginLog().logError("CreateFileSuppport:TargetHolder:saveLastPath:" + e.getMessage()); + } + } + +}