Author: svasilyev Date: 2008-02-20 12:53:44 -0500 (Wed, 20 Feb 2008) New Revision: 6486 Added: trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/ trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/ trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/HtmlTemplatePlugin.java trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/ trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlBodyTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe.jsp/src/org/jboss/tools/vpe/ trunk/vpe/plugins/org.jboss.tools.vpe.jsp/src/org/jboss/tools/vpe/jsp/ trunk/vpe/plugins/org.jboss.tools.vpe.jsp/src/org/jboss/tools/vpe/jsp/JspTemplatePluign.java Removed: trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/jst/ trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlBodyTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe.jsp/src/org/jboss/tools/jst/ trunk/vpe/plugins/org.jboss.tools.vpe.jsp/src/org/jboss/tools/vpe/jsp/JspTemplatePluign.java Modified: trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml trunk/vpe/features/org.jboss.tools.vpe.feature/feature.xml trunk/vpe/plugins/org.jboss.tools.vpe.html/.project trunk/vpe/plugins/org.jboss.tools.vpe.html/META-INF/MANIFEST.MF trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml trunk/vpe/plugins/org.jboss.tools.vpe.jsp/.project trunk/vpe/plugins/org.jboss.tools.vpe.jsp/META-INF/MANIFEST.MF Log: The org.jboss.tools.jst.vpe.jsp and org.jboss.tools.jst.vpe.html plugins were replaced into vpe/plugins with names org.jboss.tools.vpe.jsp and org.jboss.tools.vpe.jsp according. Modified: trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml =================================================================== --- trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2008-02-20 17:32:54 UTC (rev 6485) +++ trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2008-02-20 17:53:44 UTC (rev 6486) @@ -1,25 +1,25 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.jboss.tools.richfaces.feature" - label="RichFaces VPE Feature" - version="2.0.0" - provider-name="JBoss, a division of Red Hat"> - - <description url="http://www.jboss.org/tools"> - JBossTools RichFaces feature - </description> - - <copyright> +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.richfaces.feature" + label="RichFaces VPE Feature" + version="2.0.0" + provider-name="JBoss, a division of Red Hat"> + + <description url="http://www.jboss.org/tools"> + JBossTools RichFaces feature + </description> + + <copyright> Copyright (c) 2007 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 - </copyright> - - <license url="http://www.eclipse.org/legal/epl-v10.html"> +Exadel, Inc. and Red Hat, Inc. - initial API and implementation + </copyright> + + <license url="http://www.eclipse.org/legal/epl-v10.html"> Eclipse Public License - v 1.0 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR @@ -215,264 +215,264 @@ No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting -litigation. - </license> - - <requires> - <import feature="org.jboss.tools.xulrunner.feature" version="1.8.1.3-20070904"/> - </requires> - - <plugin - id="org.jboss.tools.common" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.gef" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.kb" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.model" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.model.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.projecttemplates" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.text.ext" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.text.xml" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.verification" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.verification.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.text.ext" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.text.ext.facelets" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.verification" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.ajax4jsf" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.facelets" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.richfaces" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.seam" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.tomahawk" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.jsp" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.server.jetty" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.server.jrun" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.server.resin" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.debug" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.debug.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.tiles" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.tiles.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.verification" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.vpe" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.vpe.ui.palette" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.firstrun" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.vpe.xulrunner" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.hibernate.xml" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.hibernate.xml.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.adf" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.jsf" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.myfaces" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.vpe.html" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.vpe.jsp" - download-size="0" - install-size="0" - version="0.0.0"/> - -</feature> +litigation. + </license> + + <requires> + <import feature="org.jboss.tools.xulrunner.feature" version="1.8.1.3-20070904"/> + </requires> + + <plugin + id="org.jboss.tools.common" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.gef" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.kb" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.model" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.model.ui" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.projecttemplates" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.text.ext" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.text.xml" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.verification" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.verification.ui" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.text.ext" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.text.ext.facelets" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.ui" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.verification" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.ajax4jsf" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.facelets" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.richfaces" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.seam" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.tomahawk" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.jsp" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.server.jetty" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.server.jrun" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.server.resin" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.web" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.web.debug" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.web.debug.ui" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.web.tiles" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.web.tiles.ui" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.web.ui" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.web.verification" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.vpe" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.vpe.ui.palette" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.firstrun" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.vpe.xulrunner" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.hibernate.xml" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.hibernate.xml.ui" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.adf" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.jsf" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.myfaces" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.vpe.html" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.vpe.jsp" + download-size="0" + install-size="0" + version="0.0.0"/> + +</feature> Modified: trunk/vpe/features/org.jboss.tools.vpe.feature/feature.xml =================================================================== --- trunk/vpe/features/org.jboss.tools.vpe.feature/feature.xml 2008-02-20 17:32:54 UTC (rev 6485) +++ trunk/vpe/features/org.jboss.tools.vpe.feature/feature.xml 2008-02-20 17:53:44 UTC (rev 6486) @@ -1,24 +1,24 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.jboss.tools.vpe_feature" - label="Vpe_feature Feature" - version="2.0.0"> - - <description url="http://www.jboss.org/tools"> - JBossTools Visual Page Editor Feature - </description> - - <copyright> +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.vpe_feature" + label="Vpe_feature Feature" + version="2.0.0"> + + <description url="http://www.jboss.org/tools"> + JBossTools Visual Page Editor Feature + </description> + + <copyright> Copyright (c) 2007 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 - </copyright> - - <license url="http://www.eclipse.org/legal/epl-v10.html"> +Exadel, Inc. and Red Hat, Inc. - initial API and implementation + </copyright> + + <license url="http://www.eclipse.org/legal/epl-v10.html"> Eclipse Public License - v 1.0 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE OF THIS AGREEMENT. @@ -104,45 +104,57 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) ! and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. -This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. - </license> - - <plugin - id="org.jboss.tools.vpe" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.vpe.mozilla" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.vpe.mozilla.gtk" - download-size="0" - install-size="0" - version="0.0.0" - fragment="true"/> - - <plugin - id="org.jboss.tools.vpe.mozilla.win32" - download-size="0" - install-size="0" - version="0.0.0" - fragment="true"/> - - <plugin - id="org.jboss.tools.vpe.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.vpe.ui.palette" - download-size="0" - install-size="0" - version="0.0.0"/> - -</feature> +This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. + </license> + + <plugin + id="org.jboss.tools.vpe" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.vpe.mozilla" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.vpe.mozilla.gtk" + download-size="0" + install-size="0" + version="0.0.0" + fragment="true"/> + + <plugin + id="org.jboss.tools.vpe.mozilla.win32" + download-size="0" + install-size="0" + version="0.0.0" + fragment="true"/> + + <plugin + id="org.jboss.tools.vpe.ui" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.vpe.ui.palette" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.vpe.html" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.vpe.jsp" + download-size="0" + install-size="0" + version="0.0.0"/> + +</feature> Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/.project =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.html/.project 2008-02-20 17:32:54 UTC (rev 6485) +++ trunk/vpe/plugins/org.jboss.tools.vpe.html/.project 2008-02-20 17:53:44 UTC (rev 6486) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.jboss.tools.jst.vpe.html</name> + <name>org.jboss.tools.vpe.html</name> <comment></comment> <projects> </projects> Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.html/META-INF/MANIFEST.MF 2008-02-20 17:32:54 UTC (rev 6485) +++ trunk/vpe/plugins/org.jboss.tools.vpe.html/META-INF/MANIFEST.MF 2008-02-20 17:53:44 UTC (rev 6486) @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: org.jboss.tools.jst.vpe.html;singleton:=true +Bundle-SymbolicName: org.jboss.tools.vpe.html;singleton:=true Bundle-Version: 2.1.0 -Bundle-Activator: org.jboss.tools.jst.vpe.html.HtmlTemplatePlugin +Bundle-Activator: org.jboss.tools.vpe.html.HtmlTemplatePlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, Copied: trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/HtmlTemplatePlugin.java (from rev 6480, trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/jst/vpe/html/HtmlTemplatePlugin.java) =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/HtmlTemplatePlugin.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/HtmlTemplatePlugin.java 2008-02-20 17:53:44 UTC (rev 6486) @@ -0,0 +1,50 @@ +package org.jboss.tools.vpe.html; + +import org.jboss.tools.common.log.BaseUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class HtmlTemplatePlugin extends BaseUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.tools.jst.vpe.html"; //$NON-NLS-1$ + + // The shared instance + private static HtmlTemplatePlugin plugin; + + /** + * The constructor + */ + public HtmlTemplatePlugin() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static HtmlTemplatePlugin getDefault() { + return plugin; + } + +} Copied: trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template (from rev 6480, trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/jst/vpe/html/template) Deleted: trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlBodyTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/jst/vpe/html/template/HtmlBodyTemplate.java 2008-02-20 16:35:45 UTC (rev 6480) +++ trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlBodyTemplate.java 2008-02-20 17:53:44 UTC (rev 6486) @@ -1,125 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.jst.vpe.html.template; - -import org.jboss.tools.vpe.editor.context.VpePageContext; -import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; -import org.jboss.tools.vpe.editor.template.VpeCreationData; -import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.editor.util.VpeStyleUtil; -import org.mozilla.interfaces.nsIDOMDocument; -import org.mozilla.interfaces.nsIDOMElement; -import org.mozilla.interfaces.nsIDOMNamedNodeMap; -import org.mozilla.interfaces.nsIDOMNode; -import org.mozilla.xpcom.XPCOMException; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - -/** - * - * @author ezheleznyakov(a)exadel.com - * - */ -public class HtmlBodyTemplate extends VpeAbstractTemplate { - - private nsIDOMElement bodyOld; - private static String STYLE_FOR_DIV = ""; //$NON-NLS-1$ - private static String ID = "id"; //$NON-NLS-1$ - - /** - * - */ - public VpeCreationData create(VpePageContext pageContext, Node sourceNode, - nsIDOMDocument visualDocument) { - - goToTree(visualDocument.getChildNodes().item(0)); - - nsIDOMNamedNodeMap attrsMap = bodyOld.getAttributes(); - long len = attrsMap.getLength(); - int j = 0; - for (int i = 0; i < len; i++) { - nsIDOMNode attr = attrsMap.item(j); - if (ID.equalsIgnoreCase(attr.getNodeName())) { - j++; - continue; - } - bodyOld.removeAttribute(attr.getNodeName()); - } - - for (int i = 0; i < sourceNode.getAttributes().getLength(); i++) { - String name = sourceNode.getAttributes().item(i).getNodeName(); - if(ID.equalsIgnoreCase(name)) - continue; - String value = sourceNode.getAttributes().item(i).getNodeValue(); - // all full path for 'url' - if (VpeStyleUtil.ATTRIBUTE_STYLE.equalsIgnoreCase(name)) - value = VpeStyleUtil.addFullPathIntoURLValue(value, pageContext - .getEditPart().getEditorInput()); - if (VpeStyleUtil.PARAMETR_BACKGROND.equalsIgnoreCase(name)) - value = VpeStyleUtil.addFullPathIntoBackgroundValue(value, - pageContext.getEditPart().getEditorInput()); - //FIX FOR JBIDE-1568, added by Max Areshkau - try{ - bodyOld.setAttribute(name, value); - }catch(XPCOMException ex ) { - //jsut ignore it - } - - } - - nsIDOMElement div = visualDocument.createElement(HTML.TAG_DIV); - div.setAttribute(VpeStyleUtil.ATTRIBUTE_STYLE, STYLE_FOR_DIV); - - return new VpeCreationData(div); - } - - /** - * - * @param node - */ - private void goToTree(nsIDOMNode node) { - - for (int i = 0; i < node.getChildNodes().getLength(); i++) - if (HTML.TAG_BODY.equalsIgnoreCase(node.getChildNodes().item(i) - .getNodeName())) - bodyOld = (nsIDOMElement) node.getChildNodes().item(i) - .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); - else - goToTree(node.getChildNodes().item(i)); - } - - /** - * Checks, whether it is necessary to re-create an element at change of - * attribute - * - * @param pageContext - * Contains the information on edited page. - * @param sourceElement - * The current element of the source tree. - * @param visualDocument - * The document of the visual tree. - * @param visualNode - * The current node of the visual tree. - * @param data - * The arbitrary data, built by a method <code>create</code> - * @param name - * Attribute name - * @param value - * Attribute value - * @return <code>true</code> if it is required to re-create an element at - * a modification of attribute, <code>false</code> otherwise. - */ - public boolean isRecreateAtAttrChange(VpePageContext pageContext, - Element sourceElement, nsIDOMDocument visualDocument, - nsIDOMElement visualNode, Object data, String name, String value) { - return true; - } -} \ No newline at end of file Copied: trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlBodyTemplate.java (from rev 6485, trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/jst/vpe/html/template/HtmlBodyTemplate.java) =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlBodyTemplate.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlBodyTemplate.java 2008-02-20 17:53:44 UTC (rev 6486) @@ -0,0 +1,125 @@ +/******************************************************************************* + * Copyright (c) 2007 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.vpe.html.template; + +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; +import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.util.HTML; +import org.jboss.tools.vpe.editor.util.VpeStyleUtil; +import org.mozilla.interfaces.nsIDOMDocument; +import org.mozilla.interfaces.nsIDOMElement; +import org.mozilla.interfaces.nsIDOMNamedNodeMap; +import org.mozilla.interfaces.nsIDOMNode; +import org.mozilla.xpcom.XPCOMException; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +/** + * + * @author ezheleznyakov(a)exadel.com + * + */ +public class HtmlBodyTemplate extends VpeAbstractTemplate { + + private nsIDOMElement bodyOld; + private static String STYLE_FOR_DIV = ""; //$NON-NLS-1$ + private static String ID = "id"; //$NON-NLS-1$ + + /** + * + */ + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument) { + + goToTree(visualDocument.getChildNodes().item(0)); + + nsIDOMNamedNodeMap attrsMap = bodyOld.getAttributes(); + long len = attrsMap.getLength(); + int j = 0; + for (int i = 0; i < len; i++) { + nsIDOMNode attr = attrsMap.item(j); + if (ID.equalsIgnoreCase(attr.getNodeName())) { + j++; + continue; + } + bodyOld.removeAttribute(attr.getNodeName()); + } + + for (int i = 0; i < sourceNode.getAttributes().getLength(); i++) { + String name = sourceNode.getAttributes().item(i).getNodeName(); + if(ID.equalsIgnoreCase(name)) + continue; + String value = sourceNode.getAttributes().item(i).getNodeValue(); + // all full path for 'url' + if (VpeStyleUtil.ATTRIBUTE_STYLE.equalsIgnoreCase(name)) + value = VpeStyleUtil.addFullPathIntoURLValue(value, pageContext + .getEditPart().getEditorInput()); + if (VpeStyleUtil.PARAMETR_BACKGROND.equalsIgnoreCase(name)) + value = VpeStyleUtil.addFullPathIntoBackgroundValue(value, + pageContext.getEditPart().getEditorInput()); + //FIX FOR JBIDE-1568, added by Max Areshkau + try{ + bodyOld.setAttribute(name, value); + }catch(XPCOMException ex ) { + //jsut ignore it + } + + } + + nsIDOMElement div = visualDocument.createElement(HTML.TAG_DIV); + div.setAttribute(VpeStyleUtil.ATTRIBUTE_STYLE, STYLE_FOR_DIV); + + return new VpeCreationData(div); + } + + /** + * + * @param node + */ + private void goToTree(nsIDOMNode node) { + + for (int i = 0; i < node.getChildNodes().getLength(); i++) + if (HTML.TAG_BODY.equalsIgnoreCase(node.getChildNodes().item(i) + .getNodeName())) + bodyOld = (nsIDOMElement) node.getChildNodes().item(i) + .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + else + goToTree(node.getChildNodes().item(i)); + } + + /** + * Checks, whether it is necessary to re-create an element at change of + * attribute + * + * @param pageContext + * Contains the information on edited page. + * @param sourceElement + * The current element of the source tree. + * @param visualDocument + * The document of the visual tree. + * @param visualNode + * The current node of the visual tree. + * @param data + * The arbitrary data, built by a method <code>create</code> + * @param name + * Attribute name + * @param value + * Attribute value + * @return <code>true</code> if it is required to re-create an element at + * a modification of attribute, <code>false</code> otherwise. + */ + public boolean isRecreateAtAttrChange(VpePageContext pageContext, + Element sourceElement, nsIDOMDocument visualDocument, + nsIDOMElement visualNode, Object data, String name, String value) { + return true; + } +} \ No newline at end of file Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml 2008-02-20 17:32:54 UTC (rev 6485) +++ trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml 2008-02-20 17:53:44 UTC (rev 6486) @@ -354,7 +354,7 @@ <vpe:tag name="body" case-sensitive="yes"> <vpe:template children="yes" modify="yes" - class="org.jboss.tools.jst.vpe.html.template.HtmlBodyTemplate"> + class="org.jboss.tools.vpe.html.template.HtmlBodyTemplate"> <vpe:resize> <vpe:width width-attr="style.width" /> <vpe:height height-attr="style.height" /> Modified: trunk/vpe/plugins/org.jboss.tools.vpe.jsp/.project =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.jsp/.project 2008-02-20 17:32:54 UTC (rev 6485) +++ trunk/vpe/plugins/org.jboss.tools.vpe.jsp/.project 2008-02-20 17:53:44 UTC (rev 6486) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.jboss.tools.jst.vpe.jsp</name> + <name>org.jboss.tools.vpe.jsp</name> <comment></comment> <projects> </projects> Modified: trunk/vpe/plugins/org.jboss.tools.vpe.jsp/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.jsp/META-INF/MANIFEST.MF 2008-02-20 17:32:54 UTC (rev 6485) +++ trunk/vpe/plugins/org.jboss.tools.vpe.jsp/META-INF/MANIFEST.MF 2008-02-20 17:53:44 UTC (rev 6486) @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: org.jboss.tools.jst.vpe.jsp;singleton:=true +Bundle-SymbolicName: org.jboss.tools.vpe.jsp;singleton:=true Bundle-Version: 2.1.0 -Bundle-Activator: org.jboss.tools.jst.vpe.jsp.JspTemplatePluign +Bundle-Activator: org.jboss.tools.vpe.jsp.JspTemplatePluign Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, Copied: trunk/vpe/plugins/org.jboss.tools.vpe.jsp/src/org/jboss/tools/vpe/jsp (from rev 6480, trunk/vpe/plugins/org.jboss.tools.vpe.jsp/src/org/jboss/tools/jst/vpe/jsp) Deleted: trunk/vpe/plugins/org.jboss.tools.vpe.jsp/src/org/jboss/tools/vpe/jsp/JspTemplatePluign.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.jsp/src/org/jboss/tools/jst/vpe/jsp/JspTemplatePluign.java 2008-02-20 16:35:45 UTC (rev 6480) +++ trunk/vpe/plugins/org.jboss.tools.vpe.jsp/src/org/jboss/tools/vpe/jsp/JspTemplatePluign.java 2008-02-20 17:53:44 UTC (rev 6486) @@ -1,50 +0,0 @@ -package org.jboss.tools.jst.vpe.jsp; - -import org.jboss.tools.common.log.BaseUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class JspTemplatePluign extends BaseUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.jst.vpe.jsp"; //$NON-NLS-1$ - - // The shared instance - private static JspTemplatePluign plugin; - - /** - * The constructor - */ - public JspTemplatePluign() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static JspTemplatePluign getDefault() { - return plugin; - } - -} Copied: trunk/vpe/plugins/org.jboss.tools.vpe.jsp/src/org/jboss/tools/vpe/jsp/JspTemplatePluign.java (from rev 6485, trunk/vpe/plugins/org.jboss.tools.vpe.jsp/src/org/jboss/tools/jst/vpe/jsp/JspTemplatePluign.java) =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.jsp/src/org/jboss/tools/vpe/jsp/JspTemplatePluign.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.jsp/src/org/jboss/tools/vpe/jsp/JspTemplatePluign.java 2008-02-20 17:53:44 UTC (rev 6486) @@ -0,0 +1,50 @@ +package org.jboss.tools.vpe.jsp; + +import org.jboss.tools.common.log.BaseUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class JspTemplatePluign extends BaseUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.tools.jst.vpe.jsp"; //$NON-NLS-1$ + + // The shared instance + private static JspTemplatePluign plugin; + + /** + * The constructor + */ + public JspTemplatePluign() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static JspTemplatePluign getDefault() { + return plugin; + } + +}