[jbosstools-commits] JBoss Tools SVN: r31300 - in trunk/jsf/plugins/org.jboss.tools.jsf: src/org/jboss/tools/jsf/web and 2 other directories.

Author: dmaliarevich Date: 2011-05-13 12:04:23 -0400 (Fri, 13 May 2011) New Revision: 31300 Added: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/commands/ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/commands/CreateJSF2CompositeCommandHandler.java Removed: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/CreateJSF2CompositeAction.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/CreateJSF2CompositeContributionItem.java Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.properties trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml Log: https://issues.jboss.org/browse/JBIDE-8620 , created eclipse command, works for jsf2 projects only. Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.properties =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.properties 2011-05-13 16:00:30 UTC (rev 31299) +++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.properties 2011-05-13 16:04:23 UTC (rev 31300) @@ -13,4 +13,6 @@ KBProblemName=JSF EL Problem -KB_REQUIRED_FOR_JSF=JSF \ No newline at end of file +KB_REQUIRED_FOR_JSF=JSF + +CreateJSF2Composite=Create JSF2 composite... \ No newline at end of file Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2011-05-13 16:00:30 UTC (rev 31299) +++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2011-05-13 16:04:23 UTC (rev 31300) @@ -808,17 +808,15 @@ </menuContribution> <menuContribution locationURI="popup:org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor.source.EditorContext?before=org.jboss.tools.jst.jsp.i18n.ExternalizeAllStringsContributionItem"> - <dynamic - class="org.jboss.tools.jsf.web.validation.jsf2.action.CreateJSF2CompositeContributionItem" - id="org.jboss.tools.jsf.web.validation.jsf2.action.JSF2CreateCompositeContributionItem"> - </dynamic> + <command + commandId="org.jboss.tools.jsf.web.commands.CreateJSF2CompositeCommand" + style="toggle" /> </menuContribution> <menuContribution locationURI="popup:org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor.source.EditorContext?before=org.jboss.tools.jst.jsp.i18n.ExternalizeAllStringsContributionItem"> - <dynamic - class="org.jboss.tools.jsf.web.validation.jsf2.action.CreateJSF2CompositeContributionItem" - id="org.jboss.tools.jsf.web.validation.jsf2.action.JSF2CreateCompositeContributionItem"> - </dynamic> + <command + commandId="org.jboss.tools.jsf.web.commands.CreateJSF2CompositeCommand" + style="toggle" /> </menuContribution> </extension> <extension @@ -873,5 +871,15 @@ forNature="org.jboss.tools.jsf.jsfnature"> </require> </extension> + + <extension + point="org.eclipse.ui.commands"> + <command + categoryId="org.jboss.tools.jsf.commands.category" + id="org.jboss.tools.jsf.web.commands.CreateJSF2CompositeCommand" + description="%CreateJSF2Composite" + name="%CreateJSF2Composite" + defaultHandler="org.jboss.tools.jsf.web.commands.CreateJSF2CompositeCommandHandler"/> + </extension> </plugin> Added: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/commands/CreateJSF2CompositeCommandHandler.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/commands/CreateJSF2CompositeCommandHandler.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/commands/CreateJSF2CompositeCommandHandler.java 2011-05-13 16:04:23 UTC (rev 31300) @@ -0,0 +1,312 @@ +/******************************************************************************* + * Copyright (c) 2007-2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.web.commands; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.eclipse.core.commands.AbstractHandler; +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.expressions.IEvaluationContext; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.Path; +import org.eclipse.jface.dialogs.IInputValidator; +import org.eclipse.jface.dialogs.InputDialog; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.TextSelection; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.window.Window; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.ISources; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.handlers.HandlerUtil; +import org.eclipse.ui.part.EditorPart; +import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.ui.texteditor.ITextEditor; +import org.eclipse.wst.sse.core.StructuredModelManager; +import org.eclipse.wst.sse.core.internal.provisional.IModelManager; +import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; +import org.eclipse.wst.sse.ui.StructuredTextEditor; +import org.eclipse.wst.xml.core.internal.document.NodeImpl; +import org.eclipse.wst.xml.core.internal.document.TextImpl; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; +import org.jboss.tools.common.model.XModelObjectConstants; +import org.jboss.tools.jsf.JSFModelPlugin; +import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil; +import org.jboss.tools.jsf.project.JSF2Util; +import org.jboss.tools.jst.jsp.editor.IVisualContext; +import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor; +import org.jboss.tools.jst.jsp.jspeditor.SourceEditorPageContext; +import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPPaletteInsertHelper; +import org.jboss.tools.jst.jsp.jspeditor.dnd.PaletteTaglibInserter; +import org.jboss.tools.jst.web.tld.TaglibData; +import org.jboss.tools.jst.web.tld.URIConstants; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.NodeList; + +public class CreateJSF2CompositeCommandHandler extends AbstractHandler { + + private final String IMPLEMENTATION = "composite:implementation"; //$NON-NLS-1$ + private JSPMultiPageEditor editor; + + @Override + public void setEnabled(Object evaluationContext) { + boolean enabled=false; + if (evaluationContext instanceof IEvaluationContext) { + IEvaluationContext context = (IEvaluationContext) evaluationContext; + Object activeEditor = context.getVariable(ISources.ACTIVE_EDITOR_NAME); + if (activeEditor instanceof ITextEditor) { + IEditorInput in = ((ITextEditor) activeEditor).getEditorInput(); + if (in instanceof FileEditorInput) { + try { + enabled = JSF2Util.isJSF2(((FileEditorInput) in).getFile().getProject()); + } catch (CoreException e) { + e.printStackTrace(); + } + } + } + } + if (isEnabled() != enabled) { + setBaseEnabled(enabled); + } + } + + @Override + public Object execute(ExecutionEvent event) throws ExecutionException { + + IEditorPart ep = HandlerUtil.getActiveEditorChecked(event); + if (ep instanceof JSPMultiPageEditor) { + editor = (JSPMultiPageEditor) ep; + /* + * Get the selected text + */ + ISelection selection = editor.getSelectionProvider().getSelection(); + if ((selection instanceof TextSelection) + && (selection instanceof IStructuredSelection)) { + TextSelection textSelection = (TextSelection) selection; + IStructuredSelection ss = (IStructuredSelection) selection; + final IProject project = editor.getProject(); + /* + * Correct marked text if some tags were partially selected. + */ + int offset = 0; + int length = 0; + /* + * When there is only text node - use only selected text + */ + if ((ss.size() == 1) && (ss.getFirstElement() instanceof TextImpl)) { + offset = textSelection.getOffset(); + length = textSelection.getLength(); + } else { + /* + * Otherwise selection will be expanded + * to the whole selected element with its children + */ + Iterator it = ss.iterator(); + boolean first = true; + while (it.hasNext()) { + Object ob = (Object) it.next(); + if (ob instanceof NodeImpl) { + NodeImpl n = ((NodeImpl) ob); + if (first) { + offset = n.getStartOffset(); + first = false; + } + length += n.getEndOffset() - n.getStartOffset(); + } + } + /* + * Get composite's name and namespace from the popup dialog + */ + InputDialog dlg = new InputDialog(Display.getCurrent().getActiveShell(), + "Creating composite component", //$NON-NLS-1$ + "Enter component's namespace and name:", "namespace:name", //$NON-NLS-1$ //$NON-NLS-2$ + new IInputValidator() { + public String isValid(String newText) { + String trim = newText.trim(); + String result = null; + String[] split = trim.split(":", 2); //$NON-NLS-1$ + Pattern p = Pattern.compile("([a-zA-Z]+\\d*)+"); //$NON-NLS-1$ + /* + * Check the correct format. + * Matcher will accept only word characters with optional numbers. + */ + if ((split.length != 2) || trim.startsWith(":") || trim.endsWith(":") //$NON-NLS-1$ //$NON-NLS-2$ + || (split[0].length() == 0) || (split[1].length() == 0)) { + result = "Component's name should fit in the pattern \"namespace:name\""; //$NON-NLS-1$ + } else if(!p.matcher(split[0]).matches()) { + result = "Namespace '"+split[0]+"' has wrong spelling, please correct"; //$NON-NLS-1$ //$NON-NLS-2$ + } else if(!p.matcher(split[1]).matches()) { + result = "Name '"+split[1]+"' has wrong spelling, please correct"; //$NON-NLS-1$ //$NON-NLS-2$ + } else { + String nameSpaceURI = JSF2ResourceUtil.JSF2_URI_PREFIX + "/" + split[0]; //$NON-NLS-1$ + Object fld = JSF2ResourceUtil.findResourcesFolderContainerByNameSpace(project, nameSpaceURI); + if (fld instanceof IFolder) { + IResource res = ((IFolder) fld).findMember(split[1]+ ".xhtml"); //$NON-NLS-1$ + if ((res instanceof IFile) && ((IFile)res).exists() ) { + result = "Component with the same name already exists"; //$NON-NLS-1$ + } + } + } + return result; + } + }); + if (dlg.open() == Window.OK) { + /* + * Create all required files + */ + String componentName = dlg.getValue(); + String[] split = componentName.split(":", 2); //$NON-NLS-1$ + String path = ""; //$NON-NLS-1$ + path = componentName.replaceAll(":", "/") + ".xhtml"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + if (project != null) { + IStructuredModel model = null; + try { + IFile createdFile = JSF2ResourceUtil + .createCompositeComponentFile(project, new Path(path)); + /* + * Add selected text to the template + */ + IModelManager manager = StructuredModelManager.getModelManager(); + if (manager != null) { + model = manager.getModelForEdit(createdFile); + if (model instanceof IDOMModel) { + IDOMModel domModel = (IDOMModel) model; + IDOMDocument document = domModel.getDocument(); + NodeList list = document.getElementsByTagName(IMPLEMENTATION); + if (list.getLength() == 1) { + IDocument doc = editor.getDocumentProvider().getDocument(editor.getEditorInput()); + String replacedText = doc.get(offset, length); + String content = document.getStructuredDocument().getText(); + int index = content.indexOf("<"+IMPLEMENTATION+">") + ("<"+IMPLEMENTATION+">").length(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + content = content.subSequence(0, index) + "\n" + replacedText + content.subSequence(index, content.length()); //$NON-NLS-1$ + domModel.reload(new ByteArrayInputStream(content.getBytes())); + model.save(); + /* + * Register JSF 2 composite on the current page + */ + String replacement = "<" + componentName + "> </" + componentName + ">"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + doc.replace(offset, length, replacement); + /* + * Register the required taglib + */ + StructuredTextEditor ed = ((JSPMultiPageEditor) editor).getSourceEditor(); + if (ed instanceof JSPTextEditor) { + String libraryUri = JSF2ResourceUtil.JSF2_URI_PREFIX + "/" + split[0]; //$NON-NLS-1$ + PaletteTaglibInserter PaletteTaglibInserter = new PaletteTaglibInserter(); + Properties p = new Properties(); + p.put("selectionProvider", editor.getSelectionProvider()); //$NON-NLS-1$ + p.setProperty(URIConstants.LIBRARY_URI, libraryUri); + p.setProperty(URIConstants.LIBRARY_VERSION, ""); //$NON-NLS-1$ + p.setProperty(URIConstants.DEFAULT_PREFIX, split[0]); + p.setProperty(JSPPaletteInsertHelper.PROPOPERTY_ADD_TAGLIB, "true"); //$NON-NLS-1$ + p.setProperty(XModelObjectConstants.REFORMAT, "yes"); //$NON-NLS-1$ + p.setProperty(XModelObjectConstants.START_TEXT, + "<%@ taglib uri=\""+libraryUri+"\" prefix=\"" +split[0]+ "\" %>\\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + PaletteTaglibInserter.inserTaglib(ed.getTextViewer().getDocument(), p); + } + /* + * Add required taglibs to the composite file + */ + IVisualContext context = editor.getJspEditor().getPageContext(); + List<TaglibData> tl = null; + if (context instanceof SourceEditorPageContext) { + SourceEditorPageContext sourcePageContext = (SourceEditorPageContext) context; + /* + * Get taglibs from the source file + */ + tl = sourcePageContext.getTagLibs(); + Map<String, String> sourceTaglibs = new HashMap<String, String>(); + Map<String, String> requiredTaglibs = new HashMap<String, String>(); + Set<String> compositeTaglibs = new HashSet<String>(); + for (TaglibData taglibData : tl) { + sourceTaglibs.put(taglibData.getPrefix(), taglibData.getUri()); + } + /* + * Parse selected fragment to find used taglibs + */ + Pattern p = Pattern.compile("<([a-zA-Z]+\\d*)+:"); //$NON-NLS-1$ + Matcher m = p.matcher(replacedText); + while (m.find()) { + if (sourceTaglibs.keySet().contains(m.group(1)) + && !requiredTaglibs.keySet().contains(m.group(1))) { + requiredTaglibs.put(m.group(1), sourceTaglibs.get(m.group(1))); + } + } + /* + * Get the <html> tag of the created file + */ + list = document.getElementsByTagName("html"); //$NON-NLS-1$ + if (list.getLength() == 1) { + Element html = ((Element)list.item(0)); + NamedNodeMap map = html.getAttributes(); + for (int i = 0; i < map.getLength(); i++) { + compositeTaglibs.add(map.item(i).getNodeName()); + } + for (String key : requiredTaglibs.keySet()) { + String xmlns = "xmlns:"+key; //$NON-NLS-1$ + if (!compositeTaglibs.contains(xmlns)) { + html.setAttribute(xmlns, requiredTaglibs.get(key)); + } + } + } + } + /* + * Open created file + */ + FileEditorInput input = new FileEditorInput(createdFile); + JSPMultiPageEditor part = (JSPMultiPageEditor) PlatformUI + .getWorkbench().getActiveWorkbenchWindow().getActivePage() + .openEditor(input, "org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor", true); //$NON-NLS-1$ + } + } + } + } catch (CoreException e) { + JSFModelPlugin.getPluginLog().logError(e); + } catch (IOException e) { + JSFModelPlugin.getPluginLog().logError(e); + } catch (BadLocationException e) { + JSFModelPlugin.getPluginLog().logError(e); + } finally { + if (model != null) { + model.releaseFromEdit(); + } + } + } + } + } + } + } + return null; + } + +} Deleted: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/CreateJSF2CompositeAction.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/CreateJSF2CompositeAction.java 2011-05-13 16:00:30 UTC (rev 31299) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/CreateJSF2CompositeAction.java 2011-05-13 16:04:23 UTC (rev 31300) @@ -1,280 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007-2011 Exadel, Inc. and Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.jsf.web.validation.jsf2.action; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.action.Action; -import org.eclipse.jface.dialogs.IInputValidator; -import org.eclipse.jface.dialogs.InputDialog; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.TextSelection; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.window.Window; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.part.FileEditorInput; -import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.sse.ui.StructuredTextEditor; -import org.eclipse.wst.xml.core.internal.document.NodeImpl; -import org.eclipse.wst.xml.core.internal.document.TextImpl; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; -import org.jboss.tools.common.model.XModelObjectConstants; -import org.jboss.tools.jsf.JSFModelPlugin; -import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil; -import org.jboss.tools.jst.jsp.editor.IVisualContext; -import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; -import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor; -import org.jboss.tools.jst.jsp.jspeditor.SourceEditorPageContext; -import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPPaletteInsertHelper; -import org.jboss.tools.jst.jsp.jspeditor.dnd.PaletteTaglibInserter; -import org.jboss.tools.jst.web.tld.TaglibData; -import org.jboss.tools.jst.web.tld.URIConstants; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.NodeList; - -public class CreateJSF2CompositeAction extends Action { - - private final String IMPLEMENTATION = "composite:implementation"; //$NON-NLS-1$ - - private JSPMultiPageEditor editor; - - public CreateJSF2CompositeAction() { - super(); - } - - @Override - public void run() { - editor = (JSPMultiPageEditor) PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getActivePage().getActiveEditor(); - /* - * Get the selected text - */ - ISelection selection = editor.getSelectionProvider().getSelection(); - if ((selection instanceof TextSelection) - && (selection instanceof IStructuredSelection)) { - TextSelection textSelection = (TextSelection) selection; - IStructuredSelection ss = (IStructuredSelection) selection; - final IProject project = editor.getProject(); - /* - * Correct marked text if some tags were partially selected. - */ - int offset = 0; - int length = 0; - /* - * When there is only text node - use only selected text - */ - if ((ss.size() == 1) && (ss.getFirstElement() instanceof TextImpl)) { - offset = textSelection.getOffset(); - length = textSelection.getLength(); - } else { - /* - * Otherwise selection will be expanded - * to the whole selected element with its children - */ - Iterator it = ss.iterator(); - boolean first = true; - while (it.hasNext()) { - Object ob = (Object) it.next(); - if (ob instanceof NodeImpl) { - NodeImpl n = ((NodeImpl) ob); - if (first) { - offset = n.getStartOffset(); - first = false; - } - length += n.getEndOffset() - n.getStartOffset(); - } - } - /* - * Get composite's name and namespace from the popup dialog - */ - InputDialog dlg = new InputDialog(Display.getCurrent().getActiveShell(), - "Creating composite component", //$NON-NLS-1$ - "Enter component's namespace and name:", "namespace:name", //$NON-NLS-1$ //$NON-NLS-2$ - new IInputValidator() { - public String isValid(String newText) { - String trim = newText.trim(); - String result = null; - String[] split = trim.split(":", 2); //$NON-NLS-1$ - Pattern p = Pattern.compile("([a-zA-Z]+\\d*)+"); //$NON-NLS-1$ - /* - * Check the correct format. - * Matcher will accept only word characters with optional numbers. - */ - if ((split.length != 2) || trim.startsWith(":") || trim.endsWith(":") //$NON-NLS-1$ //$NON-NLS-2$ - || (split[0].length() == 0) || (split[1].length() == 0)) { - result = "Component's name should fit in the pattern \"namespace:name\""; //$NON-NLS-1$ - } else if(!p.matcher(split[0]).matches()) { - result = "Namespace '"+split[0]+"' has wrong spelling, please correct"; //$NON-NLS-1$ //$NON-NLS-2$ - } else if(!p.matcher(split[1]).matches()) { - result = "Name '"+split[1]+"' has wrong spelling, please correct"; //$NON-NLS-1$ //$NON-NLS-2$ - } else { - String nameSpaceURI = JSF2ResourceUtil.JSF2_URI_PREFIX + "/" + split[0]; //$NON-NLS-1$ - Object fld = JSF2ResourceUtil.findResourcesFolderContainerByNameSpace(project, nameSpaceURI); - if (fld instanceof IFolder) { - IResource res = ((IFolder) fld).findMember(split[1]+ ".xhtml"); //$NON-NLS-1$ - if ((res instanceof IFile) && ((IFile)res).exists() ) { - result = "Component with the same name already exists"; //$NON-NLS-1$ - } - } - } - return result; - } - }); - if (dlg.open() == Window.OK) { - /* - * Create all required files - */ - String componentName = dlg.getValue(); - String[] split = componentName.split(":", 2); //$NON-NLS-1$ - String path = ""; //$NON-NLS-1$ - path = componentName.replaceAll(":", "/") + ".xhtml"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - if (project != null) { - IStructuredModel model = null; - try { - IFile createdFile = JSF2ResourceUtil - .createCompositeComponentFile(project, new Path(path)); - /* - * Add selected text to the template - */ - IModelManager manager = StructuredModelManager.getModelManager(); - if (manager != null) { - model = manager.getModelForEdit(createdFile); - if (model instanceof IDOMModel) { - IDOMModel domModel = (IDOMModel) model; - IDOMDocument document = domModel.getDocument(); - NodeList list = document.getElementsByTagName(IMPLEMENTATION); - if (list.getLength() == 1) { - IDocument doc = editor.getDocumentProvider().getDocument(editor.getEditorInput()); - String replacedText = doc.get(offset, length); - String content = document.getStructuredDocument().getText(); - int index = content.indexOf("<"+IMPLEMENTATION+">") + ("<"+IMPLEMENTATION+">").length(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - content = content.subSequence(0, index) + "\n" + replacedText + content.subSequence(index, content.length()); //$NON-NLS-1$ - domModel.reload(new ByteArrayInputStream(content.getBytes())); - model.save(); - /* - * Register JSF 2 composite on the current page - */ - String replacement = "<" + componentName + "> </" + componentName + ">"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - doc.replace(offset, length, replacement); - /* - * Register the required taglib - */ - StructuredTextEditor ed = ((JSPMultiPageEditor) editor).getSourceEditor(); - if (ed instanceof JSPTextEditor) { - String libraryUri = JSF2ResourceUtil.JSF2_URI_PREFIX + "/" + split[0]; //$NON-NLS-1$ - PaletteTaglibInserter PaletteTaglibInserter = new PaletteTaglibInserter(); - Properties p = new Properties(); - p.put("selectionProvider", editor.getSelectionProvider()); //$NON-NLS-1$ - p.setProperty(URIConstants.LIBRARY_URI, libraryUri); - p.setProperty(URIConstants.LIBRARY_VERSION, ""); //$NON-NLS-1$ - p.setProperty(URIConstants.DEFAULT_PREFIX, split[0]); - p.setProperty(JSPPaletteInsertHelper.PROPOPERTY_ADD_TAGLIB, "true"); //$NON-NLS-1$ - p.setProperty(XModelObjectConstants.REFORMAT, "yes"); //$NON-NLS-1$ - p.setProperty(XModelObjectConstants.START_TEXT, - "<%@ taglib uri=\""+libraryUri+"\" prefix=\"" +split[0]+ "\" %>\\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - PaletteTaglibInserter.inserTaglib(ed.getTextViewer().getDocument(), p); - } - /* - * Add required taglibs to the composite file - */ - IVisualContext context = editor.getJspEditor().getPageContext(); - List<TaglibData> tl = null; - if (context instanceof SourceEditorPageContext) { - SourceEditorPageContext sourcePageContext = (SourceEditorPageContext) context; - /* - * Get taglibs from the source file - */ - tl = sourcePageContext.getTagLibs(); - Map<String, String> sourceTaglibs = new HashMap<String, String>(); - Map<String, String> requiredTaglibs = new HashMap<String, String>(); - Set<String> compositeTaglibs = new HashSet<String>(); - for (TaglibData taglibData : tl) { - sourceTaglibs.put(taglibData.getPrefix(), taglibData.getUri()); - } - /* - * Parse selected fragment to find used taglibs - */ - Pattern p = Pattern.compile("<([a-zA-Z]+\\d*)+:"); //$NON-NLS-1$ - Matcher m = p.matcher(replacedText); - while (m.find()) { - if (sourceTaglibs.keySet().contains(m.group(1)) - && !requiredTaglibs.keySet().contains(m.group(1))) { - requiredTaglibs.put(m.group(1), sourceTaglibs.get(m.group(1))); - } - } - /* - * Get the <html> tag of the created file - */ - list = document.getElementsByTagName("html"); //$NON-NLS-1$ - if (list.getLength() == 1) { - Element html = ((Element)list.item(0)); - NamedNodeMap map = html.getAttributes(); - for (int i = 0; i < map.getLength(); i++) { - compositeTaglibs.add(map.item(i).getNodeName()); - } - for (String key : requiredTaglibs.keySet()) { - String xmlns = "xmlns:"+key; //$NON-NLS-1$ - if (!compositeTaglibs.contains(xmlns)) { - html.setAttribute(xmlns, requiredTaglibs.get(key)); - } - } - } - } - /* - * Open created file - */ - FileEditorInput input = new FileEditorInput(createdFile); - JSPMultiPageEditor part = (JSPMultiPageEditor) PlatformUI - .getWorkbench().getActiveWorkbenchWindow().getActivePage() - .openEditor(input, "org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor", true); //$NON-NLS-1$ - } - } - } - } catch (CoreException e) { - JSFModelPlugin.getPluginLog().logError(e); - } catch (IOException e) { - JSFModelPlugin.getPluginLog().logError(e); - } catch (BadLocationException e) { - JSFModelPlugin.getPluginLog().logError(e); - } finally { - if (model != null) { - model.releaseFromEdit(); - } - } - } - } - } - } - } -} \ No newline at end of file Deleted: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/CreateJSF2CompositeContributionItem.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/CreateJSF2CompositeContributionItem.java 2011-05-13 16:00:30 UTC (rev 31299) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/CreateJSF2CompositeContributionItem.java 2011-05-13 16:04:23 UTC (rev 31300) @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007-2011 Exadel, Inc. and Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.jsf.web.validation.jsf2.action; - -import org.eclipse.jface.action.ActionContributionItem; -import org.eclipse.swt.widgets.Menu; -import org.jboss.tools.jsf.messages.JSFUIMessages; - -public class CreateJSF2CompositeContributionItem extends ActionContributionItem { - - public CreateJSF2CompositeContributionItem() { - super(new CreateJSF2CompositeAction()); - } - - @Override - public void fill(Menu parent, int index) { - getAction().setText(JSFUIMessages.CreateJSF2Composite); - super.fill(parent, index); - } -}