diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentFactory.java
index 68c0f7992..37a0ae843 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentFactory.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentFactory.java
@@ -81,43 +81,83 @@ public class ComponentFactory
* Base class name for UIInput's
*/
public final static String BASE_CLASS_UIINPUT = "javax.faces.component.UIInput"; //$NON-NLS-1$
+ /**
+ * Base class name for UIInput's (Jakarta EE)
+ */
+ public final static String BASE_CLASS_UIINPUT_JAKARTA = "jakarta.faces.component.UIInput"; //$NON-NLS-1$
/**
* Base class name for UIOutput's
*/
public final static String BASE_CLASS_UIOUTPUT = "javax.faces.component.UIOutput"; //$NON-NLS-1$
+ /**
+ * Base class name for UIOutput's (Jakarta EE)
+ */
+ public final static String BASE_CLASS_UIOUTPUT_JAKARTA = "jakarta.faces.component.UIOutput"; //$NON-NLS-1$
/**
* Base class name for UICommand's
*/
public final static String BASE_CLASS_UICOMMAND = "javax.faces.component.UICommand"; //$NON-NLS-1$
+ /**
+ * Base class name for UICommand's (Jakarta EE)
+ */
+ public final static String BASE_CLASS_UICOMMAND_JAKARTA = "jakarta.faces.component.UICommand"; //$NON-NLS-1$
/**
* Base class name for UIData's
*/
public final static String BASE_CLASS_UIDATA = "javax.faces.component.UIData"; //$NON-NLS-1$
+ /**
+ * Base class name for UIData's (Jakarta EE)
+ */
+ public final static String BASE_CLASS_UIDATA_JAKARTA = "jakarta.faces.component.UIData"; //$NON-NLS-1$
/**
* Base class name for UIForm's
*/
public final static String BASE_CLASS_UIFORM = "javax.faces.component.UIForm"; //$NON-NLS-1$
+ /**
+ * Base class name for UIForm's (Jakarta EE)
+ */
+ public final static String BASE_CLASS_UIFORM_JAKARTA = "jakarta.faces.component.UIForm"; //$NON-NLS-1$
/**
* Interface name for ValueHolder's
*/
public final static String INTERFACE_VALUEHOLDER = "javax.faces.component.ValueHolder"; //$NON-NLS-1$
+ /**
+ * Interface name for ValueHolder's (Jakarta EE)
+ */
+ public final static String INTERFACE_VALUEHOLDER_JAKARTA = "jakarta.faces.component.ValueHolder"; //$NON-NLS-1$
/**
* Interface name for EditableValueHolder's
*/
public final static String INTERFACE_EDITABLEVALUEHOLDER = "javax.faces.component.EditableValueHolder"; //$NON-NLS-1$
+ /**
+ * Interface name for EditableValueHolder's (Jakarta EE)
+ */
+ public final static String INTERFACE_EDITABLEVALUEHOLDER_JAKARTA = "jakarta.faces.component.EditableValueHolder"; //$NON-NLS-1$
/**
* Interface name for ActionSource's
*/
public final static String INTERFACE_ACTIONSOURCE = "javax.faces.component.ActionSource"; //$NON-NLS-1$
+ /**
+ * Interface name for ActionSource's (Jakarta EE)
+ */
+ public final static String INTERFACE_ACTIONSOURCE_JAKARTA = "jakarta.faces.component.ActionSource"; //$NON-NLS-1$
/**
* Interface name for ActionSource2's
*/
public final static String INTERFACE_ACTIONSOURCE2 = "javax.faces.component.ActionSource2"; //$NON-NLS-1$
+ /**
+ * Interface name for ActionSource2's (Jakarta EE)
+ */
+ public final static String INTERFACE_ACTIONSOURCE2_JAKARTA = "jakarta.faces.component.ActionSource2"; //$NON-NLS-1$
/**
* Interface name for NamingContainer's
*/
public final static String INTERFACE_NAMINGCONTAINER = "javax.faces.component.NamingContainer"; //$NON-NLS-1$
+ /**
+ * Interface name for NamingContainer's (Jakarta EE)
+ */
+ public final static String INTERFACE_NAMINGCONTAINER_JAKARTA = "jakarta.faces.component.NamingContainer"; //$NON-NLS-1$
/**
* @param id
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/ITagElement.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/ITagElement.java
index 52f61d2e4..8ad34aca7 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/ITagElement.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/ITagElement.java
@@ -36,7 +36,7 @@ public interface ITagElement extends Serializable
/**
* @return the fully qualified class name in dot separated format
- * (i.e. javax.faces.webapp.ConverterTag)
+ * (i.e. javax.faces.webapp.ConverterTag or jakarta.faces.webapp.ConverterTag)
*/
public abstract String getTagHandlerClassName();
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeConstants.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeConstants.java
index 19e987f5d..0e68ecb4d 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeConstants.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeConstants.java
@@ -101,6 +101,10 @@ public class TypeConstants
* Type signature for the JSF Data Model type
*/
public static final String TYPE_DATA_MODEL = "Ljavax.faces.model.DataModel;"; //$NON-NLS-1$
+ /**
+ * Type signature for the Jakarta Faces Data Model type
+ */
+ public static final String TYPE_DATA_MODEL_JAKARTA = "Ljakarta.faces.model.DataModel;"; //$NON-NLS-1$
/**
* Type signature for the Result Set type
*/
@@ -109,6 +113,10 @@ public class TypeConstants
* Type signature for the JSTL ResultSet type
*/
public static final String TYPE_JAVAX_SERVLET_JSP_JSTL_SQL_RESULT = "Ljavax.servlet.jsp.jstl.sql.Result;"; //$NON-NLS-1$
+ /**
+ * Type signature for the JSTL ResultSet type (Jakarta EE)
+ */
+ public static final String TYPE_JAKARTA_SERVLET_JSP_JSTL_SQL_RESULT = "Ljakarta.servlet.jsp.jstl.sql.Result;"; //$NON-NLS-1$
/**
* Type signature of the base type of all enum types
*/
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.core/META-INF/MANIFEST.MF
index 0d908e83d..a6b7cf196 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/META-INF/MANIFEST.MF
@@ -2,8 +2,9 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Automatic-Module-Name: org.eclipse.jst.jsf.core
Bundle-Name: %plugin.name
-Bundle-SymbolicName: org.eclipse.jst.jsf.core; singleton:=true
+Bundle-SymbolicName: org.eclipse.jst.jsf.core;singleton:=true
Bundle-Version: 1.9.3.qualifier
+Bundle-ClassPath: .
Bundle-Activator: org.eclipse.jst.jsf.core.internal.JSFCorePlugin
Bundle-Vendor: %plugin.provider
Bundle-Localization: plugin
@@ -26,9 +27,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.wst.common.emf;bundle-version="[1.1.103,2.0.0)",
org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)",
org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.jst.jsf.common.runtime;bundle-version="[1.0.0,2.0.0)",
@@ -37,7 +38,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.wst.css.core;bundle-version="[1.1.200,2.0.0)",
org.eclipse.debug.core;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui;bundle-version="3.6.0"
-Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.jst.jsf.core.internal.contenttype"
+Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy;exclude:=org.eclipse.jst.jsf.core.internal.contenttype
Export-Package: org.eclipse.jst.jsf.core,
org.eclipse.jst.jsf.core.internal;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
org.eclipse.jst.jsf.core.internal.contentassist.el;x-friends:="org.eclipse.jst.jsf.contentassist.tests",
@@ -53,9 +55,12 @@ Export-Package: org.eclipse.jst.jsf.core,
org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
org.eclipse.jst.jsf.core.internal.jsflibraryregistry.util;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
org.eclipse.jst.jsf.core.internal.launch;x-internal:=true,
+ org.eclipse.jst.jsf.core.internal.preferences,
org.eclipse.jst.jsf.core.internal.project.facet;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
+ org.eclipse.jst.jsf.core.internal.provisional.contenttype,
org.eclipse.jst.jsf.core.internal.region;x-internal:=true,
org.eclipse.jst.jsf.core.internal.tld;x-friends:="org.eclipse.jst.pagedesigner,org.eclipse.jst.jsf.core.tests",
+ org.eclipse.jst.jsf.core.internal.util,
org.eclipse.jst.jsf.core.jsfappconfig,
org.eclipse.jst.jsf.core.jsfappconfig.internal;x-internal:=true,
org.eclipse.jst.jsf.core.jsflibraryconfiguration,
@@ -120,3 +125,4 @@ Export-Package: org.eclipse.jst.jsf.core,
org.eclipse.jst.jsf.validation.internal.facelet,
org.eclipse.jst.jsf.validation.internal.strategy;x-internal:=true
Bundle-RequiredExecutionEnvironment: JavaSE-17
+Import-Package: org.eclipse.core.filebuffers
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/build.properties b/jsf/plugins/org.eclipse.jst.jsf.core/build.properties
index 816585f13..8a9e050f8 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/build.properties
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/build.properties
@@ -16,6 +16,7 @@ bin.includes = META-INF/,\
.,\
plugin.xml,\
plugin.properties,\
+ icons/,\
schema/,\
about.html,\
.options,\
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/icons/jsf_facet.gif b/jsf/plugins/org.eclipse.jst.jsf.core/icons/jsf_facet.gif
new file mode 100644
index 000000000..d28e39cd2
Binary files /dev/null and b/jsf/plugins/org.eclipse.jst.jsf.core/icons/jsf_facet.gif differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/model/jsflibraryregistry.ecore b/jsf/plugins/org.eclipse.jst.jsf.core/model/jsflibraryregistry.ecore
index dfbc002fa..d5af6e0c9 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/model/jsflibraryregistry.ecore
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/model/jsflibraryregistry.ecore
@@ -84,5 +84,12 @@
* The following features are supported:
+ *
*
- *
* The following features are supported: + *
** The following features are supported: + *
*null.
* @generated
*/
public static JSFVersion get(String literal) {
@@ -156,6 +311,8 @@ public static JSFVersion get(String literal) {
* @param name
* @return JSFVersion
*
+ * @param name the name.
+ * @return the matching enumerator or null.
* @generated
*/
public static JSFVersion getByName(String name) {
@@ -174,6 +331,8 @@ public static JSFVersion getByName(String name) {
* @param value
* @return the JSFVersion for the integer 'value'
*
+ * @param value the integer value.
+ * @return the matching enumerator or null.
* @generated
*/
public static JSFVersion get(int value) {
@@ -181,6 +340,13 @@ public static JSFVersion get(int value) {
case UNKNOWN: return UNKNOWN_LITERAL;
case V1_1: return V1_1_LITERAL;
case V1_2: return V1_2_LITERAL;
+ case V2_0: return V2_0_LITERAL;
+ case V2_1: return V2_1_LITERAL;
+ case V2_2: return V2_2_LITERAL;
+ case V2_3: return V2_3_LITERAL;
+ case V3_0: return V3_0_LITERAL;
+ case V4_0: return V4_0_LITERAL;
+ case V4_1: return V4_1_LITERAL;
}
return null;
}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/PluginProvidedJSFLibrary.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/PluginProvidedJSFLibrary.java
index c028d6755..0d3028855 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/PluginProvidedJSFLibrary.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/PluginProvidedJSFLibrary.java
@@ -20,16 +20,15 @@
*
* * The following features are supported: + *
** The following features are implemented: + *
** The following features are implemented: + *
** The following features are implemented: + *
*
+ * Value is of type String.
+ *
+ * Value is of type Boolean.
+ *
+ * Value is of type Boolean.
+ *
null
+ */
+ public static IProject[] getReferenced(IProject project) {
+ if (project == null)
+ return null;
+ IProject[] projects = null;
+ try {
+ projects = FacetModuleCoreSupportDelegate.getReferenced(project);
+ }
+ catch (NoClassDefFoundError e) {
+ if (_dump_NCDFE)
+ e.printStackTrace();
+ return null;
+ }
+ return projects;
+ }
+
+ /**
+ * Gets the root container for the path in the project
+ * @param project
+ * @param path
+ */
+ public static IPath getRootContainerForPath(IProject project, IPath path) {
+ if (project == null)
+ return null;
+ IPath root = null;
+ try {
+ root = FacetModuleCoreSupportDelegate.getRootContainerForPath(project, path);
+ }
+ catch (NoClassDefFoundError e) {
+ if (_dump_NCDFE)
+ e.printStackTrace();
+ return null;
+ }
+ return root;
+ }
+
+ /**
+ * Gets the default root container for the project
+ * @param project
+ */
+ public static IPath getDefaultRootContainer(IProject project) {
+ if (project == null)
+ return null;
+ IPath root = null;
+ try {
+ root = FacetModuleCoreSupportDelegate.getDefaultRoot(project);
+ }
+ catch (NoClassDefFoundError e) {
+ if (_dump_NCDFE)
+ e.printStackTrace();
+ return null;
+ }
+ return root;
+ }
+}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/util/FacetModuleCoreSupportDelegate.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/util/FacetModuleCoreSupportDelegate.java
new file mode 100644
index 000000000..7d3e71385
--- /dev/null
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/util/FacetModuleCoreSupportDelegate.java
@@ -0,0 +1,439 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jst.jsf.core.internal.util;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
+import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.ModuleCoreNature;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
+import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
+import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
+import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+
+/**
+ * Wrapper class for all Facet-related calls. If the Facet or ModuleCore
+ * bundles are not available, this class will not load, or if it does, its
+ * methods will cause NoClassDefFoundErrors. This allows us to
+ * compartmentalize the dependencies.
+ *
+ */
+public class FacetModuleCoreSupportDelegate {
+ private static final String SLASH = "/"; //$NON-NLS-1$
+
+ /**
+ * Copied to avoid unneeded extra dependency (plus it's unclear why the
+ * valuse are in that plug-in).
+ *
+ * @see org.eclipse.wst.common.componentcore.internal.util.IModuleConstants.JST_WEB_MODULE
+ */
+ private final static String JST_WEB_MODULE = "jst.web"; //$NON-NLS-1$
+ /**
+ * @see org.eclipse.wst.common.componentcore.internal.util.IModuleConstants.JST_WEBFRAGMENT_MODULE
+ */
+ private final static String JST_WEBFRAGMENT_MODULE = "jst.webfragment"; //$NON-NLS-1$
+
+ /**
+ * @param project
+ * @return the version of the JST Web facet, a default version otherwise
+ * @throws CoreException
+ */
+ static float getDynamicWebProjectVersion(IProject project) {
+ if (project == null)
+ return -1;
+
+ float version = -1;
+ try {
+ IFacetedProject faceted = ProjectFacetsManager.create(project);
+ if (faceted != null && ProjectFacetsManager.isProjectFacetDefined(JST_WEB_MODULE)) {
+ IProjectFacet webModuleFacet = ProjectFacetsManager.getProjectFacet(JST_WEB_MODULE);
+ if (faceted.hasProjectFacet(webModuleFacet)) {
+ version = Float.parseFloat(faceted.getInstalledVersion(webModuleFacet).getVersionString());
+ }
+ }
+ }
+ catch (NumberFormatException e) {
+ JSFCorePlugin.log(IStatus.ERROR, e.getMessage(), e);
+ }
+ catch (CoreException e) {
+ JSFCorePlugin.log(IStatus.ERROR, e.getMessage(), e);
+ }
+ return version;
+ }
+
+ /**
+ * @param project
+ * @return the version of the JST Web Fragment facet, a default version otherwise
+ * @throws CoreException
+ */
+ static float getDynamicWebFragmentVersion(IProject project) {
+ if (project == null)
+ return -1;
+
+ float version = -1;
+ try {
+ IFacetedProject faceted = ProjectFacetsManager.create(project);
+ if (faceted != null && ProjectFacetsManager.isProjectFacetDefined(JST_WEBFRAGMENT_MODULE)) {
+ IProjectFacet webFragmentFacet = ProjectFacetsManager.getProjectFacet(JST_WEBFRAGMENT_MODULE);
+ if (faceted.hasProjectFacet(webFragmentFacet)) {
+ version = Float.parseFloat(faceted.getInstalledVersion(webFragmentFacet).getVersionString());
+ }
+ }
+ }
+ catch (NumberFormatException e) {
+ JSFCorePlugin.log(IStatus.ERROR, e.getMessage(), e);
+ }
+ catch (CoreException e) {
+ JSFCorePlugin.log(IStatus.ERROR, e.getMessage(), e);
+ }
+ return version;
+ }
+
+ /**
+ * @param path -
+ * the full path to a resource within the workspace
+ * @return - the runtime path of the resource if one exists, null
+ * otherwise
+ */
+ static IPath getRuntimePath(IPath path) {
+ if (path == null)
+ return null;
+
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(path.segment(0));
+
+ if (!ModuleCoreNature.isFlexibleProject(project))
+ return null;
+
+ IVirtualResource[] virtualResources = ComponentCore.createResources(ResourcesPlugin.getWorkspace().getRoot().getFile(path));
+ if (virtualResources != null && virtualResources.length > 0) {
+ return virtualResources[0].getRuntimePath();
+ }
+ return null;
+ }
+
+ /**
+ * @param project
+ * @return the IPath to the "root" of the web contents
+ */
+ static IPath getWebContentRootPath(IProject project) {
+ if (project == null)
+ return null;
+
+ if (!ModuleCoreNature.isFlexibleProject(project))
+ return null;
+
+ IPath path = null;
+ IVirtualComponent component = ComponentCore.createComponent(project);
+ if (component != null && component.exists() && component.getRootFolder() != null) {
+ path = component.getRootFolder().getWorkspaceRelativePath();
+ if (component.getRootFolder().getFolder(FacetModuleCoreSupport.META_INF_RESOURCES_PATH).getUnderlyingFolder().isAccessible()) {
+ path = path.append(FacetModuleCoreSupport.META_INF_RESOURCES_PATH);
+ }
+ }
+ return path;
+ }
+
+ /**
+ * @param project
+ * @return
+ * @throws CoreException
+ */
+ static boolean isDynamicWebProject(IProject project) {
+ if (project == null)
+ return false;
+
+ try {
+ if (ProjectFacetsManager.isProjectFacetDefined(JST_WEB_MODULE)) {
+ IFacetedProject faceted = ProjectFacetsManager.create(project);
+ IProjectFacet webModuleFacet = ProjectFacetsManager.getProjectFacet(JST_WEB_MODULE);
+ if (faceted != null && faceted.hasProjectFacet(webModuleFacet)) {
+ return true;
+ }
+ }
+ }
+ catch (CoreException e) {
+ JSFCorePlugin.log(IStatus.ERROR, e.getMessage(), e);
+ }
+ return false;
+ }
+
+ /**
+ * @param project
+ * @return
+ * @throws CoreException
+ */
+ static boolean isWebFragmentProject(IProject project) {
+ if (project == null)
+ return false;
+
+ try {
+ if (ProjectFacetsManager.isProjectFacetDefined(JST_WEBFRAGMENT_MODULE)) {
+ IFacetedProject faceted = ProjectFacetsManager.create(project);
+ IProjectFacet webModuleFacet = ProjectFacetsManager.getProjectFacet(JST_WEBFRAGMENT_MODULE);
+ if (faceted != null && faceted.hasProjectFacet(webModuleFacet)) {
+ return true;
+ }
+ }
+ }
+ catch (CoreException e) {
+ JSFCorePlugin.log(IStatus.ERROR, e.getMessage(), e);
+ }
+ return false;
+ }
+
+ /*
+ * Handle resolution in a required web fragment
+ */
+ private static IPath resolveInReferenced(IProject project, IPath runtimeReference) {
+ IVirtualReference[] references = ComponentCore.createComponent(project).getReferences();
+ if (references != null) {
+ for (int i = 0; i < references.length; i++) {
+ IVirtualComponent referencedComponent = references[i].getReferencedComponent();
+ if (referencedComponent == null)
+ continue;
+ IVirtualComponent component = referencedComponent.getComponent();
+ if (component == null)
+ continue;
+ IVirtualFolder rootFolder = component.getRootFolder();
+ if (rootFolder == null)
+ continue;
+ IPath referencedPathRoot = rootFolder.getWorkspaceRelativePath();
+ /* http://bugs.eclipse.org/410161 */
+ if (referencedPathRoot != null) {
+ /*
+ * See Servlet 3.0, section 4.6, web fragments as required
+ * projects
+ */
+ /* https://bugs.eclipse.org/398698 */
+ IPath resolved = referencedPathRoot.append(FacetModuleCoreSupport.META_INF_RESOURCES).append(runtimeReference);
+ if (resolved != null && component.getProject().findMember(resolved.removeFirstSegments(1)) != null) {
+ return resolved;
+ }
+ /*
+ * Handle multi-root fragments, and ones where the default root marked for deployment doesn't exist
+ */
+ IVirtualFile virtualFile = ComponentCore.createFile(component.getProject(), FacetModuleCoreSupport.META_INF_RESOURCES_PATH.append(runtimeReference));
+ if (virtualFile != null) {
+ IFile[] underlyingFiles = virtualFile.getUnderlyingFiles();
+ for (int j = 0; j < underlyingFiles.length; j++) {
+ if (underlyingFiles[i].isAccessible()) {
+ return underlyingFiles[i].getFullPath();
+ }
+ }
+ }
+ IVirtualFolder virtualFolder = ComponentCore.createFolder(component.getProject(), FacetModuleCoreSupport.META_INF_RESOURCES_PATH.append(runtimeReference));
+ if (virtualFolder != null) {
+ IContainer[] underlyingFolders = virtualFolder.getUnderlyingFolders();
+ for (int j = 0; j < underlyingFolders.length; j++) {
+ if (underlyingFolders[i].isAccessible()) {
+ return underlyingFolders[i].getFullPath();
+ }
+ }
+ }
+ }
+ // overlay?
+ IVirtualResource member = rootFolder.findMember(runtimeReference);
+ if (member != null) {
+ return member.getWorkspaceRelativePath();
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * @param basePath -
+ * the full path to a resource within the workspace
+ * @param reference -
+ * the reference string to resolve
+ * @return - the full path within the workspace that corresponds to the
+ * given reference according to the virtual pathing support
+ */
+ static IPath resolve(IPath basePath, String reference) {
+ if (reference == null || basePath == null || basePath.segmentCount() == 0)
+ return null;
+
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(basePath.segment(0));
+
+ if (!ModuleCoreNature.isFlexibleProject(project))
+ return null;
+
+ if (basePath.segmentCount() > 1) {
+ IResource baseResource = ResourcesPlugin.getWorkspace().getRoot().findMember(basePath);
+ if (baseResource != null) {
+ IVirtualResource[] virtualResources = ComponentCore.createResources(baseResource);
+ for (int i = 0; i < virtualResources.length; i++) {
+ IPath referenceRuntimePath = null;
+ if (reference.startsWith(SLASH)) {
+ referenceRuntimePath = new Path(reference);
+ }
+ else {
+ IPath baseRuntimePath = virtualResources[i].getRuntimePath();
+ referenceRuntimePath = baseRuntimePath.removeLastSegments(1).append(reference);
+ }
+
+ IVirtualFile virtualFile = ComponentCore.createFile(project, referenceRuntimePath);
+ if (virtualFile != null && virtualFile.exists()) {
+ IFile[] underlyingFiles = virtualFile.getUnderlyingFiles();
+ for (int j = 0; j < underlyingFiles.length; j++) {
+ if (underlyingFiles[j].isAccessible()) {
+ return underlyingFiles[j].getFullPath();
+ }
+ }
+ if (underlyingFiles.length > 0) {
+ return underlyingFiles[0].getFullPath();
+ }
+ }
+ else {
+ // http://bugs.eclipse.org/338751
+ IVirtualFolder virtualFolder = ComponentCore.createFolder(project, referenceRuntimePath);
+ if (virtualFolder != null && virtualFolder.exists()) {
+ IContainer[] underlyingFolders = virtualFolder.getUnderlyingFolders();
+ for (int j = 0; j < underlyingFolders.length; j++) {
+ if (underlyingFolders[j].isAccessible()) {
+ return underlyingFolders[j].getFullPath();
+ }
+ }
+ if (underlyingFolders.length > 0) {
+ return underlyingFolders[0].getFullPath();
+ }
+ }
+ else {
+ // check assembled projects
+ return resolveInReferenced(project, referenceRuntimePath);
+ }
+ }
+ }
+ }
+ }
+ else {
+ IVirtualFile virtualFile = ComponentCore.createFile(project, new Path(reference));
+ if (virtualFile != null && virtualFile.exists()) {
+ return virtualFile.getUnderlyingFile().getFullPath();
+ }
+ }
+ return null;
+ }
+
+ static IPath[] getAcceptableRootPaths(IProject project) {
+ if (!ModuleCoreNature.isFlexibleProject(project)) {
+ return new IPath[]{project.getFullPath()};
+ }
+
+ Listtrue, if the given {@link ValueType} represents
- * an instance of javax.faces.model.DataModel
+ * an instance of javax.faces.model.DataModel or
+ * jakarta.faces.model.DataModel
*/
private boolean isFacesDataModel(ValueType type)
{
- return type.isInstanceOf(TypeConstants.TYPE_DATA_MODEL);
+ return type.isInstanceOf(TypeConstants.TYPE_DATA_MODEL) || type.isInstanceOf(TypeConstants.TYPE_DATA_MODEL_JAKARTA);
}
/**
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/DateTimePatternType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/DateTimePatternType.java
index 754cdce38..86f2170dc 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/DateTimePatternType.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/DateTimePatternType.java
@@ -13,11 +13,18 @@
********************************************************************************/
package org.eclipse.jst.jsf.taglibprocessing.attributevalues;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
import org.eclipse.jst.jsf.context.resolver.structureddocument.IDOMContextResolver;
import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory;
+import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
import org.eclipse.jst.jsf.metadataprocessors.AbstractRootTypeDescriptor;
import org.eclipse.jst.jsf.metadataprocessors.features.IPossibleValues;
import org.eclipse.jst.jsf.metadataprocessors.features.PossibleValue;
@@ -33,37 +40,77 @@
public class DateTimePatternType extends AbstractRootTypeDescriptor implements IPossibleValues{
//should we ever validate the patterns, extend EnumerationType
- final private static String[] DATEPATTERNS = {"M/d/yy", "EEE, M/d/yy", "MM/dd/yyyy", "EEE, MM/dd/yyyy", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ final private static String[] DATEPATTERNS = {"dd.MM.yyyy", "M/d/yy", "EEE, M/d/yy", "MM/dd/yyyy", "EEE, MM/dd/yyyy", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
"MMM d, yyyy", "EEE, MMM d, yyyy", "MMMM d, yyyy", "EEEE, MMMM d, yyyy", "MMMM yyyy" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ };
};
final private static String[] TIMEPATTERNS = {"hh:mm", "hh:mm z", "HH:mm z", "HH:mm:ss z" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
};
- final private static String[] DATETIMEPATTERNS = {"M/d/yy hh:mm", "EEE, M/d/yy hh:mm", "MM/dd/yyyy HH:mm:ss z", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ final private static String[] DATETIMEPATTERNS = {"dd.MM.yyyy HH:mm", "M/d/yy hh:mm", "EEE, M/d/yy hh:mm", "MM/dd/yyyy HH:mm:ss z", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
"EEE, MM/dd/yyyy HH:mm:ss z", "MMM d, yyyy HH:mm z", "EEE, MMM d, yyyy HH:mm z", "MMMM d, yyyy HH:mm z", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
"EEEE, MMMM d, yyyy HH:mm z" //$NON-NLS-1$
};
public List getPossibleValues() {
- List ret = new ArrayList();
+ Listnull.
* @generated
*/
public static FaceletTaglibVersion get(String literal)
@@ -185,6 +250,8 @@ public static FaceletTaglibVersion get(String literal)
* @param name
* @return the version
*
+ * @param name the name.
+ * @return the matching enumerator or null.
* @generated
*/
public static FaceletTaglibVersion getByName(String name)
@@ -204,6 +271,8 @@ public static FaceletTaglibVersion getByName(String name)
* @param value
* @return the version
*
+ * @param value the integer value.
+ * @return the matching enumerator or null.
* @generated
*/
public static FaceletTaglibVersion get(int value)
@@ -213,6 +282,9 @@ public static FaceletTaglibVersion get(int value)
case _21_VALUE: return _21;
case _22_VALUE: return _22;
case _23_VALUE: return _23;
+ case _30_VALUE: return _30;
+ case _40_VALUE: return _40;
+ case _41_VALUE: return _41;
}
return null;
}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibFactoryImpl.java
index 4943937ba..f599d9f5a 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibFactoryImpl.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibFactoryImpl.java
@@ -26,6 +26,7 @@
import org.eclipse.emf.ecore.plugin.EcorePlugin;
import org.eclipse.emf.ecore.xml.type.XMLTypeFactory;
import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
+import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.*;
import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Description;
import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DisplayName;
import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot;
@@ -64,578 +65,572 @@
public class FaceletTaglibFactoryImpl extends EFactoryImpl implements FaceletTaglibFactory
{
/**
- * Creates the default factory implementation.
- *
+ * Creates the default factory implementation.
+ *
* @return
*
- * @generated
- */
+ * @generated
+ */
public static FaceletTaglibFactory init()
{
- try
- {
- FaceletTaglibFactory theFaceletTaglibFactory = (FaceletTaglibFactory)EPackage.Registry.INSTANCE.getEFactory("http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0"); //$NON-NLS-1$
- if (theFaceletTaglibFactory != null)
- {
- return theFaceletTaglibFactory;
- }
- }
- catch (Exception exception)
- {
- EcorePlugin.INSTANCE.log(exception);
- }
- return new FaceletTaglibFactoryImpl();
- }
-
- /**
- * Creates an instance of the factory.
- *
- *
- * @generated
- */
+ try {
+ FaceletTaglibFactory theFaceletTaglibFactory = (FaceletTaglibFactory)EPackage.Registry.INSTANCE.getEFactory(FaceletTaglibPackage.eNS_URI);
+ if (theFaceletTaglibFactory != null) {
+ return theFaceletTaglibFactory;
+ }
+ }
+ catch (Exception exception) {
+ EcorePlugin.INSTANCE.log(exception);
+ }
+ return new FaceletTaglibFactoryImpl();
+ }
+
+ /**
+ * Creates an instance of the factory.
+ *
+ *
+ * @generated
+ */
public FaceletTaglibFactoryImpl()
{
- super();
- }
+ super();
+ }
/**
- *
+ *
*
- * @generated
- */
+ * @generated
+ */
@Override
public EObject create(EClass eClass)
{
- switch (eClass.getClassifierID())
- {
- case FaceletTaglibPackage.DESCRIPTION: return createDescription();
- case FaceletTaglibPackage.DISPLAY_NAME: return createDisplayName();
- case FaceletTaglibPackage.DOCUMENT_ROOT: return createDocumentRoot();
- case FaceletTaglibPackage.FACELET_TAGLIB_CANONICAL_NAME: return createFaceletTaglibCanonicalName();
- case FaceletTaglibPackage.FACELET_TAGLIB_EXTENSION: return createFaceletTaglibExtension();
- case FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION: return createFaceletTaglibFunction();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE: return createFaceletTaglibTagAttribute();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION: return createFaceletTaglibTagBehaviorExtension();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR: return createFaceletTaglibTagBehavior();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT_EXTENSION: return createFaceletTaglibTagComponentExtension();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT: return createFaceletTaglibTagComponent();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER_EXTENSION: return createFaceletTaglibTagConverterExtension();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER: return createFaceletTaglibTagConverter();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_EXTENSION: return createFaceletTaglibTagExtension();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG: return createFaceletTaglibTag();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION: return createFaceletTaglibTagValidatorExtension();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR: return createFaceletTaglibTagValidator();
- case FaceletTaglibPackage.FACELET_TAGLIB: return createFaceletTaglib();
- case FaceletTaglibPackage.FULLY_QUALIFIED_CLASS: return createFullyQualifiedClass();
- case FaceletTaglibPackage.GENERIC_BOOLEAN: return createGenericBoolean();
- case FaceletTaglibPackage.ICON: return createIcon();
- case FaceletTaglibPackage.JAVA_IDENTIFIER: return createJavaIdentifier();
- case FaceletTaglibPackage.PATH: return createPath();
- case FaceletTaglibPackage.IDENTIFIABLE_STRING_VALUE: return createIdentifiableStringValue();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- *
- *
- * @generated
- */
+ switch (eClass.getClassifierID()) {
+ case FaceletTaglibPackage.DESCRIPTION: return createDescription();
+ case FaceletTaglibPackage.DISPLAY_NAME: return createDisplayName();
+ case FaceletTaglibPackage.DOCUMENT_ROOT: return createDocumentRoot();
+ case FaceletTaglibPackage.FACELET_TAGLIB_CANONICAL_NAME: return createFaceletTaglibCanonicalName();
+ case FaceletTaglibPackage.FACELET_TAGLIB_EXTENSION: return createFaceletTaglibExtension();
+ case FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION: return createFaceletTaglibFunction();
+ case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE: return createFaceletTaglibTagAttribute();
+ case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION: return createFaceletTaglibTagBehaviorExtension();
+ case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR: return createFaceletTaglibTagBehavior();
+ case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT_EXTENSION: return createFaceletTaglibTagComponentExtension();
+ case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT: return createFaceletTaglibTagComponent();
+ case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER_EXTENSION: return createFaceletTaglibTagConverterExtension();
+ case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER: return createFaceletTaglibTagConverter();
+ case FaceletTaglibPackage.FACELET_TAGLIB_TAG_EXTENSION: return createFaceletTaglibTagExtension();
+ case FaceletTaglibPackage.FACELET_TAGLIB_TAG: return createFaceletTaglibTag();
+ case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION: return createFaceletTaglibTagValidatorExtension();
+ case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR: return createFaceletTaglibTagValidator();
+ case FaceletTaglibPackage.FACELET_TAGLIB: return createFaceletTaglib();
+ case FaceletTaglibPackage.FULLY_QUALIFIED_CLASS: return createFullyQualifiedClass();
+ case FaceletTaglibPackage.GENERIC_BOOLEAN: return createGenericBoolean();
+ case FaceletTaglibPackage.ICON: return createIcon();
+ case FaceletTaglibPackage.JAVA_IDENTIFIER: return createJavaIdentifier();
+ case FaceletTaglibPackage.PATH: return createPath();
+ case FaceletTaglibPackage.IDENTIFIABLE_STRING_VALUE: return createIdentifiableStringValue();
+ default:
+ throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
@Override
public Object createFromString(EDataType eDataType, String initialValue)
{
- switch (eDataType.getClassifierID())
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_VERSION:
- return createFaceletTaglibVersionFromString(eDataType, initialValue);
- case FaceletTaglibPackage.GENERIC_BOOLEAN_BASE:
- return createGenericBooleanBaseFromString(eDataType, initialValue);
- case FaceletTaglibPackage.FACELET_TAGLIB_VERSION_TYPE_OBJECT:
- return createFaceletTaglibVersionTypeObjectFromString(eDataType, initialValue);
- case FaceletTaglibPackage.FULLY_QUALIFIED_CLASS_BASE:
- return createFullyQualifiedClassBaseFromString(eDataType, initialValue);
- case FaceletTaglibPackage.JAVA_IDENTIFIER_BASE:
- return createJavaIdentifierBaseFromString(eDataType, initialValue);
- case FaceletTaglibPackage.PATH_TYPE_BASE:
- return createPathTypeBaseFromString(eDataType, initialValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- *
- *
- * @generated
- */
+ switch (eDataType.getClassifierID()) {
+ case FaceletTaglibPackage.FACELET_TAGLIB_VERSION:
+ return createFaceletTaglibVersionFromString(eDataType, initialValue);
+ case FaceletTaglibPackage.GENERIC_BOOLEAN_BASE:
+ return createGenericBooleanBaseFromString(eDataType, initialValue);
+ case FaceletTaglibPackage.FACELET_TAGLIB_VERSION_TYPE_OBJECT:
+ return createFaceletTaglibVersionTypeObjectFromString(eDataType, initialValue);
+ case FaceletTaglibPackage.FULLY_QUALIFIED_CLASS_BASE:
+ return createFullyQualifiedClassBaseFromString(eDataType, initialValue);
+ case FaceletTaglibPackage.JAVA_IDENTIFIER_BASE:
+ return createJavaIdentifierBaseFromString(eDataType, initialValue);
+ case FaceletTaglibPackage.PATH_TYPE_BASE:
+ return createPathTypeBaseFromString(eDataType, initialValue);
+ default:
+ throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
@Override
public String convertToString(EDataType eDataType, Object instanceValue)
{
- switch (eDataType.getClassifierID())
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_VERSION:
- return convertFaceletTaglibVersionToString(eDataType, instanceValue);
- case FaceletTaglibPackage.GENERIC_BOOLEAN_BASE:
- return convertGenericBooleanBaseToString(eDataType, instanceValue);
- case FaceletTaglibPackage.FACELET_TAGLIB_VERSION_TYPE_OBJECT:
- return convertFaceletTaglibVersionTypeObjectToString(eDataType, instanceValue);
- case FaceletTaglibPackage.FULLY_QUALIFIED_CLASS_BASE:
- return convertFullyQualifiedClassBaseToString(eDataType, instanceValue);
- case FaceletTaglibPackage.JAVA_IDENTIFIER_BASE:
- return convertJavaIdentifierBaseToString(eDataType, instanceValue);
- case FaceletTaglibPackage.PATH_TYPE_BASE:
- return convertPathTypeBaseToString(eDataType, instanceValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- *
- *
- * @generated
- */
+ switch (eDataType.getClassifierID()) {
+ case FaceletTaglibPackage.FACELET_TAGLIB_VERSION:
+ return convertFaceletTaglibVersionToString(eDataType, instanceValue);
+ case FaceletTaglibPackage.GENERIC_BOOLEAN_BASE:
+ return convertGenericBooleanBaseToString(eDataType, instanceValue);
+ case FaceletTaglibPackage.FACELET_TAGLIB_VERSION_TYPE_OBJECT:
+ return convertFaceletTaglibVersionTypeObjectToString(eDataType, instanceValue);
+ case FaceletTaglibPackage.FULLY_QUALIFIED_CLASS_BASE:
+ return convertFullyQualifiedClassBaseToString(eDataType, instanceValue);
+ case FaceletTaglibPackage.JAVA_IDENTIFIER_BASE:
+ return convertJavaIdentifierBaseToString(eDataType, instanceValue);
+ case FaceletTaglibPackage.PATH_TYPE_BASE:
+ return convertPathTypeBaseToString(eDataType, instanceValue);
+ default:
+ throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
public Description createDescription()
{
- DescriptionImpl description = new DescriptionImpl();
- return description;
- }
+ DescriptionImpl description = new DescriptionImpl();
+ return description;
+ }
/**
- *
+ *
*
- * @generated
- */
+ * @generated
+ */
public DisplayName createDisplayName()
{
- DisplayNameImpl displayName = new DisplayNameImpl();
- return displayName;
- }
+ DisplayNameImpl displayName = new DisplayNameImpl();
+ return displayName;
+ }
/**
- *
+ *
*
- * @generated
- */
+ * @generated
+ */
public DocumentRoot createDocumentRoot()
{
- DocumentRootImpl documentRoot = new DocumentRootImpl();
- return documentRoot;
- }
+ DocumentRootImpl documentRoot = new DocumentRootImpl();
+ return documentRoot;
+ }
/**
- *
+ *
*
- * @generated
- */
+ * @generated
+ */
public FaceletTaglibCanonicalName createFaceletTaglibCanonicalName()
{
- FaceletTaglibCanonicalNameImpl faceletTaglibCanonicalName = new FaceletTaglibCanonicalNameImpl();
- return faceletTaglibCanonicalName;
- }
+ FaceletTaglibCanonicalNameImpl faceletTaglibCanonicalName = new FaceletTaglibCanonicalNameImpl();
+ return faceletTaglibCanonicalName;
+ }
/**
- *
+ *
*
- * @generated
- */
+ * @generated
+ */
public FaceletTaglibExtension createFaceletTaglibExtension()
{
- FaceletTaglibExtensionImpl faceletTaglibExtension = new FaceletTaglibExtensionImpl();
- return faceletTaglibExtension;
- }
+ FaceletTaglibExtensionImpl faceletTaglibExtension = new FaceletTaglibExtensionImpl();
+ return faceletTaglibExtension;
+ }
/**
- *
+ *
*
- * @generated
- */
+ * @generated
+ */
public FaceletTaglibFunction createFaceletTaglibFunction()
{
- FaceletTaglibFunctionImpl faceletTaglibFunction = new FaceletTaglibFunctionImpl();
- return faceletTaglibFunction;
- }
+ FaceletTaglibFunctionImpl faceletTaglibFunction = new FaceletTaglibFunctionImpl();
+ return faceletTaglibFunction;
+ }
/**
- *
+ *
*
- * @generated
- */
+ * @generated
+ */
public FaceletTaglibTagAttribute createFaceletTaglibTagAttribute()
{
- FaceletTaglibTagAttributeImpl faceletTaglibTagAttribute = new FaceletTaglibTagAttributeImpl();
- return faceletTaglibTagAttribute;
- }
+ FaceletTaglibTagAttributeImpl faceletTaglibTagAttribute = new FaceletTaglibTagAttributeImpl();
+ return faceletTaglibTagAttribute;
+ }
/**
- *
+ *
*
- * @generated
- */
+ * @generated
+ */
public FaceletTaglibTagBehaviorExtension createFaceletTaglibTagBehaviorExtension()
{
- FaceletTaglibTagBehaviorExtensionImpl faceletTaglibTagBehaviorExtension = new FaceletTaglibTagBehaviorExtensionImpl();
- return faceletTaglibTagBehaviorExtension;
- }
+ FaceletTaglibTagBehaviorExtensionImpl faceletTaglibTagBehaviorExtension = new FaceletTaglibTagBehaviorExtensionImpl();
+ return faceletTaglibTagBehaviorExtension;
+ }
/**
- *
+ *
*
- * @generated
- */
+ * @generated
+ */
public FaceletTaglibTagBehavior createFaceletTaglibTagBehavior()
{
- FaceletTaglibTagBehaviorImpl faceletTaglibTagBehavior = new FaceletTaglibTagBehaviorImpl();
- return faceletTaglibTagBehavior;
- }
+ FaceletTaglibTagBehaviorImpl faceletTaglibTagBehavior = new FaceletTaglibTagBehaviorImpl();
+ return faceletTaglibTagBehavior;
+ }
/**
- *
+ *
*
- * @generated
- */
+ * @generated
+ */
public FaceletTaglibTagComponentExtension createFaceletTaglibTagComponentExtension()
{
- FaceletTaglibTagComponentExtensionImpl faceletTaglibTagComponentExtension = new FaceletTaglibTagComponentExtensionImpl();
- return faceletTaglibTagComponentExtension;
- }
+ FaceletTaglibTagComponentExtensionImpl faceletTaglibTagComponentExtension = new FaceletTaglibTagComponentExtensionImpl();
+ return faceletTaglibTagComponentExtension;
+ }
/**
- *
+ *
*
- * @generated
- */
+ * @generated
+ */
public FaceletTaglibTagComponent createFaceletTaglibTagComponent()
{
- FaceletTaglibTagComponentImpl faceletTaglibTagComponent = new FaceletTaglibTagComponentImpl();
- return faceletTaglibTagComponent;
- }
+ FaceletTaglibTagComponentImpl faceletTaglibTagComponent = new FaceletTaglibTagComponentImpl();
+ return faceletTaglibTagComponent;
+ }
/**
- *
+ *
*
- * @generated
- */
+ * @generated
+ */
public FaceletTaglibTagConverterExtension createFaceletTaglibTagConverterExtension()
{
- FaceletTaglibTagConverterExtensionImpl faceletTaglibTagConverterExtension = new FaceletTaglibTagConverterExtensionImpl();
- return faceletTaglibTagConverterExtension;
- }
+ FaceletTaglibTagConverterExtensionImpl faceletTaglibTagConverterExtension = new FaceletTaglibTagConverterExtensionImpl();
+ return faceletTaglibTagConverterExtension;
+ }
/**
- *
+ *
*
- * @generated
- */
+ * @generated
+ */
public FaceletTaglibTagConverter createFaceletTaglibTagConverter()
{
- FaceletTaglibTagConverterImpl faceletTaglibTagConverter = new FaceletTaglibTagConverterImpl();
- return faceletTaglibTagConverter;
- }
+ FaceletTaglibTagConverterImpl faceletTaglibTagConverter = new FaceletTaglibTagConverterImpl();
+ return faceletTaglibTagConverter;
+ }
/**
- *
+ *
*
- * @generated
- */
+ * @generated
+ */
public FaceletTaglibTagExtension createFaceletTaglibTagExtension()
{
- FaceletTaglibTagExtensionImpl faceletTaglibTagExtension = new FaceletTaglibTagExtensionImpl();
- return faceletTaglibTagExtension;
- }
+ FaceletTaglibTagExtensionImpl faceletTaglibTagExtension = new FaceletTaglibTagExtensionImpl();
+ return faceletTaglibTagExtension;
+ }
/**
- *
+ *
*
- * @generated
- */
+ * @generated
+ */
public FaceletTaglibTag createFaceletTaglibTag()
{
- FaceletTaglibTagImpl faceletTaglibTag = new FaceletTaglibTagImpl();
- return faceletTaglibTag;
- }
+ FaceletTaglibTagImpl faceletTaglibTag = new FaceletTaglibTagImpl();
+ return faceletTaglibTag;
+ }
/**
- *
+ *
*
- * @generated
- */
+ * @generated
+ */
public FaceletTaglibTagValidatorExtension createFaceletTaglibTagValidatorExtension()
{
- FaceletTaglibTagValidatorExtensionImpl faceletTaglibTagValidatorExtension = new FaceletTaglibTagValidatorExtensionImpl();
- return faceletTaglibTagValidatorExtension;
- }
+ FaceletTaglibTagValidatorExtensionImpl faceletTaglibTagValidatorExtension = new FaceletTaglibTagValidatorExtensionImpl();
+ return faceletTaglibTagValidatorExtension;
+ }
/**
- *
+ *
*
- * @generated
- */
+ * @generated
+ */
public FaceletTaglibTagValidator createFaceletTaglibTagValidator()
{
- FaceletTaglibTagValidatorImpl faceletTaglibTagValidator = new FaceletTaglibTagValidatorImpl();
- return faceletTaglibTagValidator;
- }
+ FaceletTaglibTagValidatorImpl faceletTaglibTagValidator = new FaceletTaglibTagValidatorImpl();
+ return faceletTaglibTagValidator;
+ }
/**
- *
+ *
*
- * @generated
- */
+ * @generated
+ */
public FaceletTaglib createFaceletTaglib()
{
- FaceletTaglibImpl faceletTaglib = new FaceletTaglibImpl();
- return faceletTaglib;
- }
+ FaceletTaglibImpl faceletTaglib = new FaceletTaglibImpl();
+ return faceletTaglib;
+ }
/**
- *
+ *
*
- * @generated
- */
+ * @generated
+ */
public FullyQualifiedClass createFullyQualifiedClass()
{
- FullyQualifiedClassImpl fullyQualifiedClass = new FullyQualifiedClassImpl();
- return fullyQualifiedClass;
- }
+ FullyQualifiedClassImpl fullyQualifiedClass = new FullyQualifiedClassImpl();
+ return fullyQualifiedClass;
+ }
/**
- *
+ *
*
- * @generated
- */
+ * @generated
+ */
public GenericBoolean createGenericBoolean()
{
- GenericBooleanImpl genericBoolean = new GenericBooleanImpl();
- return genericBoolean;
- }
+ GenericBooleanImpl genericBoolean = new GenericBooleanImpl();
+ return genericBoolean;
+ }
/**
- *
+ *
*
- * @generated
- */
+ * @generated
+ */
public Icon createIcon()
{
- IconImpl icon = new IconImpl();
- return icon;
- }
+ IconImpl icon = new IconImpl();
+ return icon;
+ }
/**
- *
+ *
*
- * @generated
- */
+ * @generated
+ */
public JavaIdentifier createJavaIdentifier()
{
- JavaIdentifierImpl javaIdentifier = new JavaIdentifierImpl();
- return javaIdentifier;
- }
+ JavaIdentifierImpl javaIdentifier = new JavaIdentifierImpl();
+ return javaIdentifier;
+ }
/**
- *
+ *
*
- * @generated
- */
+ * @generated
+ */
public Path createPath()
{
- PathImpl path = new PathImpl();
- return path;
- }
+ PathImpl path = new PathImpl();
+ return path;
+ }
/**
- *
+ *
*
- * @generated
- */
+ * @generated
+ */
public IdentifiableStringValue createIdentifiableStringValue()
{
- IdentifiableStringValueImpl identifiableStringValue = new IdentifiableStringValueImpl();
- return identifiableStringValue;
- }
+ IdentifiableStringValueImpl identifiableStringValue = new IdentifiableStringValueImpl();
+ return identifiableStringValue;
+ }
/**
- *
+ *
* @param eDataType
* @param initialValue
* @return the version
*
- * @generated
- */
+ * @generated
+ */
public FaceletTaglibVersion createFaceletTaglibVersionFromString(EDataType eDataType, String initialValue)
{
- FaceletTaglibVersion result = FaceletTaglibVersion.get(initialValue);
- if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return result;
- }
+ FaceletTaglibVersion result = FaceletTaglibVersion.get(initialValue);
+ if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ return result;
+ }
/**
- *
+ *
* @param eDataType
* @param instanceValue
* @return
*
- * @generated
- */
+ * @generated
+ */
public String convertFaceletTaglibVersionToString(EDataType eDataType, Object instanceValue)
{
- return instanceValue == null ? null : instanceValue.toString();
- }
+ return instanceValue == null ? null : instanceValue.toString();
+ }
/**
- *
+ *
* @param eDataType
* @param initialValue
* @return
*
- * @generated
- */
+ * @generated
+ */
public GenericBooleanBase createGenericBooleanBaseFromString(EDataType eDataType, String initialValue)
{
- GenericBooleanBase result = GenericBooleanBase.get(initialValue);
- if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return result;
- }
+ GenericBooleanBase result = GenericBooleanBase.get(initialValue);
+ if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ return result;
+ }
/**
- *
+ *
* @param eDataType
* @param instanceValue
* @return
*
- * @generated
- */
+ * @generated
+ */
public String convertGenericBooleanBaseToString(EDataType eDataType, Object instanceValue)
{
- return instanceValue == null ? null : instanceValue.toString();
- }
+ return instanceValue == null ? null : instanceValue.toString();
+ }
/**
- *
+ *
* @param eDataType
* @param initialValue
* @return
*
- * @generated
- */
+ * @generated
+ */
public FaceletTaglibVersion createFaceletTaglibVersionTypeObjectFromString(EDataType eDataType, String initialValue)
{
- return createFaceletTaglibVersionFromString(FaceletTaglibPackage.Literals.FACELET_TAGLIB_VERSION, initialValue);
- }
+ return createFaceletTaglibVersionFromString(FaceletTaglibPackage.Literals.FACELET_TAGLIB_VERSION, initialValue);
+ }
/**
- *
+ *
* @param eDataType
* @param instanceValue
* @return
*
- * @generated
- */
+ * @generated
+ */
public String convertFaceletTaglibVersionTypeObjectToString(EDataType eDataType, Object instanceValue)
{
- return convertFaceletTaglibVersionToString(FaceletTaglibPackage.Literals.FACELET_TAGLIB_VERSION, instanceValue);
- }
+ return convertFaceletTaglibVersionToString(FaceletTaglibPackage.Literals.FACELET_TAGLIB_VERSION, instanceValue);
+ }
/**
- *
+ *
* @param eDataType
* @param initialValue
* @return
*
- * @generated
- */
+ * @generated
+ */
public String createFullyQualifiedClassBaseFromString(EDataType eDataType, String initialValue)
{
- return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
- }
+ return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
+ }
/**
- *
+ *
* @param eDataType
* @param instanceValue
* @return
*
- * @generated
- */
+ * @generated
+ */
public String convertFullyQualifiedClassBaseToString(EDataType eDataType, Object instanceValue)
{
- return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.TOKEN, instanceValue);
- }
+ return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.TOKEN, instanceValue);
+ }
/**
- *
+ *
* @param eDataType
* @param initialValue
* @return
*
- * @generated
- */
+ * @generated
+ */
public String createJavaIdentifierBaseFromString(EDataType eDataType, String initialValue)
{
- return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
- }
+ return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
+ }
/**
- *
+ *
* @param eDataType
* @param instanceValue
* @return
*
- * @generated
- */
+ * @generated
+ */
public String convertJavaIdentifierBaseToString(EDataType eDataType, Object instanceValue)
{
- return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.TOKEN, instanceValue);
- }
+ return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.TOKEN, instanceValue);
+ }
/**
- *
+ *
* @param eDataType
* @param initialValue
* @return
*
- * @generated
- */
+ * @generated
+ */
public String createPathTypeBaseFromString(EDataType eDataType, String initialValue)
{
- return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
- }
+ return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
+ }
/**
- *
+ *
* @param eDataType
* @param instanceValue
* @return
*
- * @generated
- */
+ * @generated
+ */
public String convertPathTypeBaseToString(EDataType eDataType, Object instanceValue)
{
- return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.TOKEN, instanceValue);
- }
+ return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.TOKEN, instanceValue);
+ }
/**
- *
+ *
*
- * @generated
- */
+ * @generated
+ */
public FaceletTaglibPackage getFaceletTaglibPackage()
{
- return (FaceletTaglibPackage)getEPackage();
- }
+ return (FaceletTaglibPackage)getEPackage();
+ }
/**
- *
+ *
* @return
*
- * @deprecated
- * @generated
- */
+ * @deprecated
+ * @generated
+ */
@Deprecated
public static FaceletTaglibPackage getPackage()
{
- return FaceletTaglibPackage.eINSTANCE;
- }
+ return FaceletTaglibPackage.eINSTANCE;
+ }
} //FaceletTaglibFactoryImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibPackageImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibPackageImpl.java
index 2876f6e30..4340d8ef0 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibPackageImpl.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibPackageImpl.java
@@ -321,7 +321,7 @@ private FaceletTaglibPackageImpl()
/**
* Creates, registers, and initializes the Package for this model, and for any others upon which it depends.
- *
+ *
* This method is used to initialize {@link FaceletTaglibPackage#eINSTANCE} when that field is accessed.
* Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
*
@@ -337,7 +337,8 @@ public static FaceletTaglibPackage init()
if (isInited) return (FaceletTaglibPackage)EPackage.Registry.INSTANCE.getEPackage(FaceletTaglibPackage.eNS_URI);
// Obtain or create and register package
- FaceletTaglibPackageImpl theFaceletTaglibPackage = (FaceletTaglibPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FaceletTaglibPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FaceletTaglibPackageImpl());
+ Object registeredFaceletTaglibPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+ FaceletTaglibPackageImpl theFaceletTaglibPackage = registeredFaceletTaglibPackage instanceof FaceletTaglibPackageImpl ? (FaceletTaglibPackageImpl)registeredFaceletTaglibPackage : new FaceletTaglibPackageImpl();
isInited = true;
@@ -352,7 +353,7 @@ public static FaceletTaglibPackage init()
// Register package validator
EValidator.Registry.INSTANCE.put
- (theFaceletTaglibPackage,
+ (theFaceletTaglibPackage,
new EValidator.Descriptor() {
public EValidator getEValidator() {
return FaceletTaglibValidator.INSTANCE;
@@ -362,7 +363,6 @@ public EValidator getEValidator() {
// Mark meta-data to indicate it can't be changed
theFaceletTaglibPackage.freeze();
-
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(FaceletTaglibPackage.eNS_URI, theFaceletTaglibPackage);
return theFaceletTaglibPackage;
@@ -1831,6 +1831,10 @@ public void initializePackageContents()
addEEnumLiteral(faceletTaglibVersionEEnum, FaceletTaglibVersion._20);
addEEnumLiteral(faceletTaglibVersionEEnum, FaceletTaglibVersion._21);
addEEnumLiteral(faceletTaglibVersionEEnum, FaceletTaglibVersion._22);
+ addEEnumLiteral(faceletTaglibVersionEEnum, FaceletTaglibVersion._23);
+ addEEnumLiteral(faceletTaglibVersionEEnum, FaceletTaglibVersion._30);
+ addEEnumLiteral(faceletTaglibVersionEEnum, FaceletTaglibVersion._40);
+ addEEnumLiteral(faceletTaglibVersionEEnum, FaceletTaglibVersion._41);
initEEnum(genericBooleanBaseEEnum, GenericBooleanBase.class, "GenericBooleanBase"); //$NON-NLS-1$
addEEnumLiteral(genericBooleanBaseEEnum, GenericBooleanBase.TRUE);
@@ -1860,780 +1864,780 @@ public void initializePackageContents()
*/
protected void createExtendedMetaDataAnnotations()
{
- String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$
+ String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$
addAnnotation
- (descriptionEClass,
- source,
+ (descriptionEClass,
+ source,
new String[] {
- "name", "descriptionType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "descriptionType", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getDescription_Any(),
- source,
+ (getDescription_Any(),
+ source,
new String[] {
- "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
- "processing", "lax" //$NON-NLS-1$//$NON-NLS-2$
- });
+ "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
+ "processing", "lax" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getDescription_Id(),
- source,
+ (getDescription_Id(),
+ source,
new String[] {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getDescription_Lang(),
- source,
+ (getDescription_Lang(),
+ source,
new String[] {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "lang", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "http://www.w3.org/XML/1998/namespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "lang", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "http://www.w3.org/XML/1998/namespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (displayNameEClass,
- source,
+ (displayNameEClass,
+ source,
new String[] {
- "name", "display-nameType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "display-nameType", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (documentRootEClass,
- source,
+ (documentRootEClass,
+ source,
new String[] {
- "name", "", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "mixed" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "mixed" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getDocumentRoot_Mixed(),
- source,
+ (getDocumentRoot_Mixed(),
+ source,
new String[] {
- "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
- "name", ":mixed" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", ":mixed" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getDocumentRoot_XMLNSPrefixMap(),
- source,
+ (getDocumentRoot_XMLNSPrefixMap(),
+ source,
new String[] {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "xmlns:prefix" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "xmlns:prefix" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getDocumentRoot_XSISchemaLocation(),
- source,
+ (getDocumentRoot_XSISchemaLocation(),
+ source,
new String[] {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "xsi:schemaLocation" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "xsi:schemaLocation" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getDocumentRoot_FaceletTaglib(),
- source,
+ (getDocumentRoot_FaceletTaglib(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "facelet-taglib", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "facelet-taglib", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (faceletTaglibCanonicalNameEClass,
- source,
+ (faceletTaglibCanonicalNameEClass,
+ source,
new String[] {
- "name", "facelet-taglib-canonical-nameType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "facelet-taglib-canonical-nameType", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibCanonicalName_Value(),
- source,
+ (getFaceletTaglibCanonicalName_Value(),
+ source,
new String[] {
- "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibCanonicalName_Id(),
- source,
+ (getFaceletTaglibCanonicalName_Id(),
+ source,
new String[] {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (faceletTaglibExtensionEClass,
- source,
+ (faceletTaglibExtensionEClass,
+ source,
new String[] {
- "name", "facelet-taglib-extensionType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "facelet-taglib-extensionType", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibExtension_Any(),
- source,
+ (getFaceletTaglibExtension_Any(),
+ source,
new String[] {
- "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
- "wildcards", "##any", //$NON-NLS-1$ //$NON-NLS-2$
- "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
- "processing", "lax" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
+ "wildcards", "##any", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
+ "processing", "lax" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibExtension_Id(),
- source,
+ (getFaceletTaglibExtension_Id(),
+ source,
new String[] {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (faceletTaglibFunctionEClass,
- source,
+ (faceletTaglibFunctionEClass,
+ source,
new String[] {
- "name", "facelet-taglib-functionType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "facelet-taglib-functionType", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibFunction_FunctionName(),
- source,
+ (getFaceletTaglibFunction_FunctionName(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "function-name", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "function-name", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibFunction_FunctionClass(),
- source,
+ (getFaceletTaglibFunction_FunctionClass(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "function-class", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "function-class", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibFunction_FunctionSignature(),
- source,
+ (getFaceletTaglibFunction_FunctionSignature(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "function-signature", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "function-signature", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (faceletTaglibTagAttributeEClass,
- source,
+ (faceletTaglibTagAttributeEClass,
+ source,
new String[] {
- "name", "facelet-taglib-tag-attributeType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "facelet-taglib-tag-attributeType", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagAttribute_NameElement(),
- source,
+ (getFaceletTaglibTagAttribute_NameElement(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "name", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "name", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagAttribute_RequiredElement(),
- source,
+ (getFaceletTaglibTagAttribute_RequiredElement(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "required", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "required", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagAttribute_TypeElement(),
- source,
+ (getFaceletTaglibTagAttribute_TypeElement(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "type", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "type", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagAttribute_MethodSignatureElement(),
- source,
+ (getFaceletTaglibTagAttribute_MethodSignatureElement(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "method-signature", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "method-signature", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagAttribute_Id(),
- source,
+ (getFaceletTaglibTagAttribute_Id(),
+ source,
new String[] {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (faceletTaglibTagBehaviorExtensionEClass,
- source,
+ (faceletTaglibTagBehaviorExtensionEClass,
+ source,
new String[] {
- "name", "facelet-taglib-tag-behavior-extensionType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "facelet-taglib-tag-behavior-extensionType", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagBehaviorExtension_Any(),
- source,
+ (getFaceletTaglibTagBehaviorExtension_Any(),
+ source,
new String[] {
- "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
- "wildcards", "##any", //$NON-NLS-1$ //$NON-NLS-2$
- "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
- "processing", "lax" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
+ "wildcards", "##any", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
+ "processing", "lax" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagBehaviorExtension_Id(),
- source,
+ (getFaceletTaglibTagBehaviorExtension_Id(),
+ source,
new String[] {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (faceletTaglibTagBehaviorEClass,
- source,
+ (faceletTaglibTagBehaviorEClass,
+ source,
new String[] {
- "name", "facelet-taglib-tag-behaviorType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "facelet-taglib-tag-behaviorType", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagBehavior_BehaviorId(),
- source,
+ (getFaceletTaglibTagBehavior_BehaviorId(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "behavior-id", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "behavior-id", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagBehavior_HandlerClass(),
- source,
+ (getFaceletTaglibTagBehavior_HandlerClass(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "handler-class", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "handler-class", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagBehavior_BehaviorExtension(),
- source,
+ (getFaceletTaglibTagBehavior_BehaviorExtension(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "behavior-extension", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "behavior-extension", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (faceletTaglibTagComponentExtensionEClass,
- source,
+ (faceletTaglibTagComponentExtensionEClass,
+ source,
new String[] {
- "name", "facelet-taglib-tag-component-extensionType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "facelet-taglib-tag-component-extensionType", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagComponentExtension_Any(),
- source,
+ (getFaceletTaglibTagComponentExtension_Any(),
+ source,
new String[] {
- "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
- "wildcards", "##any", //$NON-NLS-1$ //$NON-NLS-2$
- "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
- "processing", "lax" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
+ "wildcards", "##any", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
+ "processing", "lax" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagComponentExtension_Id(),
- source,
+ (getFaceletTaglibTagComponentExtension_Id(),
+ source,
new String[] {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (faceletTaglibTagComponentEClass,
- source,
+ (faceletTaglibTagComponentEClass,
+ source,
new String[] {
- "name", "facelet-taglib-tag-componentType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "facelet-taglib-tag-componentType", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagComponent_ComponentType(),
- source,
+ (getFaceletTaglibTagComponent_ComponentType(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "component-type", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "component-type", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagComponent_RendererType(),
- source,
+ (getFaceletTaglibTagComponent_RendererType(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "renderer-type", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "renderer-type", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagComponent_HandlerClass(),
- source,
+ (getFaceletTaglibTagComponent_HandlerClass(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "handler-class", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "handler-class", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagComponent_ComponentExtension(),
- source,
+ (getFaceletTaglibTagComponent_ComponentExtension(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "component-extension", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "component-extension", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (faceletTaglibTagConverterExtensionEClass,
- source,
+ (faceletTaglibTagConverterExtensionEClass,
+ source,
new String[] {
- "name", "facelet-taglib-tag-converter-extensionType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "facelet-taglib-tag-converter-extensionType", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagConverterExtension_Any(),
- source,
+ (getFaceletTaglibTagConverterExtension_Any(),
+ source,
new String[] {
- "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
- "wildcards", "##any", //$NON-NLS-1$ //$NON-NLS-2$
- "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
- "processing", "lax" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
+ "wildcards", "##any", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
+ "processing", "lax" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagConverterExtension_Id(),
- source,
+ (getFaceletTaglibTagConverterExtension_Id(),
+ source,
new String[] {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (faceletTaglibTagConverterEClass,
- source,
+ (faceletTaglibTagConverterEClass,
+ source,
new String[] {
- "name", "facelet-taglib-tag-converterType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "facelet-taglib-tag-converterType", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagConverter_ConverterId(),
- source,
+ (getFaceletTaglibTagConverter_ConverterId(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "converter-id", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "converter-id", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagConverter_HandlerClass(),
- source,
+ (getFaceletTaglibTagConverter_HandlerClass(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "handler-class", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "handler-class", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagConverter_ConverterExtension(),
- source,
+ (getFaceletTaglibTagConverter_ConverterExtension(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "converter-extension", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "converter-extension", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (faceletTaglibTagExtensionEClass,
- source,
+ (faceletTaglibTagExtensionEClass,
+ source,
new String[] {
- "name", "facelet-taglib-tag-extensionType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "facelet-taglib-tag-extensionType", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagExtension_Any(),
- source,
+ (getFaceletTaglibTagExtension_Any(),
+ source,
new String[] {
- "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
- "wildcards", "##any", //$NON-NLS-1$ //$NON-NLS-2$
- "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
- "processing", "lax" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
+ "wildcards", "##any", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
+ "processing", "lax" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagExtension_Id(),
- source,
+ (getFaceletTaglibTagExtension_Id(),
+ source,
new String[] {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (faceletTaglibTagEClass,
- source,
+ (faceletTaglibTagEClass,
+ source,
new String[] {
- "name", "facelet-taglib-tagType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "facelet-taglib-tagType", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTag_TagNameElement(),
- source,
+ (getFaceletTaglibTag_TagNameElement(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "tag-name", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "tag-name", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTag_HandlerClassElement(),
- source,
+ (getFaceletTaglibTag_HandlerClassElement(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "handler-class", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "handler-class", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTag_Behavior(),
- source,
+ (getFaceletTaglibTag_Behavior(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "behavior", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "behavior", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTag_Component(),
- source,
+ (getFaceletTaglibTag_Component(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "component", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "component", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTag_Converter(),
- source,
+ (getFaceletTaglibTag_Converter(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "converter", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "converter", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTag_Validator(),
- source,
+ (getFaceletTaglibTag_Validator(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "validator", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "validator", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTag_Source(),
- source,
+ (getFaceletTaglibTag_Source(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "source", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "source", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTag_Attribute(),
- source,
+ (getFaceletTaglibTag_Attribute(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTag_TagExtension(),
- source,
+ (getFaceletTaglibTag_TagExtension(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "tag-extension", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "tag-extension", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (faceletTaglibTagValidatorExtensionEClass,
- source,
+ (faceletTaglibTagValidatorExtensionEClass,
+ source,
new String[] {
- "name", "facelet-taglib-tag-validator-extensionType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "facelet-taglib-tag-validator-extensionType", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagValidatorExtension_Any(),
- source,
+ (getFaceletTaglibTagValidatorExtension_Any(),
+ source,
new String[] {
- "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
- "wildcards", "##any", //$NON-NLS-1$ //$NON-NLS-2$
- "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
- "processing", "lax" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
+ "wildcards", "##any", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
+ "processing", "lax" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagValidatorExtension_Id(),
- source,
+ (getFaceletTaglibTagValidatorExtension_Id(),
+ source,
new String[] {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (faceletTaglibTagValidatorEClass,
- source,
+ (faceletTaglibTagValidatorEClass,
+ source,
new String[] {
- "name", "facelet-taglib-tag-validatorType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "facelet-taglib-tag-validatorType", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
});
addAnnotation
- (faceletTaglibTagValidatorEClass,
- 1,
+ (faceletTaglibTagValidatorEClass,
+ new boolean[] { true },
"http:///org/eclipse/emf/ecore/util/ExtendedMetaData", //$NON-NLS-1$
new String[] {
- "name", "facelet-taglib-tag-validatorType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "facelet-taglib-tag-validatorType", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagValidator_ValidatorId(),
- source,
+ (getFaceletTaglibTagValidator_ValidatorId(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "validator-id", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "validator-id", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagValidator_HandlerClass(),
- source,
+ (getFaceletTaglibTagValidator_HandlerClass(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "handler-class", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "handler-class", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglibTagValidator_ValidatorExtension(),
- source,
+ (getFaceletTaglibTagValidator_ValidatorExtension(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "validator-extension", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "validator-extension", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (faceletTaglibEClass,
- source,
+ (faceletTaglibEClass,
+ source,
new String[] {
- "name", "facelet-taglibType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "facelet-taglibType", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglib_LibraryClass(),
- source,
+ (getFaceletTaglib_LibraryClass(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "library-class", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "library-class", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglib_Namespace(),
- source,
+ (getFaceletTaglib_Namespace(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "namespace", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "namespace", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglib_CompositeLibraryName(),
- source,
+ (getFaceletTaglib_CompositeLibraryName(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "composite-library-name", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "composite-library-name", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglib_Group(),
- source,
+ (getFaceletTaglib_Group(),
+ source,
new String[] {
- "kind", "group", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "group:6" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "group", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "group:6" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglib_Tag(),
- source,
+ (getFaceletTaglib_Tag(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "tag", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
- "group", "#group:6" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "tag", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
+ "group", "#group:6" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglib_Function(),
- source,
+ (getFaceletTaglib_Function(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "function", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
- "group", "#group:6" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "function", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
+ "group", "#group:6" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglib_TaglibExtension(),
- source,
+ (getFaceletTaglib_TaglibExtension(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "taglib-extension", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "taglib-extension", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglib_Id(),
- source,
+ (getFaceletTaglib_Id(),
+ source,
new String[] {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglib_Version(),
- source,
+ (getFaceletTaglib_Version(),
+ source,
new String[] {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "version" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "version" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getFaceletTaglib_ShortName(),
- source,
+ (getFaceletTaglib_ShortName(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "short-name", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "short-name", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (faceletTaglibVersionEEnum,
- source,
+ (faceletTaglibVersionEEnum,
+ source,
new String[] {
- "name", "facelet-taglib-versionType" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "facelet-taglib-versionType" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (faceletTaglibVersionTypeObjectEDataType,
- source,
+ (faceletTaglibVersionTypeObjectEDataType,
+ source,
new String[] {
- "name", "facelet-taglib-versionType:Object", //$NON-NLS-1$ //$NON-NLS-2$
- "baseType", "facelet-taglib-versionType" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "facelet-taglib-versionType:Object", //$NON-NLS-1$ //$NON-NLS-2$
+ "baseType", "facelet-taglib-versionType" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (fullyQualifiedClassEClass,
- source,
+ (fullyQualifiedClassEClass,
+ source,
new String[] {
- "name", "fully-qualified-classType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "fully-qualified-classType", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (fullyQualifiedClassBaseEDataType,
- source,
+ (fullyQualifiedClassBaseEDataType,
+ source,
new String[] {
- "name", "fully-qualified-classType_._base", //$NON-NLS-1$ //$NON-NLS-2$
- "baseType", "http://www.eclipse.org/emf/2003/XMLType#token" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "fully-qualified-classType_._base", //$NON-NLS-1$ //$NON-NLS-2$
+ "baseType", "http://www.eclipse.org/emf/2003/XMLType#token" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (genericBooleanEClass,
- source,
+ (genericBooleanEClass,
+ source,
new String[] {
- "name", "generic-booleanType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "generic-booleanType", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (genericBooleanBaseEEnum,
- source,
+ (genericBooleanBaseEEnum,
+ source,
new String[] {
- "name", "generic-booleanType_._base" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "generic-booleanType_._base" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (iconEClass,
- source,
+ (iconEClass,
+ source,
new String[] {
- "name", "iconType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "iconType", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getIcon_SmallIcon(),
- source,
+ (getIcon_SmallIcon(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "small-icon", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "small-icon", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getIcon_LargeIcon(),
- source,
+ (getIcon_LargeIcon(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "large-icon", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "large-icon", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getIcon_Id(),
- source,
+ (getIcon_Id(),
+ source,
new String[] {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getIcon_Lang(),
- source,
+ (getIcon_Lang(),
+ source,
new String[] {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "lang", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "http://www.w3.org/XML/1998/namespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "lang", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "http://www.w3.org/XML/1998/namespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (javaIdentifierEClass,
- source,
+ (javaIdentifierEClass,
+ source,
new String[] {
- "name", "java-identifierType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "java-identifierType", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (javaIdentifierBaseEDataType,
- source,
+ (javaIdentifierBaseEDataType,
+ source,
new String[] {
- "name", "java-identifierType_._base", //$NON-NLS-1$ //$NON-NLS-2$
- "baseType", "http://www.eclipse.org/emf/2003/XMLType#token", //$NON-NLS-1$ //$NON-NLS-2$
- "pattern", "($|_|\\p{L})(\\p{L}|\\p{Nd}|_|$)*" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "java-identifierType_._base", //$NON-NLS-1$ //$NON-NLS-2$
+ "baseType", "http://www.eclipse.org/emf/2003/XMLType#token", //$NON-NLS-1$ //$NON-NLS-2$
+ "pattern", "($|_|\\p{L})(\\p{L}|\\p{Nd}|_|$)*" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (pathEClass,
- source,
+ (pathEClass,
+ source,
new String[] {
- "name", "pathType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "pathType", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (pathTypeBaseEDataType,
- source,
+ (pathTypeBaseEDataType,
+ source,
new String[] {
- "name", "pathType_._base", //$NON-NLS-1$ //$NON-NLS-2$
- "baseType", "http://www.eclipse.org/emf/2003/XMLType#token" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "pathType_._base", //$NON-NLS-1$ //$NON-NLS-2$
+ "baseType", "http://www.eclipse.org/emf/2003/XMLType#token" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (identifiableStringValueEClass,
- source,
+ (identifiableStringValueEClass,
+ source,
new String[] {
- "name", "string", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", "string", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getIdentifiableStringValue_Value(),
- source,
+ (getIdentifiableStringValue_Value(),
+ source,
new String[] {
- "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getIdentifiableStringValue_Id(),
- source,
+ (getIdentifiableStringValue_Id(),
+ source,
new String[] {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getIdentifiableLangStringValue_Lang(),
- source,
+ (getIdentifiableLangStringValue_Lang(),
+ source,
new String[] {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "lang", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "http://www.w3.org/XML/1998/namespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "lang", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "http://www.w3.org/XML/1998/namespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getUserVisibleTaglibObject_Description(),
- source,
+ (getUserVisibleTaglibObject_Description(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "description", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "description", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getUserVisibleTaglibObject_DisplayName(),
- source,
+ (getUserVisibleTaglibObject_DisplayName(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "display-name", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "display-name", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation
- (getUserVisibleTaglibObject_Icon(),
- source,
+ (getUserVisibleTaglibObject_Icon(),
+ source,
new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "icon", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
+ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
+ "name", "icon", //$NON-NLS-1$ //$NON-NLS-2$
+ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
});
}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibAdapterFactory.java
index 355f74da5..b9b81eeb6 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibAdapterFactory.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibAdapterFactory.java
@@ -22,6 +22,7 @@
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.*;
import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Description;
import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DisplayName;
import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot;
@@ -61,611 +62,580 @@
public class FaceletTaglibAdapterFactory extends AdapterFactoryImpl
{
/**
- * The cached model package.
- *
+ * The cached model package.
+ *
*
- * @generated
- */
+ * @generated
+ */
protected static FaceletTaglibPackage modelPackage;
/**
- * Creates an instance of the adapter factory.
- *
+ * Creates an instance of the adapter factory.
+ *
*
- * @generated
- */
+ * @generated
+ */
public FaceletTaglibAdapterFactory()
{
- if (modelPackage == null)
- {
- modelPackage = FaceletTaglibPackage.eINSTANCE;
- }
- }
+ if (modelPackage == null) {
+ modelPackage = FaceletTaglibPackage.eINSTANCE;
+ }
+ }
/**
- * Returns whether this factory is applicable for the type of the object.
- *
+ * Returns whether this factory is applicable for the type of the object.
+ *
* This implementation returns
+ * Clients can subclass and override just those methods which must be specific
+ * to their needs.
+ * true if the object is either the model's package or is an instance object of the model.
*
- * @return whether this factory is applicable for the type of the object.
- * @generated
- */
+ * @return whether this factory is applicable for the type of the object.
+ * @generated
+ */
@Override
public boolean isFactoryForType(Object object)
{
- if (object == modelPackage)
- {
- return true;
- }
- if (object instanceof EObject)
- {
- return ((EObject)object).eClass().getEPackage() == modelPackage;
- }
- return false;
- }
-
- /**
- * The switch that delegates to the createXXX methods.
- *
- *
- * @generated
- */
+ if (object == modelPackage) {
+ return true;
+ }
+ if (object instanceof EObject) {
+ return ((EObject)object).eClass().getEPackage() == modelPackage;
+ }
+ return false;
+ }
+
+ /**
+ * The switch that delegates to the createXXX methods.
+ *
+ *
+ * @generated
+ */
protected FaceletTaglibSwitchtarget.
- *
- *
- * @param target the object to adapt.
- * @return the adapter for the target.
- * @generated
- */
+ new FaceletTaglibSwitchtarget.
+ *
+ *
+ * @param target the object to adapt.
+ * @return the adapter for the target.
+ * @generated
+ */
@Override
public Adapter createAdapter(Notifier target)
{
- return modelSwitch.doSwitch((EObject)target);
- }
+ return modelSwitch.doSwitch((EObject)target);
+ }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Description Description}'.
- *
+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Description Description}'.
+ *
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
*
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Description
- * @generated
- */
+ * @return the new adapter.
+ * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Description
+ * @generated
+ */
public Adapter createDescriptionAdapter()
{
- return null;
- }
+ return null;
+ }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DisplayName Display Name}'.
- *
+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DisplayName Display Name}'.
+ *
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
*
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DisplayName
- * @generated
- */
+ * @return the new adapter.
+ * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DisplayName
+ * @generated
+ */
public Adapter createDisplayNameAdapter()
{
- return null;
- }
+ return null;
+ }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot Document Root}'.
- *
+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot Document Root}'.
+ *
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
*
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot
- * @generated
- */
+ * @return the new adapter.
+ * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot
+ * @generated
+ */
public Adapter createDocumentRootAdapter()
{
- return null;
- }
+ return null;
+ }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibCanonicalName Canonical Name}'.
- *
+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibCanonicalName Canonical Name}'.
+ *
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
*
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibCanonicalName
- * @generated
- */
+ * @return the new adapter.
+ * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibCanonicalName
+ * @generated
+ */
public Adapter createFaceletTaglibCanonicalNameAdapter()
{
- return null;
- }
+ return null;
+ }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibExtension Extension}'.
- *
+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibExtension Extension}'.
+ *
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
*
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibExtension
- * @generated
- */
+ * @return the new adapter.
+ * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibExtension
+ * @generated
+ */
public Adapter createFaceletTaglibExtensionAdapter()
{
- return null;
- }
+ return null;
+ }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction Function}'.
- *
+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction Function}'.
+ *
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
*
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction
- * @generated
- */
+ * @return the new adapter.
+ * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction
+ * @generated
+ */
public Adapter createFaceletTaglibFunctionAdapter()
{
- return null;
- }
+ return null;
+ }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute Tag Attribute}'.
- *
+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute Tag Attribute}'.
+ *
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
*
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute
- * @generated
- */
+ * @return the new adapter.
+ * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute
+ * @generated
+ */
public Adapter createFaceletTaglibTagAttributeAdapter()
{
- return null;
- }
+ return null;
+ }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehaviorExtension Tag Behavior Extension}'.
- *
+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehaviorExtension Tag Behavior Extension}'.
+ *
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
*
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehaviorExtension
- * @generated
- */
+ * @return the new adapter.
+ * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehaviorExtension
+ * @generated
+ */
public Adapter createFaceletTaglibTagBehaviorExtensionAdapter()
{
- return null;
- }
+ return null;
+ }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehavior Tag Behavior}'.
- *
+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehavior Tag Behavior}'.
+ *
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
*
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehavior
- * @generated
- */
+ * @return the new adapter.
+ * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehavior
+ * @generated
+ */
public Adapter createFaceletTaglibTagBehaviorAdapter()
{
- return null;
- }
+ return null;
+ }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponentExtension Tag Component Extension}'.
- *
+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponentExtension Tag Component Extension}'.
+ *
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
*
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponentExtension
- * @generated
- */
+ * @return the new adapter.
+ * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponentExtension
+ * @generated
+ */
public Adapter createFaceletTaglibTagComponentExtensionAdapter()
{
- return null;
- }
+ return null;
+ }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent Tag Component}'.
- *
+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent Tag Component}'.
+ *
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
*
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent
- * @generated
- */
+ * @return the new adapter.
+ * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent
+ * @generated
+ */
public Adapter createFaceletTaglibTagComponentAdapter()
{
- return null;
- }
+ return null;
+ }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverterExtension Tag Converter Extension}'.
- *
+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverterExtension Tag Converter Extension}'.
+ *
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
*
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverterExtension
- * @generated
- */
+ * @return the new adapter.
+ * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverterExtension
+ * @generated
+ */
public Adapter createFaceletTaglibTagConverterExtensionAdapter()
{
- return null;
- }
+ return null;
+ }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverter Tag Converter}'.
- *
+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverter Tag Converter}'.
+ *
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
*
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverter
- * @generated
- */
+ * @return the new adapter.
+ * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverter
+ * @generated
+ */
public Adapter createFaceletTaglibTagConverterAdapter()
{
- return null;
- }
+ return null;
+ }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagExtension Tag Extension}'.
- *
+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagExtension Tag Extension}'.
+ *
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
*
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagExtension
- * @generated
- */
+ * @return the new adapter.
+ * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagExtension
+ * @generated
+ */
public Adapter createFaceletTaglibTagExtensionAdapter()
{
- return null;
- }
+ return null;
+ }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag Tag}'.
- *
+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag Tag}'.
+ *
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
*
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag
- * @generated
- */
+ * @return the new adapter.
+ * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag
+ * @generated
+ */
public Adapter createFaceletTaglibTagAdapter()
{
- return null;
- }
+ return null;
+ }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidatorExtension Tag Validator Extension}'.
- *
+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidatorExtension Tag Validator Extension}'.
+ *
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
*
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidatorExtension
- * @generated
- */
+ * @return the new adapter.
+ * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidatorExtension
+ * @generated
+ */
public Adapter createFaceletTaglibTagValidatorExtensionAdapter()
{
- return null;
- }
+ return null;
+ }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidator Tag Validator}'.
- *
+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidator Tag Validator}'.
+ *
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
*
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidator
- * @generated
- */
+ * @return the new adapter.
+ * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidator
+ * @generated
+ */
public Adapter createFaceletTaglibTagValidatorAdapter()
{
- return null;
- }
+ return null;
+ }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib Facelet Taglib}'.
- *
+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib Facelet Taglib}'.
+ *
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
*
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib
- * @generated
- */
+ * @return the new adapter.
+ * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib
+ * @generated
+ */
public Adapter createFaceletTaglibAdapter()
{
- return null;
- }
+ return null;
+ }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FullyQualifiedClass Fully Qualified Class}'.
- *
+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FullyQualifiedClass Fully Qualified Class}'.
+ *
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
*
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FullyQualifiedClass
- * @generated
- */
+ * @return the new adapter.
+ * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FullyQualifiedClass
+ * @generated
+ */
public Adapter createFullyQualifiedClassAdapter()
{
- return null;
- }
+ return null;
+ }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.GenericBoolean Generic Boolean}'.
- *
+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.GenericBoolean Generic Boolean}'.
+ *
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
*
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.GenericBoolean
- * @generated
- */
+ * @return the new adapter.
+ * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.GenericBoolean
+ * @generated
+ */
public Adapter createGenericBooleanAdapter()
{
- return null;
- }
+ return null;
+ }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon Icon}'.
- *
+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon Icon}'.
+ *
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
*
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon
- * @generated
- */
+ * @return the new adapter.
+ * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon
+ * @generated
+ */
public Adapter createIconAdapter()
{
- return null;
- }
+ return null;
+ }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.JavaIdentifier Java Identifier}'.
- *
+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.JavaIdentifier Java Identifier}'.
+ *
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
*
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.JavaIdentifier
- * @generated
- */
+ * @return the new adapter.
+ * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.JavaIdentifier
+ * @generated
+ */
public Adapter createJavaIdentifierAdapter()
{
- return null;
- }
+ return null;
+ }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Path Path}'.
- *
+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Path Path}'.
+ *
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
*
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Path
- * @generated
- */
+ * @return the new adapter.
+ * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Path
+ * @generated
+ */
public Adapter createPathAdapter()
{
- return null;
- }
+ return null;
+ }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue Identifiable String Value}'.
- *
+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue Identifiable String Value}'.
+ *
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
*
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue
- * @generated
- */
+ * @return the new adapter.
+ * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue
+ * @generated
+ */
public Adapter createIdentifiableStringValueAdapter()
{
- return null;
- }
+ return null;
+ }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableLangStringValue Identifiable Lang String Value}'.
- *
+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableLangStringValue Identifiable Lang String Value}'.
+ *
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
*
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableLangStringValue
- * @generated
- */
+ * @return the new adapter.
+ * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableLangStringValue
+ * @generated
+ */
public Adapter createIdentifiableLangStringValueAdapter()
{
- return null;
- }
+ return null;
+ }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.UserVisibleTaglibObject User Visible Taglib Object}'.
- *
+ * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.UserVisibleTaglibObject User Visible Taglib Object}'.
+ *
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
*
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.UserVisibleTaglibObject
- * @generated
- */
+ * @return the new adapter.
+ * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.UserVisibleTaglibObject
+ * @generated
+ */
public Adapter createUserVisibleTaglibObjectAdapter()
{
- return null;
- }
+ return null;
+ }
/**
- * Creates a new adapter for the default case.
- *
+ * Creates a new adapter for the default case.
+ *
* This default implementation returns null.
*
- * @return the new adapter.
- * @generated
- */
+ * @return the new adapter.
+ * @generated
+ */
public Adapter createEObjectAdapter()
{
- return null;
- }
+ return null;
+ }
} //FaceletTaglibAdapterFactory
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibResourceFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibResourceFactoryImpl.java
index 71cfd827f..892fcfb08 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibResourceFactoryImpl.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibResourceFactoryImpl.java
@@ -33,36 +33,36 @@
public class FaceletTaglibResourceFactoryImpl extends ResourceFactoryImpl
{
/**
- * Creates an instance of the resource factory.
- *
+ * Creates an instance of the resource factory.
+ *
*
- * @generated
- */
+ * @generated
+ */
public FaceletTaglibResourceFactoryImpl()
{
- super();
- }
+ super();
+ }
/**
- * Creates an instance of the resource.
- *
+ * Creates an instance of the resource.
+ *
*
- * @generated
- */
+ * @generated
+ */
@Override
public Resource createResource(URI uri)
{
- XMLResource result = new FaceletTaglibResourceImpl(uri);
- result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
- result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
+ XMLResource result = new FaceletTaglibResourceImpl(uri);
+ result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
+ result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
- result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
+ result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
- result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
- result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
+ result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
+ result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
- result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
- return result;
- }
+ result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
+ return result;
+ }
} //FaceletTaglibResourceFactoryImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibResourceImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibResourceImpl.java
index e502176cb..71103901d 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibResourceImpl.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibResourceImpl.java
@@ -36,16 +36,16 @@
public class FaceletTaglibResourceImpl extends XMLResourceImpl
{
/**
- * Creates an instance of the resource.
- *
+ * Creates an instance of the resource.
+ *
*
- * @param uri the URI of the new resource.
- * @generated
- */
+ * @param uri the URI of the new resource.
+ * @generated
+ */
public FaceletTaglibResourceImpl(URI uri)
{
- super(uri);
- }
+ super(uri);
+ }
@Override
protected XMLLoad createXMLLoad()
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibSwitch.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibSwitch.java
index b327b67ba..2ca537fc5 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibSwitch.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibSwitch.java
@@ -21,6 +21,7 @@
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.*;
import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Description;
import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DisplayName;
import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot;
@@ -90,7 +91,7 @@ public FaceletTaglibSwitch()
* Checks whether this is a switch for the given package.
*
*
- * @parameter ePackage the package in question.
+ * @param ePackage the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibValidator.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibValidator.java
index 44a5300f3..2ecec8e6e 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibValidator.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibValidator.java
@@ -26,6 +26,7 @@
import org.eclipse.emf.ecore.util.EObjectValidator;
import org.eclipse.emf.ecore.xml.type.util.XMLTypeUtil;
import org.eclipse.emf.ecore.xml.type.util.XMLTypeValidator;
+import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.*;
import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Description;
import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DisplayName;
import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibXMLProcessor.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibXMLProcessor.java
index 959f51378..6b22703cf 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibXMLProcessor.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibXMLProcessor.java
@@ -35,33 +35,32 @@ public class FaceletTaglibXMLProcessor extends XMLProcessor
{
/**
- * Public constructor to instantiate the helper.
- *
+ * Public constructor to instantiate the helper.
+ *
*
- * @generated
- */
+ * @generated
+ */
public FaceletTaglibXMLProcessor()
{
- super((EPackage.Registry.INSTANCE));
- FaceletTaglibPackage.eINSTANCE.eClass();
- }
+ super((EPackage.Registry.INSTANCE));
+ FaceletTaglibPackage.eINSTANCE.eClass();
+ }
/**
- * Register for "*" and "xml" file extensions the FaceletTaglibResourceFactoryImpl factory.
- *
+ * Register for "*" and "xml" file extensions the FaceletTaglibResourceFactoryImpl factory.
+ *
*
- * @generated
- */
+ * @generated
+ */
@Override
protected MapfactoryChildClass.
*/
public EObject createFactoryChildObject() {
- String superType = ModelUtil.getSuperType(factoryChildClass);
- IProject project = (IProject) this.getPage().getEditor().getAdapter(
- IProject.class);
+ IProject project = (IProject) this.getPage().getEditor().getAdapter(IProject.class);
+ String superType = ModelUtil.getSuperType(factoryChildClass, JSFVersion.valueOfProject(project));
String result = DialogUtil.openClassDialog(getSection().getShell(),
project, superType,
IJavaElementSearchConstants.CONSIDER_ALL_TYPES);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/LifecycleSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/LifecycleSection.java
index fb0ed4f50..833c2f61a 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/LifecycleSection.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/LifecycleSection.java
@@ -23,6 +23,7 @@
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
+import org.eclipse.jst.jsf.core.JSFVersion;
import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
import org.eclipse.jst.jsf.facesconfig.emf.LifecycleType;
import org.eclipse.jst.jsf.facesconfig.ui.dialog.DialogUtil;
@@ -83,9 +84,8 @@ public LifecycleSection(EClass lifecycleChildClass, Composite parent,
* @return the lifecycle child
*/
public EObject createLifecycleChildObject() {
- String superType = ModelUtil.getSuperType(lifecycleChildClass);
- IProject project = (IProject) this.getPage().getEditor().getAdapter(
- IProject.class);
+ IProject project = (IProject) this.getPage().getEditor().getAdapter(IProject.class);
+ String superType = ModelUtil.getSuperType(lifecycleChildClass, JSFVersion.valueOfProject(project));
String result = DialogUtil.openClassDialog(getSection().getShell(),
project, superType,
IJavaElementSearchConstants.CONSIDER_ALL_TYPES);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitGeneralSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitGeneralSection.java
index a9bc756d9..4d073449e 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitGeneralSection.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitGeneralSection.java
@@ -27,6 +27,7 @@
import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringDialogField;
+import org.eclipse.jst.jsf.core.JSFVersion;
import org.eclipse.jst.jsf.facesconfig.emf.DescriptionType;
import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType;
import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
@@ -200,8 +201,8 @@ public void dialogFieldApplied(DialogField field) {
renderkitClassField
.setLabelText(EditorMessages.RenderKitGeneralSection_Label_RenderKitClass);
renderkitClassField.doFillIntoGrid(toolkit, container, numberOfColumns);
- renderkitClassField.setProject((IProject) getPage().getEditor()
- .getAdapter(IProject.class));
+ IProject project = getPage().getEditor().getAdapter(IProject.class);
+ renderkitClassField.setProject(project);
LayoutUtil.setHorizontalGrabbing(renderkitClassField.getTextControl(
toolkit, container));
@@ -229,7 +230,10 @@ public void dialogFieldApplied(DialogField field) {
}
});
renderkitClassField
- .setSuperClassName(IFacesConfigConstants.RENDER_KIT_SUPER_CLASS);
+ .setSuperClassName(
+ JSFVersion.guessAtLeast(JSFVersion.V3_0, project) ?
+ IFacesConfigConstants.RENDER_KIT_SUPER_CLASS_JAKARTA :
+ IFacesConfigConstants.RENDER_KIT_SUPER_CLASS);
}
/**
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorGeneralSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorGeneralSection.java
index 209661203..bcf79b457 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorGeneralSection.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorGeneralSection.java
@@ -27,6 +27,7 @@
import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringDialogField;
+import org.eclipse.jst.jsf.core.JSFVersion;
import org.eclipse.jst.jsf.facesconfig.emf.DescriptionType;
import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType;
import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
@@ -200,8 +201,8 @@ public void dialogFieldApplied(DialogField field) {
// validatorClassField.setRequired(true);
validatorClassField
.setLabelText(EditorMessages.ValidatorGeneralSection_Label_ValidatorClass);
- validatorClassField.setProject((IProject) getPage().getEditor()
- .getAdapter(IProject.class));
+ IProject project = getPage().getEditor().getAdapter(IProject.class);
+ validatorClassField.setProject(project);
validatorClassField.doFillIntoGrid(toolkit, container, numberOfColumns);
LayoutUtil.setHorizontalGrabbing(validatorClassField.getTextControl(
toolkit, container));
@@ -230,7 +231,9 @@ public void dialogFieldApplied(DialogField field) {
}
});
validatorClassField
- .setInterface(IFacesConfigConstants.VALIDATOR_INTERFACE);
+ .setInterface(JSFVersion.guessAtLeast(JSFVersion.V3_0, project) ?
+ IFacesConfigConstants.VALIDATOR_INTERFACE_JAKARTA :
+ IFacesConfigConstants.VALIDATOR_INTERFACE);
}
/**
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ModelUtil.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ModelUtil.java
index 1a8cd858d..03ab78427 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ModelUtil.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ModelUtil.java
@@ -13,6 +13,7 @@
*******************************************************************************/
package org.eclipse.jst.jsf.facesconfig.ui.util;
+import org.eclipse.jst.jsf.core.JSFVersion;
import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
@@ -42,42 +43,57 @@ public class ModelUtil {
* the EClass object of the application child.
* @return the expected super type for a particular element
* TODO: could make common with the faces-config validator
+ * @deprecated use getSuperType(Object, JSFVersion) instead of this
*/
public static String getSuperType(Object key) {
+ return getSuperType(key, JSFVersion.V2_3);
+ }
+
+ public static String getSuperType(Object key, JSFVersion jsfVersion) {
+ boolean isJakartaEE = jsfVersion != null && jsfVersion.compareTo(JSFVersion.V3_0) >= 0;
if (key == FacesConfigPackage.eINSTANCE.getActionListenerType()) {
- return IFacesConfigConstants.ACTION_LISTENER_INTERFACE;
+ return isJakartaEE ? IFacesConfigConstants.ACTION_LISTENER_INTERFACE_JAKARTA :
+ IFacesConfigConstants.ACTION_LISTENER_INTERFACE;
}
if (key == FacesConfigPackage.eINSTANCE.getNavigationHandlerType()) {
- return IFacesConfigConstants.NAVIGATION_HANDLE_SUPER_CLASS;
+ return isJakartaEE ? IFacesConfigConstants.NAVIGATION_HANDLE_SUPER_CLASS_JAKARTA :
+ IFacesConfigConstants.NAVIGATION_HANDLE_SUPER_CLASS;
}
if (key == FacesConfigPackage.eINSTANCE.getPropertyResolverType()) {
- return IFacesConfigConstants.PROPERTY_RESOLVER_SUPER_CLASS;
+ return isJakartaEE ? IFacesConfigConstants.PROPERTY_RESOLVER_SUPER_CLASS_JAKARTA :
+ IFacesConfigConstants.PROPERTY_RESOLVER_SUPER_CLASS;
}
if (key == FacesConfigPackage.eINSTANCE.getStateManagerType()) {
- return IFacesConfigConstants.STATE_MANAGER_SUPER_CLASS;
+ return isJakartaEE ? IFacesConfigConstants.STATE_MANAGER_SUPER_CLASS_JAKARTA :
+ IFacesConfigConstants.STATE_MANAGER_SUPER_CLASS;
}
if (key == FacesConfigPackage.eINSTANCE.getVariableResolverType()) {
- return IFacesConfigConstants.VARIABLE_RESOLVER_SUPER_CLASS;
+ return isJakartaEE ? IFacesConfigConstants.VARIABLE_RESOLVER_SUPER_CLASS_JAKARTA :
+ IFacesConfigConstants.VARIABLE_RESOLVER_SUPER_CLASS;
}
if (key == FacesConfigPackage.eINSTANCE.getViewHandlerType()) {
- return IFacesConfigConstants.VIEW_HANDLER_SUPER_CLASS;
+ return isJakartaEE ? IFacesConfigConstants.VIEW_HANDLER_SUPER_CLASS_JAKARTA :
+ IFacesConfigConstants.VIEW_HANDLER_SUPER_CLASS;
}
-
if (key == FacesConfigPackage.eINSTANCE.getApplicationFactoryType()) {
- return IFacesConfigConstants.APPLICATION_FACTORY_SUPER_CLASS;
+ return isJakartaEE ? IFacesConfigConstants.APPLICATION_FACTORY_SUPER_CLASS_JAKARTA :
+ IFacesConfigConstants.APPLICATION_FACTORY_SUPER_CLASS;
}
if (key == FacesConfigPackage.eINSTANCE.getFacesContextFactoryType()) {
- return IFacesConfigConstants.FACES_CONTEXT_FACTORY_SUPER_CLASS;
+ return isJakartaEE ? IFacesConfigConstants.FACES_CONTEXT_FACTORY_SUPER_CLASS_JAKARTA :
+ IFacesConfigConstants.FACES_CONTEXT_FACTORY_SUPER_CLASS;
}
if (key == FacesConfigPackage.eINSTANCE.getLifecycleFactoryType()) {
- return IFacesConfigConstants.LIFECYCLE_FACTORY_SUPER_CLASS;
+ return isJakartaEE ? IFacesConfigConstants.LIFECYCLE_FACTORY_SUPER_CLASS_JAKARTA :
+ IFacesConfigConstants.LIFECYCLE_FACTORY_SUPER_CLASS;
}
if (key == FacesConfigPackage.eINSTANCE.getRenderKitFactoryType()) {
- return IFacesConfigConstants.RENDER_KIT_FACTORY_SUPER_CLASS;
+ return isJakartaEE ? IFacesConfigConstants.RENDER_KIT_FACTORY_SUPER_CLASS_JAKARTA :
+ IFacesConfigConstants.RENDER_KIT_FACTORY_SUPER_CLASS;
}
-
if (key == FacesConfigPackage.eINSTANCE.getPhaseListenerType()) {
- return IFacesConfigConstants.PHASE_LISTENER_INTERFACE;
+ return isJakartaEE ? IFacesConfigConstants.PHASE_LISTENER_INTERFACE_JAKARTA :
+ IFacesConfigConstants.PHASE_LISTENER_INTERFACE;
}
return null;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_core.xml b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_core.xml
index 4a55d3b6c..34b4128ba 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_core.xml
+++ b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_core.xml
@@ -149,17 +149,10 @@
null if the
+ * edition failed
+ * @since 3.1
+ */
+ protected Template editTemplate(Template template, boolean edit, boolean isNameModifiable) {
+ EditTemplateDialog dialog = new JSFEditTemplateDialog(getShell(), template, edit, isNameModifiable, getContextTypeRegistry());
+ if (dialog.open() == Window.OK) {
+ return dialog.getTemplate();
+ }
+ return null;
+ }
+}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/templates/EncodingTemplateVariableResolverJSF.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/templates/EncodingTemplateVariableResolverJSF.java
new file mode 100644
index 000000000..03d507553
--- /dev/null
+++ b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/templates/EncodingTemplateVariableResolverJSF.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
+package org.eclipse.jst.jsf.ui.internal.templates;
+
+import org.eclipse.jface.text.templates.SimpleTemplateVariableResolver;
+import org.eclipse.jface.text.templates.TemplateContext;
+import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
+import org.eclipse.jst.jsf.ui.internal.Messages;
+import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
+
+
+public class EncodingTemplateVariableResolverJSF extends SimpleTemplateVariableResolver {
+ private static final String ENCODING_TYPE = getEncodingType();
+
+ private static String getEncodingType() {
+ return "encoding"; //$NON-NLS-1$
+ }
+
+ /**
+ * Creates a new encoding variable
+ */
+ public EncodingTemplateVariableResolverJSF() {
+ super(ENCODING_TYPE, Messages.Creating_files_encoding);
+ }
+
+ protected String resolve(TemplateContext context) {
+ return JSFCorePlugin.getDefault().getPluginPreferences().getString(CommonEncodingPreferenceNames.OUTPUT_CODESET);
+ }
+}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/templates/TemplateContextTypeIdsJSF.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/templates/TemplateContextTypeIdsJSF.java
new file mode 100644
index 000000000..de641f305
--- /dev/null
+++ b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/templates/TemplateContextTypeIdsJSF.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *
+ *******************************************************************************/
+package org.eclipse.jst.jsf.ui.internal.templates;
+
+/**
+ * */
+public class TemplateContextTypeIdsJSF {
+ public static final String ALL = getAll();
+
+ public static final String ATTRIBUTE = getAttribute();
+
+ public static final String ATTRIBUTE_VALUE = getAttributeValue();
+
+ public static final String NEW = getNew();
+
+ private static String getAll() {
+ return getPrefix() + "_all"; //$NON-NLS-1$
+ }
+
+ private static String getAttribute() {
+ return getPrefix() + "_attribute"; //$NON-NLS-1$
+ }
+
+ private static String getAttributeValue() {
+ return getPrefix() + "_attribute_value"; //$NON-NLS-1$
+ }
+
+ private static String getNew() {
+ return getPrefix() + "_new"; //$NON-NLS-1$
+ }
+
+ private static String getPrefix() {
+ return "jsf"; //$NON-NLS-1$
+ }
+}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/templates/TemplateContextTypeJSF.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/templates/TemplateContextTypeJSF.java
new file mode 100644
index 000000000..0e2e47f9b
--- /dev/null
+++ b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/templates/TemplateContextTypeJSF.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2012 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jst.jsf.ui.internal.templates;
+
+import org.eclipse.jface.text.templates.GlobalTemplateVariables;
+import org.eclipse.jface.text.templates.TemplateContextType;
+
+/**
+ * Base class for JSF template context types. Templates of this context type
+ * apply to any place within JSF content type.
+ */
+public class TemplateContextTypeJSF extends TemplateContextType {
+ /***/
+ public TemplateContextTypeJSF() {
+ super();
+ addResolver(new GlobalTemplateVariables.Cursor());
+ addResolver(new GlobalTemplateVariables.Date());
+ addResolver(new GlobalTemplateVariables.Dollar());
+ addResolver(new GlobalTemplateVariables.LineSelection());
+ addResolver(new GlobalTemplateVariables.Time());
+ addResolver(new GlobalTemplateVariables.User());
+ addResolver(new GlobalTemplateVariables.WordSelection());
+ addResolver(new GlobalTemplateVariables.Year());
+ addResolver(new EncodingTemplateVariableResolverJSF());
+ }
+}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/wizard/NewJSFFileWizardPage.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/wizard/NewJSFFileWizardPage.java
new file mode 100644
index 000000000..e2088ad24
--- /dev/null
+++ b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/wizard/NewJSFFileWizardPage.java
@@ -0,0 +1,283 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jst.jsf.ui.internal.wizard;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Preferences;
+import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jst.jsf.ui.internal.JSFUiPlugin;
+import org.eclipse.jst.jsf.ui.internal.Messages;
+import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
+import org.eclipse.jst.jsf.core.internal.preferences.JSFCorePreferenceNames;
+import org.eclipse.jst.jsf.core.internal.provisional.contenttype.ContentTypeIdForJSF;
+import org.eclipse.jst.jsf.core.internal.util.FacetModuleCoreSupport;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+
+class NewJSFFileWizardPage extends WizardNewFileCreationPage {
+
+ private static final String defaultName = "NewFile"; //$NON-NLS-1$
+ private IContentType fContentType;
+ private List fValidExtensions = null;
+
+ public NewJSFFileWizardPage(String pageName, IStructuredSelection selection) {
+ super(pageName, selection);
+ }
+
+ public void createControl(Composite parent) {
+ // inherit default container and name specification widgets
+ super.createControl(parent);
+ setFileName(computeDefaultFileName());
+ setPageComplete(validatePage());
+ }
+
+ protected String computeDefaultFileName() {
+ int count = 0;
+ String fileName = addDefaultExtension(defaultName);
+ IPath containerFullPath = getContainerFullPath();
+ if (containerFullPath != null) {
+ while (true) {
+ IPath path = containerFullPath.append(fileName);
+ if (ResourcesPlugin.getWorkspace().getRoot().exists(path)) {
+ count++;
+ fileName = addDefaultExtension(defaultName + count);
+ }
+ else {
+ break;
+ }
+ }
+ }
+ return fileName;
+ }
+
+ /**
+ * This method is overridden to set the selected folder to web contents
+ * folder if the current selection is outside the web contents folder.
+ */
+ protected void initialPopulateContainerNameField() {
+ super.initialPopulateContainerNameField();
+
+ IPath fullPath = getContainerFullPath();
+ IProject project = getProjectFromPath(fullPath);
+ IPath root = FacetModuleCoreSupport.getRootContainerForPath(project, fullPath);
+ if (root != null) {
+ return;
+ }
+ root = FacetModuleCoreSupport.getDefaultRootContainer(project);
+ if (root != null) {
+ setContainerFullPath(root);
+ return;
+ }
+ }
+
+ /**
+ * This method is overriden to set additional validation specific to jsp
+ * files.
+ */
+ protected boolean validatePage() {
+ setMessage(null);
+ setErrorMessage(null);
+
+ if (!super.validatePage()) {
+ return false;
+ }
+
+ String fileName = getFileName();
+ IPath fullPath = getContainerFullPath();
+ if ((fullPath != null) && (fullPath.isEmpty() == false) && (fileName != null)) {
+ // check that filename does not contain invalid extension
+ if (!extensionValidForContentType(fileName)) {
+ setErrorMessage(NLS.bind(Messages._ERROR_FILENAME_MUST_END_JSF, getValidExtensions().toString()));
+ return false;
+ }
+ // no file extension specified so check adding default
+ // extension doesn't equal a file that already exists
+ if (fileName.lastIndexOf('.') == -1) {
+ String newFileName = addDefaultExtension(fileName);
+ IPath resourcePath = fullPath.append(newFileName);
+
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ IStatus result = workspace.validatePath(resourcePath.toString(), IResource.FOLDER);
+ if (!result.isOK()) {
+ // path invalid
+ setErrorMessage(result.getMessage());
+ return false;
+ }
+
+ if ((workspace.getRoot().getFolder(resourcePath).exists() || workspace.getRoot().getFile(resourcePath).exists())) {
+ setErrorMessage(Messages.ResourceGroup_nameExists);
+ return false;
+ }
+ }
+
+ // get the IProject for the selection path
+ IProject project = getProjectFromPath(fullPath);
+ // if inside web project, check if inside webContent folder
+ if (project != null) {
+ if (!isJavaProject(project)) {
+ setMessage(Messages._WARNING_FILE_MUST_BE_INSIDE_JAVA_PROJECT, WARNING);
+ }
+ if (isDynamicWebProject(project) || FacetModuleCoreSupport.isWebFragmentProject(project)) {
+ // check that the path is inside a deployed folder
+ IPath[] webContentPaths = FacetModuleCoreSupport.getAcceptableRootPaths(project);
+ boolean isPrefix = false;
+ for (int i = 0; !isPrefix && i < webContentPaths.length; i++) {
+ isPrefix |= webContentPaths[i].isPrefixOf(fullPath);
+ }
+ if (!isPrefix) {
+ setMessage(Messages._WARNING_FOLDER_MUST_BE_INSIDE_WEB_CONTENT, WARNING);
+ }
+ }
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Adds default extension to the filename
+ *
+ * @param filename
+ * @return
+ */
+ String addDefaultExtension(String filename) {
+ StringBuffer newFileName = new StringBuffer(filename);
+
+ Preferences preference = JSFCorePlugin.getDefault().getPluginPreferences();
+ String ext = preference.getString(JSFCorePreferenceNames.DEFAULT_EXTENSION);
+
+ newFileName.append("."); //$NON-NLS-1$
+ newFileName.append(ext);
+
+ return newFileName.toString();
+ }
+
+ /**
+ * Get content type associated with this new file wizard
+ *
+ * @return IContentType
+ */
+ private IContentType getContentType() {
+ if (fContentType == null)
+ fContentType = Platform.getContentTypeManager().getContentType(ContentTypeIdForJSF.ContentTypeID_JSF);
+ return fContentType;
+ }
+
+ /**
+ * Get list of valid extensions for JSF Content type
+ *
+ * @return
+ */
+ private List getValidExtensions() {
+ if (fValidExtensions == null) {
+ IContentType type = getContentType();
+ fValidExtensions = new ArrayList(Arrays.asList(type.getFileSpecs(IContentType.FILE_EXTENSION_SPEC)));
+ }
+ return fValidExtensions;
+ }
+
+ /**
+ * Verifies if fileName is valid name for content type. Takes base content
+ * type into consideration.
+ *
+ * @param fileName
+ * @return true if extension is valid for this content type
+ */
+ private boolean extensionValidForContentType(String fileName) {
+ boolean valid = false;
+
+ IContentType type = getContentType();
+ // there is currently an extension
+ if (fileName.lastIndexOf('.') != -1) {
+ // check what content types are associated with current extension
+ IContentType[] types = Platform.getContentTypeManager().findContentTypesFor(fileName);
+ int i = 0;
+ while (i < types.length && !valid) {
+ valid = types[i].isKindOf(type);
+ ++i;
+ }
+ }
+ else
+ valid = true; // no extension so valid
+ return valid;
+ }
+
+ /**
+ * Returns the project that contains the specified path
+ *
+ * @param path
+ * the path which project is needed
+ * @return IProject object. If path is null the return
+ * value is also null.
+ */
+ private IProject getProjectFromPath(IPath path) {
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ IProject project = null;
+
+ if (path != null) {
+ if (workspace.validatePath(path.toString(), IResource.PROJECT).isOK()) {
+ project = workspace.getRoot().getProject(path.toString());
+ }
+ else {
+ project = workspace.getRoot().getFile(path).getProject();
+ }
+ }
+
+ return project;
+ }
+
+ /**
+ * Checks if the specified project is a web project.
+ *
+ * @param project
+ * project to be checked
+ * @return true if the project is web project, otherwise false
+ */
+ private boolean isDynamicWebProject(IProject project) {
+ boolean is = FacetModuleCoreSupport.isDynamicWebProject(project);
+ return is;
+ }
+
+ /**
+ * Checks if the specified project is a type of java project.
+ *
+ * @param project
+ * project to be checked (cannot be null)
+ * @return true if the project is a type of java project, otherwise false
+ */
+ private boolean isJavaProject(IProject project) {
+ boolean isJava = false;
+ try {
+ isJava = project.hasNature(JavaCore.NATURE_ID);
+ }
+ catch (CoreException e) {
+ JSFUiPlugin.log(IStatus.WARNING, e.getMessage(), e);
+ }
+
+ return isJava;
+ }
+}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/wizard/NewJSFTemplatesWizardPage.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/wizard/NewJSFTemplatesWizardPage.java
new file mode 100644
index 000000000..7e3b64daa
--- /dev/null
+++ b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/wizard/NewJSFTemplatesWizardPage.java
@@ -0,0 +1,522 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jst.jsf.ui.internal.wizard;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.preference.PreferenceDialog;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.text.Document;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.SourceViewer;
+import org.eclipse.jface.text.source.SourceViewerConfiguration;
+import org.eclipse.jface.text.templates.DocumentTemplateContext;
+import org.eclipse.jface.text.templates.Template;
+import org.eclipse.jface.text.templates.TemplateBuffer;
+import org.eclipse.jface.text.templates.TemplateContext;
+import org.eclipse.jface.text.templates.TemplateContextType;
+import org.eclipse.jface.text.templates.persistence.TemplateStore;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.jst.jsf.ui.internal.JSFUiPlugin;
+import org.eclipse.jst.jsf.ui.internal.Messages;
+import org.eclipse.jst.jsf.core.internal.provisional.contenttype.ContentTypeIdForJSF;
+import org.eclipse.jst.jsp.ui.StructuredTextViewerConfigurationJSP;
+import org.eclipse.jst.jsf.ui.internal.templates.TemplateContextTypeIdsJSF;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.ui.dialogs.PreferencesUtil;
+import org.eclipse.wst.sse.core.StructuredModelManager;
+import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
+import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
+import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
+import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
+
+/**
+ * Templates page in new file wizard. Allows users to select a new file
+ * template to be applied in new file.
+ *
+ */
+public class NewJSFTemplatesWizardPage extends WizardPage {
+
+ /**
+ * Content provider for templates
+ */
+ private class TemplateContentProvider implements IStructuredContentProvider {
+ /** The template store. */
+ private TemplateStore fStore;
+
+ /*
+ * @see IContentProvider#dispose()
+ */
+ public void dispose() {
+ fStore = null;
+ }
+
+ /*
+ * @see IStructuredContentProvider#getElements(Object)
+ */
+ public Object[] getElements(Object input) {
+ return fStore.getTemplates(TemplateContextTypeIdsJSF.NEW);
+ }
+
+ /*
+ * @see IContentProvider#inputChanged(Viewer, Object, Object)
+ */
+ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ fStore = (TemplateStore) newInput;
+ }
+ }
+
+ /**
+ * Label provider for templates.
+ */
+ private class TemplateLabelProvider extends LabelProvider implements ITableLabelProvider {
+
+ /*
+ * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object,
+ * int)
+ */
+ public Image getColumnImage(Object element, int columnIndex) {
+ return null;
+ }
+
+ /*
+ * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object,
+ * int)
+ */
+ public String getColumnText(Object element, int columnIndex) {
+ Template template = (Template) element;
+
+ switch (columnIndex) {
+ case 0 :
+ return template.getName();
+ case 1 :
+ return template.getDescription();
+ default :
+ return ""; //$NON-NLS-1$
+ }
+ }
+ }
+
+ /** Last selected template name */
+ private String fLastSelectedTemplateName;
+ /** The viewer displays the pattern of selected template. */
+ private SourceViewer fPatternViewer;
+ /** The table presenting the templates. */
+ private TableViewer fTableViewer;
+ /** Template store used by this wizard page */
+ private TemplateStore fTemplateStore;
+ /** Checkbox for using templates. */
+ private Button fUseTemplateButton;
+
+ public NewJSFTemplatesWizardPage() {
+ super("NewJSFTemplatesWizardPage", Messages.NewJSFTemplatesWizardPage_0, null); //$NON-NLS-1$
+ setDescription(Messages.NewJSFTemplatesWizardPage_1);
+ }
+
+ /**
+ * Correctly resizes the table so no phantom columns appear
+ *
+ * @param parent
+ * the parent control
+ * @param buttons
+ * the buttons
+ * @param table
+ * the table
+ * @param column1
+ * the first column
+ * @param column2
+ * the second column
+ * @param column3
+ * the third column
+ */
+ private void configureTableResizing(final Composite parent, final Table table, final TableColumn column1, final TableColumn column2) {
+ parent.addControlListener(new ControlAdapter() {
+ public void controlResized(ControlEvent e) {
+ Rectangle area = parent.getClientArea();
+ Point preferredSize = table.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+ int width = area.width - 2 * table.getBorderWidth();
+ if (preferredSize.y > area.height) {
+ // Subtract the scrollbar width from the total column
+ // width
+ // if a vertical scrollbar will be required
+ Point vBarSize = table.getVerticalBar().getSize();
+ width -= vBarSize.x;
+ }
+
+ Point oldSize = table.getSize();
+ if (oldSize.x > width) {
+ // table is getting smaller so make the columns
+ // smaller first and then resize the table to
+ // match the client area width
+ column1.setWidth(width / 2);
+ column2.setWidth(width / 2);
+ table.setSize(width, area.height);
+ }
+ else {
+ // table is getting bigger so make the table
+ // bigger first and then make the columns wider
+ // to match the client area width
+ table.setSize(width, area.height);
+ column1.setWidth(width / 2);
+ column2.setWidth(width / 2);
+ }
+ }
+ });
+ }
+
+ public void createControl(Composite ancestor) {
+ Composite parent = new Composite(ancestor, SWT.NONE);
+ GridLayout layout = new GridLayout();
+ layout.numColumns = 2;
+ parent.setLayout(layout);
+
+ // create checkbox for user to use JSP Template
+ fUseTemplateButton = new Button(parent, SWT.CHECK);
+ fUseTemplateButton.setText(Messages.NewJSFTemplatesWizardPage_4);
+ GridData data = new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1);
+ fUseTemplateButton.setLayoutData(data);
+ fUseTemplateButton.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ enableTemplates();
+ }
+ });
+
+ // create composite for Templates table
+ Composite innerParent = new Composite(parent, SWT.NONE);
+ GridLayout innerLayout = new GridLayout();
+ innerLayout.numColumns = 2;
+ innerLayout.marginHeight = 0;
+ innerLayout.marginWidth = 0;
+ innerParent.setLayout(innerLayout);
+ GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1);
+ innerParent.setLayoutData(gd);
+
+ Label label = new Label(innerParent, SWT.NONE);
+ label.setText(Messages.NewJSFTemplatesWizardPage_7);
+ data = new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1);
+ label.setLayoutData(data);
+
+ // create table that displays templates
+ Table table = new Table(innerParent, SWT.BORDER | SWT.FULL_SELECTION);
+
+ data = new GridData(GridData.FILL_BOTH);
+ data.widthHint = convertWidthInCharsToPixels(2);
+ data.heightHint = convertHeightInCharsToPixels(10);
+ data.horizontalSpan = 2;
+ table.setLayoutData(data);
+ table.setHeaderVisible(true);
+ table.setLinesVisible(true);
+ TableLayout tableLayout = new TableLayout();
+ table.setLayout(tableLayout);
+
+ TableColumn column1 = new TableColumn(table, SWT.NONE);
+ column1.setText(Messages.NewJSFTemplatesWizardPage_2);
+
+ TableColumn column2 = new TableColumn(table, SWT.NONE);
+ column2.setText(Messages.NewJSFTemplatesWizardPage_3);
+
+ fTableViewer = new TableViewer(table);
+ fTableViewer.setLabelProvider(new TemplateLabelProvider());
+ fTableViewer.setContentProvider(new TemplateContentProvider());
+
+ fTableViewer.setSorter(new ViewerSorter() {
+ public int compare(Viewer viewer, Object object1, Object object2) {
+ if ((object1 instanceof Template) && (object2 instanceof Template)) {
+ Template left = (Template) object1;
+ Template right = (Template) object2;
+ int result = left.getName().compareToIgnoreCase(right.getName());
+ if (result != 0)
+ return result;
+ return left.getDescription().compareToIgnoreCase(right.getDescription());
+ }
+ return super.compare(viewer, object1, object2);
+ }
+
+ public boolean isSorterProperty(Object element, String property) {
+ return true;
+ }
+ });
+
+ fTableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+ public void selectionChanged(SelectionChangedEvent e) {
+ updateViewerInput();
+ }
+ });
+
+ // create viewer that displays currently selected template's contents
+ fPatternViewer = doCreateViewer(parent);
+
+ fTemplateStore = JSFUiPlugin.getDefault().getTemplateStore();
+ fTableViewer.setInput(fTemplateStore);
+
+ // Create linked text to just to templates preference page
+ Link link = new Link(parent, SWT.NONE);
+ link.setText(Messages.NewJSFTemplatesWizardPage_6);
+ data = new GridData(SWT.END, SWT.FILL, true, false, 2, 1);
+ link.setLayoutData(data);
+ link.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ linkClicked();
+ }
+ });
+
+
+ configureTableResizing(innerParent, table, column1, column2);
+ loadLastSavedPreferences();
+
+ //PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.JSP_NEWWIZARD_TEMPLATE_HELPID);
+ Dialog.applyDialogFont(parent);
+ setControl(parent);
+ }
+
+ /**
+ * Creates, configures and returns a source viewer to present the template
+ * pattern on the preference page. Clients may override to provide a
+ * custom source viewer featuring e.g. syntax coloring.
+ *
+ * @param parent
+ * the parent control
+ * @return a configured source viewer
+ */
+ private SourceViewer createViewer(Composite parent) {
+ SourceViewerConfiguration sourceViewerConfiguration = new StructuredTextViewerConfiguration() {
+ StructuredTextViewerConfiguration baseConfiguration = new StructuredTextViewerConfigurationJSP();
+
+ public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
+ return baseConfiguration.getConfiguredContentTypes(sourceViewer);
+ }
+
+ public LineStyleProvider[] getLineStyleProviders(ISourceViewer sourceViewer, String partitionType) {
+ return baseConfiguration.getLineStyleProviders(sourceViewer, partitionType);
+ }
+ };
+ SourceViewer viewer = new StructuredTextViewer(parent, null, null, false, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
+ viewer.getTextWidget().setFont(JFaceResources.getFont("org.eclipse.wst.sse.ui.textfont")); //$NON-NLS-1$
+ IStructuredModel scratchModel = StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForJSF.ContentTypeID_JSF);
+ IDocument document = scratchModel.getStructuredDocument();
+ viewer.configure(sourceViewerConfiguration);
+ viewer.setDocument(document);
+ return viewer;
+ }
+
+ private SourceViewer doCreateViewer(Composite parent) {
+ Label label = new Label(parent, SWT.NONE);
+ label.setText(Messages.NewJSFTemplatesWizardPage_5);
+ GridData data = new GridData();
+ data.horizontalSpan = 2;
+ label.setLayoutData(data);
+
+ SourceViewer viewer = createViewer(parent);
+ viewer.setEditable(false);
+
+ Control control = viewer.getControl();
+ data = new GridData(GridData.FILL_BOTH);
+ data.horizontalSpan = 2;
+ data.heightHint = convertHeightInCharsToPixels(5);
+ // [261274] - source viewer was growing to fit the max line width of the template
+ data.widthHint = convertWidthInCharsToPixels(2);
+ control.setLayoutData(data);
+
+ return viewer;
+ }
+
+ /**
+ * Enable/disable controls in page based on fUseTemplateButton's current
+ * state.
+ */
+ void enableTemplates() {
+ boolean enabled = fUseTemplateButton.getSelection();
+
+ if (!enabled) {
+ // save last selected template
+ Template template = getSelectedTemplate();
+ if (template != null)
+ fLastSelectedTemplateName = template.getName();
+ else
+ fLastSelectedTemplateName = ""; //$NON-NLS-1$
+
+ fTableViewer.setSelection(null);
+ }
+ else {
+ setSelectedTemplate(fLastSelectedTemplateName);
+ }
+
+ fTableViewer.getControl().setEnabled(enabled);
+ fPatternViewer.getControl().setEnabled(enabled);
+ }
+
+ /**
+ * Return the template preference page id
+ *
+ * @return
+ */
+ private String getPreferencePageId() {
+ return "org.eclipse.wst.sse.ui.preferences.jsf.templates"; //$NON-NLS-1$
+ }
+
+ /**
+ * Get the currently selected template.
+ *
+ * @return
+ */
+ private Template getSelectedTemplate() {
+ Template template = null;
+ IStructuredSelection selection = (IStructuredSelection) fTableViewer.getSelection();
+
+ if (selection.size() == 1) {
+ template = (Template) selection.getFirstElement();
+ }
+ return template;
+ }
+
+ /**
+ * Returns template string to insert.
+ *
+ * @return String to insert or null if none is to be inserted
+ */
+ String getTemplateString() {
+ String templateString = null;
+
+ Template template = getSelectedTemplate();
+ if (template != null) {
+ TemplateContextType contextType = JSFUiPlugin.getDefault().getTemplateContextRegistry().getContextType(TemplateContextTypeIdsJSF.NEW);
+ IDocument document = new Document();
+ TemplateContext context = new DocumentTemplateContext(contextType, document, 0, 0);
+ try {
+ TemplateBuffer buffer = context.evaluate(template);
+ templateString = buffer.getString();
+ }
+ catch (Exception e) {
+ JSFUiPlugin.log(IStatus.WARNING, "Could not create template for new jsf", e); //$NON-NLS-1$
+ }
+ }
+
+ return templateString;
+ }
+
+ void linkClicked() {
+ String pageId = getPreferencePageId();
+ PreferenceDialog dialog = PreferencesUtil.createPreferenceDialogOn(getShell(), pageId, new String[]{pageId}, null);
+ dialog.open();
+ fTableViewer.refresh();
+ }
+
+ /**
+ * Load the last template name used in New JSF File wizard.
+ */
+ private void loadLastSavedPreferences() {
+ fLastSelectedTemplateName = ""; //$NON-NLS-1$
+ boolean setSelection = false;
+ /*String templateName = JSFUiPlugin.getDefault().getPreferenceStore().getString(JSPUIPreferenceNames.NEW_FILE_TEMPLATE_NAME);
+ if (templateName == null || templateName.length() == 0) {
+ templateName = JSFUiPlugin.getDefault().getPreferenceStore().getString(JSPUIPreferenceNames.NEW_FILE_TEMPLATE_ID);
+ if (templateName != null && templateName.length() > 0) {
+ Template template = fTemplateStore.findTemplateById(templateName);
+ if (template != null) {
+ fLastSelectedTemplateName = template.getName();
+ setSelection = true;
+ }
+ }
+ }
+ else {
+ fLastSelectedTemplateName = templateName;
+ setSelection = true;
+ }
+ */
+ fUseTemplateButton.setSelection(setSelection);
+ enableTemplates();
+ }
+
+ /**
+ * Save template name used for next call to New JSP File wizard.
+ */
+ void saveLastSavedPreferences() {
+ /*String templateName = ""; //$NON-NLS-1$
+
+ Template template = getSelectedTemplate();
+ if (template != null) {
+ templateName = template.getName();
+ }
+
+ JSFUiPlugin.getDefault().getPreferenceStore().setValue(JSPUIPreferenceNames.NEW_FILE_TEMPLATE_NAME, templateName);
+ */JSFUiPlugin.getDefault().savePluginPreferences();
+ }
+
+ /**
+ * Select a template in the table viewer given the template name. If
+ * template name cannot be found or templateName is null, just select
+ * first item in table. If no items in table select nothing.
+ *
+ * @param templateName
+ */
+ private void setSelectedTemplate(String templateName) {
+ Object template = null;
+
+ if (templateName != null && templateName.length() > 0) {
+ // pick the last used template
+ template = fTemplateStore.findTemplate(templateName, TemplateContextTypeIdsJSF.NEW);
+ }
+
+ // no record of last used template so just pick first element
+ if (template == null) {
+ // just pick first element
+ template = fTableViewer.getElementAt(0);
+ }
+
+ if (template != null) {
+ IStructuredSelection selection = new StructuredSelection(template);
+ fTableViewer.setSelection(selection, true);
+ }
+ }
+
+ /**
+ * Updates the pattern viewer.
+ */
+ void updateViewerInput() {
+ Template template = getSelectedTemplate();
+ if (template != null) {
+ fPatternViewer.getDocument().set(template.getPattern());
+ }
+ else {
+ fPatternViewer.getDocument().set(""); //$NON-NLS-1$
+ }
+ }
+}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/wizard/NewJSFWizard.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/wizard/NewJSFWizard.java
new file mode 100644
index 000000000..c88a14c7a
--- /dev/null
+++ b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/wizard/NewJSFWizard.java
@@ -0,0 +1,155 @@
+package org.eclipse.jst.jsf.ui.internal.wizard;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStreamWriter;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.ProjectScope;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Preferences;
+import org.eclipse.core.runtime.preferences.IScopeContext;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
+import org.eclipse.jst.jsf.ui.internal.JSFUiPlugin;
+import org.eclipse.jst.jsf.ui.internal.Messages;
+import org.eclipse.jst.jsf.ui.internal.editor.JSFEditorPluginImageHelper;
+import org.eclipse.jst.jsf.ui.internal.editor.JSFEditorPluginImages;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.ide.IDE;
+import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
+import org.eclipse.wst.sse.core.utils.StringUtils;
+
+public class NewJSFWizard extends Wizard implements INewWizard {
+ private NewJSFFileWizardPage fNewFilePage;
+ private NewJSFTemplatesWizardPage fNewFileTemplatesPage;
+ private IStructuredSelection fSelection;
+ private Display fDisplay;
+
+ private boolean fShouldOpenEditorOnFinish = true;
+
+ public void createPageControls(Composite pageContainer) {
+ fDisplay = pageContainer.getDisplay();
+ super.createPageControls(pageContainer);
+ }
+
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=248424
+ public void setOpenEditorOnFinish(boolean openEditor) {
+ this.fShouldOpenEditorOnFinish = openEditor;
+ }
+
+ public void addPages() {
+ fNewFilePage = new NewJSFFileWizardPage("JSFWizardNewFileCreationPage", new StructuredSelection(IDE.computeSelectedResources(fSelection))); //$NON-NLS-1$
+ fNewFilePage.setTitle(Messages._UI_WIZARD_NEW_HEADING);
+ fNewFilePage.setDescription(Messages._UI_WIZARD_NEW_DESCRIPTION);
+ addPage(fNewFilePage);
+
+ fNewFileTemplatesPage = new NewJSFTemplatesWizardPage();
+ addPage(fNewFileTemplatesPage);
+ }
+
+ private String applyLineDelimiter(IFile file, String text) {
+ String lineDelimiter = Platform.getPreferencesService().getString(Platform.PI_RUNTIME, Platform.PREF_LINE_SEPARATOR, System.getProperty("line.separator"), new IScopeContext[] {new ProjectScope(file.getProject()), new InstanceScope() });//$NON-NLS-1$
+ String convertedText = StringUtils.replace(text, "\r\n", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
+ convertedText = StringUtils.replace(convertedText, "\r", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
+ convertedText = StringUtils.replace(convertedText, "\n", lineDelimiter); //$NON-NLS-1$
+ return convertedText;
+ }
+
+ public void init(IWorkbench aWorkbench, IStructuredSelection aSelection) {
+ fSelection = aSelection;
+ setWindowTitle(Messages._UI_WIZARD_NEW_TITLE);
+
+ ImageDescriptor descriptor = JSFEditorPluginImageHelper.getInstance().getImageDescriptor(JSFEditorPluginImages.IMG_OBJ_WIZBAN_NEWJSFFILE);
+ setDefaultPageImageDescriptor(descriptor);
+ }
+
+ private void openEditor(final IFile file) {
+ if (file != null) {
+ fDisplay.asyncExec(new Runnable() {
+ public void run() {
+ if (!PlatformUI.isWorkbenchRunning())
+ return;
+ try {
+ IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ IDE.openEditor(page, file, true);
+ }
+ catch (PartInitException e) {
+ JSFUiPlugin.log(IStatus.WARNING, e.getMessage(), e);
+ }
+ }
+ });
+ }
+ }
+
+ public boolean performFinish() {
+ boolean performedOK = false;
+
+ // save user options for next use
+ fNewFileTemplatesPage.saveLastSavedPreferences();
+
+ // no file extension specified so add default extension
+ String fileName = fNewFilePage.getFileName();
+ if (fileName.lastIndexOf('.') == -1) {
+ String newFileName = fNewFilePage.addDefaultExtension(fileName);
+ fNewFilePage.setFileName(newFileName);
+ }
+
+ // create a new empty file
+ IFile file = fNewFilePage.createNewFile();
+
+ // if there was problem with creating file, it will be null, so make
+ // sure to check
+ if (file != null) {
+ if (!file.isLinked()) {
+ // put template contents into file
+ String templateString = fNewFileTemplatesPage.getTemplateString();
+ if (templateString != null) {
+ templateString = applyLineDelimiter(file, templateString);
+ // determine the encoding for the new file
+ Preferences preference = JSFCorePlugin.getDefault().getPluginPreferences();
+ String charSet = preference.getString(CommonEncodingPreferenceNames.OUTPUT_CODESET);
+
+ try {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ OutputStreamWriter outputStreamWriter = null;
+ if (charSet == null || charSet.trim().equals("")) { //$NON-NLS-1$
+ // just use default encoding
+ outputStreamWriter = new OutputStreamWriter(outputStream);
+ }
+ else {
+ outputStreamWriter = new OutputStreamWriter(outputStream, charSet);
+ }
+ outputStreamWriter.write(templateString);
+ outputStreamWriter.flush();
+ outputStreamWriter.close();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
+ file.setContents(inputStream, true, false, null);
+ inputStream.close();
+ }
+ catch (Exception e) {
+ JSFUiPlugin.log(IStatus.WARNING, "Could not create contents for new JSP file", e); //$NON-NLS-1$
+ }
+ }
+ }
+ // open the file in editor
+ if (fShouldOpenEditorOnFinish)
+ openEditor(file);
+
+ // everything's fine
+ performedOK = true;
+ }
+ return performedOK;
+ }
+}